From 2555b9525852b76927c33cd0f3c3730fa27b95bd Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 11 Mar 2025 17:34:54 -0700
Subject: [PATCH] manager/user: Expose device and variant info over DBus

---
 com.steampowered.SteamOSManager1.xml |  9 +++++++++
 src/bin/steamosctl.rs                |  9 +++++++++
 src/manager/user.rs                  | 10 +++++++++-
 src/proxy/manager2.rs                |  4 ++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/com.steampowered.SteamOSManager1.xml b/com.steampowered.SteamOSManager1.xml
index 7f9db8c..30edfd4 100644
--- a/com.steampowered.SteamOSManager1.xml
+++ b/com.steampowered.SteamOSManager1.xml
@@ -219,6 +219,15 @@
     -->
     <method name="ReloadConfig"/>
 
+    <!--
+        DeviceModel:
+
+        A tuple of the device model and variant that SteamOS Manager is running
+        on. If the device or variant isn't known the applicable fields will be
+        "unknown" instead.
+    -->
+    <property name="DeviceModel" type="ss" access="read"/>
+
   </interface>
 
   <!--
diff --git a/src/bin/steamosctl.rs b/src/bin/steamosctl.rs
index b176c15..d9675aa 100644
--- a/src/bin/steamosctl.rs
+++ b/src/bin/steamosctl.rs
@@ -184,6 +184,9 @@ enum Commands {
 
     /// Reload the configuration from disk
     ReloadConfig,
+
+    /// Get the model and variant of this device, if known
+    GetDeviceModel,
 }
 
 async fn get_all_properties(conn: &Connection) -> Result<()> {
@@ -462,6 +465,12 @@ async fn main() -> Result<()> {
             let proxy = Manager2Proxy::new(&conn).await?;
             proxy.reload_config().await?;
         }
+        Commands::GetDeviceModel => {
+            let proxy = Manager2Proxy::new(&conn).await?;
+            let (device, variant) = proxy.device_model().await?;
+            println!("Model: {device}");
+            println!("Variant: {variant}");
+        }
     }
 
     Ok(())
diff --git a/src/manager/user.rs b/src/manager/user.rs
index 87fddb2..77de054 100644
--- a/src/manager/user.rs
+++ b/src/manager/user.rs
@@ -19,7 +19,9 @@ use crate::cec::{HdmiCecControl, HdmiCecState};
 use crate::daemon::user::Command;
 use crate::daemon::DaemonCommand;
 use crate::error::{to_zbus_error, to_zbus_fdo_error, zbus_to_zbus_fdo};
-use crate::hardware::{device_type, steam_deck_variant, DeviceType, SteamDeckVariant};
+use crate::hardware::{
+    device_type, device_variant, steam_deck_variant, DeviceType, SteamDeckVariant,
+};
 use crate::job::JobManagerCommand;
 use crate::platform::platform_config;
 use crate::power::{
@@ -440,6 +442,12 @@ impl Manager2 {
             .map_err(to_zbus_fdo_error)?;
         method!(self, "ReloadConfig")
     }
+
+    #[zbus(property(emits_changed_signal = "const"))]
+    async fn device_model(&self) -> fdo::Result<(String, String)> {
+        let (device, variant) = device_variant().await.map_err(to_zbus_fdo_error)?;
+        Ok((device.to_string(), variant))
+    }
 }
 
 #[interface(name = "com.steampowered.SteamOSManager1.Storage1")]
diff --git a/src/proxy/manager2.rs b/src/proxy/manager2.rs
index 5010cca..531386e 100644
--- a/src/proxy/manager2.rs
+++ b/src/proxy/manager2.rs
@@ -21,4 +21,8 @@ use zbus::proxy;
 pub trait Manager2 {
     /// ReloadConfig method
     fn reload_config(&self) -> zbus::Result<()>;
+
+    /// DeviceModel property
+    #[zbus(property)]
+    fn device_model(&self) -> zbus::Result<(String, String)>;
 }