Skip to content

service: Refactor connection build and service.collection field set #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bilelmoussaoui merged 1 commit into from
Sep 16, 2025
Merged

service: Refactor connection build and service.collection field set #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions server/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,27 +298,28 @@ impl Service {
pub async fn run(secret: Option<Secret>, request_replacement: bool) -> Result<(), Error> {
let service = Self {
collections: Default::default(),
connection: OnceLock::new(),
connection: Default::default(),
sessions: Default::default(),
session_index: Default::default(),
prompts: Default::default(),
prompt_index: Default::default(),
};

let connection = zbus::connection::Builder::session()?
let connection_builder = zbus::connection::Builder::session()?
.allow_name_replacements(true)
.replace_existing_names(request_replacement)
.name(oo7::dbus::api::Service::DESTINATION.as_deref().unwrap())?
.serve_at(
oo7::dbus::api::Service::PATH.as_deref().unwrap(),
service.clone(),
)?
.build()
.await?;
)?;

service.connection.set(connection.clone()).unwrap();
let object_server = connection.object_server();
service
.connection
.set(connection_builder.build().await?)
.unwrap();

let object_server = service.object_server();
let mut collections = service.collections.lock().await;

if let Some(secret) = secret {
Expand Down