From 4f84b482259d85ed38af43ff81998a6d14f3bbec Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 13 May 2024 18:33:47 -0700
Subject: [PATCH] steamosctl: Give human-readable results for property names

---
 src/bin/steamosctl.rs | 32 +++++++++++++++++++++++---------
 src/cec.rs            | 10 ++++++++++
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/bin/steamosctl.rs b/src/bin/steamosctl.rs
index 994816f..a449787 100644
--- a/src/bin/steamosctl.rs
+++ b/src/bin/steamosctl.rs
@@ -184,6 +184,13 @@ async fn main() -> Result<()> {
         Commands::SetFanControlState { state } => {
             proxy.set_fan_control_state(*state as u32).await?;
         }
+        Commands::GetFanControlState => {
+            let state = proxy.fan_control_state().await?;
+            match FanControlState::try_from(state) {
+                Ok(s) => println!("Fan control state: {}", s.to_string()),
+                Err(_) => println!("Got unknown value {state} from backend"),
+            }
+        }
         Commands::SetGPUPerformanceLevel { level } => {
             proxy.set_gpu_performance_level(*level as u32).await?;
         }
@@ -216,10 +223,6 @@ async fn main() -> Result<()> {
             let limit = proxy.tdp_limit().await?;
             println!("TDP limit: {limit}");
         }
-        Commands::GetFanControlState => {
-            let state = proxy.fan_control_state().await?;
-            println!("Fan control state: {state}");
-        }
         Commands::GetTDPLimitMax => {
             let value = proxy.tdp_limit_max().await?;
             println!("TDP limit max: {value}");
@@ -233,29 +236,40 @@ async fn main() -> Result<()> {
         },
         Commands::GetWifiBackend => {
             let backend = proxy.wifi_backend().await?;
-            let backend_string = WifiBackend::try_from(backend).unwrap().to_string();
-            println!("Wifi backend: {backend_string}");
+            match WifiBackend::try_from(backend) {
+                Ok(be) => println!("Wifi backend: {}", be.to_string()),
+                Err(_) => println!("Got unknown value {backend} from backend"),
+            }
         }
         Commands::SetWifiDebugMode { mode, buffer } => {
             proxy.set_wifi_debug_mode(*mode as u32, *buffer).await?;
         }
         Commands::GetWifiDebugMode => {
             let mode = proxy.wifi_debug_mode_state().await?;
-            println!("Wifi debug mode: {mode}");
+            match WifiDebugMode::try_from(mode) {
+                Ok(m) => println!("Wifi debug mode: {}", m.to_string()),
+                Err(_) => println!("Got unknown value {mode} from backend"),
+            }
         }
         Commands::SetWifiPowerManagementState { state } => {
             proxy.set_wifi_power_management_state(*state as u32).await?;
         }
         Commands::GetWifiPowerManagementState => {
             let state = proxy.wifi_power_management_state().await?;
-            println!("Wifi power management state: {state}");
+            match WifiPowerManagement::try_from(state) {
+                Ok(s) => println!("Wifi power management state: {}", s.to_string()),
+                Err(_) => println!("Got unknown value {state} from backend"),
+            }
         }
         Commands::SetHdmiCecState { state } => {
             proxy.set_hdmi_cec_state(*state as u32).await?;
         }
         Commands::GetHdmiCecState => {
             let state = proxy.hdmi_cec_state().await?;
-            println!("HDMI-CEC state: {state}");
+            match HdmiCecState::try_from(state) {
+                Ok(s) => println!("HDMI-CEC state: {}", s.to_human_readable()),
+                Err(_) => println!("Got unknown value {state} from backend"),
+            }
         }
         Commands::UpdateBios => {
             let _ = proxy.update_bios().await?;
diff --git a/src/cec.rs b/src/cec.rs
index 8d4c875..1637fba 100644
--- a/src/cec.rs
+++ b/src/cec.rs
@@ -54,6 +54,16 @@ impl fmt::Display for HdmiCecState {
     }
 }
 
+impl HdmiCecState {
+    pub fn to_human_readable(&self) -> &'static str {
+        match self {
+            HdmiCecState::Disabled => "disabled",
+            HdmiCecState::ControlOnly => "control-only",
+            HdmiCecState::ControlAndWake => "control-and-wake",
+        }
+    }
+}
+
 pub(crate) struct HdmiCecControl<'dbus> {
     plasma_rc_unit: SystemdUnit<'dbus>,
     wakehook_unit: SystemdUnit<'dbus>,