archives/steamos-manager
archives/steamos-manager
2
0
Fork 1
mirror of https://gitlab.steamos.cloud/holo/steamos-manager.git synced 2025-07-12 09:22:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

user: Clean up init

Browse source
This commit is contained in:
Vicki Pfau 2024-05-07 17:00:10 -07:00
parent 9e0338e189
commit 2977731fca
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/user.rs
View file

@ -15,17 +15,20 @@ use zbus::ConnectionBuilder;
use crate::daemon::Daemon; use crate::daemon::Daemon;
use crate::user_manager::SteamOSManagerUser; use crate::user_manager::SteamOSManagerUser;
async fn create_connection(system_conn: &Connection) -> Result<Connection> { async fn create_connections() -> Result<(Connection, Connection)> {
let system = Connection::system().await?;
let connection = ConnectionBuilder::session()? let connection = ConnectionBuilder::session()?
.name("com.steampowered.SteamOSManager1")? .name("com.steampowered.SteamOSManager1")?
.build() .build()
.await?; .await?;
let manager = SteamOSManagerUser::new(connection.clone(), system_conn).await?;
let manager = SteamOSManagerUser::new(connection.clone(), &system).await?;
connection connection
.object_server() .object_server()
.at("/com/steampowered/SteamOSManager1", manager) .at("/com/steampowered/SteamOSManager1", manager)
.await?; .await?;
Ok(connection)
Ok((connection, system))
} }
pub async fn daemon() -> Result<()> { pub async fn daemon() -> Result<()> {
@ -35,15 +38,7 @@ pub async fn daemon() -> Result<()> {
let stdout_log = fmt::layer(); let stdout_log = fmt::layer();
let subscriber = Registry::default().with(stdout_log); let subscriber = Registry::default().with(stdout_log);
let system = match Connection::system().await { let (_session, system) = match create_connections().await {
Ok(c) => c,
Err(e) => {
let _guard = tracing::subscriber::set_default(subscriber);
error!("Error connecting to DBus: {}", e);
bail!(e);
}
};
let _session = match create_connection(&system).await {
Ok(c) => c, Ok(c) => c,
Err(e) => { Err(e) => {
let _guard = tracing::subscriber::set_default(subscriber); let _guard = tracing::subscriber::set_default(subscriber);