manager: Improve module naming

src/daemon/root.rs

@@ -14,7 +14,7 @@ use zbus::ConnectionBuilder;
 
 use crate::daemon::Daemon;
 use crate::ds_inhibit::Inhibitor;
-use crate::manager;
+use crate::manager::root::SteamOSManager;
 use crate::sls::ftrace::Ftrace;
 
 async fn create_connection() -> Result<Connection> {
@@ -22,7 +22,7 @@ async fn create_connection() -> Result<Connection> {
         .name("com.steampowered.SteamOSManager1")?
         .build()
         .await?;
-    let manager = manager::SteamOSManager::new(connection.clone()).await?;
+    let manager = SteamOSManager::new(connection.clone()).await?;
     connection
         .object_server()
         .at("/com/steampowered/SteamOSManager1", manager)

src/daemon/user.rs

@@ -13,7 +13,7 @@ use zbus::connection::Connection;
 use zbus::ConnectionBuilder;
 
 use crate::daemon::Daemon;
-use crate::user_manager::SteamOSManagerUser;
+use crate::manager::user::SteamOSManager;
 
 async fn create_connections() -> Result<(Connection, Connection)> {
     let system = Connection::system().await?;
@@ -22,7 +22,7 @@ async fn create_connections() -> Result<(Connection, Connection)> {
         .build()
         .await?;
 
-    let manager = SteamOSManagerUser::new(connection.clone(), &system).await?;
+    let manager = SteamOSManager::new(connection.clone(), &system).await?;
     connection
         .object_server()
         .at("/com/steampowered/SteamOSManager1", manager)

src/lib.rs

@@ -23,7 +23,6 @@ mod power;
 mod process;
 mod sls;
 mod systemd;
-mod user_manager;
 
 pub mod daemon;
 pub mod proxy;

src/manager/mod.rs

@@ -0,0 +1,9 @@
+/*
+ * Copyright © 2023 Collabora Ltd.
+ * Copyright © 2024 Valve Software
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+pub(crate) mod root;
+pub(crate) mod user;

src/manager/user.rs

@@ -51,14 +51,14 @@ macro_rules! setter {
     };
 }
 
-pub struct SteamOSManagerUser {
+pub struct SteamOSManager {
     proxy: Proxy<'static>,
     hdmi_cec: HdmiCecControl<'static>,
 }
 
-impl SteamOSManagerUser {
+impl SteamOSManager {
     pub async fn new(connection: Connection, system_conn: &Connection) -> Result<Self> {
-        Ok(SteamOSManagerUser {
+        Ok(SteamOSManager {
             hdmi_cec: HdmiCecControl::new(&connection).await?,
             proxy: Builder::new(system_conn)
                 .destination("com.steampowered.SteamOSManager1")?
@@ -72,7 +72,7 @@ impl SteamOSManagerUser {
 }
 
 #[interface(name = "com.steampowered.SteamOSManager1.Manager")]
-impl SteamOSManagerUser {
+impl SteamOSManager {
     #[zbus(property(emits_changed_signal = "const"))]
     async fn version(&self) -> u32 {
         API_VERSION
@@ -269,7 +269,7 @@ mod test {
             .build()
             .await
             .unwrap();
-        let manager = SteamOSManagerUser::new(connection.clone(), &connection)
+        let manager = SteamOSManager::new(connection.clone(), &connection)
             .await
             .unwrap();
         connection
@@ -307,7 +307,7 @@ mod test {
         let manager_ref = test
             .connection
             .object_server()
-            .interface::<_, SteamOSManagerUser>("/com/steampowered/SteamOSManager1")
+            .interface::<_, SteamOSManager>("/com/steampowered/SteamOSManager1")
             .await
             .expect("interface");
         let manager = manager_ref.get().await;