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

main: Generalize how to convert errors into zbus errors

Browse source
This commit is contained in:
Vicki Pfau 2024-04-30 21:31:35 -07:00
parent eb5fbc8e39
commit f6dd8ce3dd
2 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -5,7 +5,7 @@
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
*/ */
use anyhow::{anyhow, bail, Error, Result}; use anyhow::{anyhow, bail, Result};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use tokio::fs::File; use tokio::fs::File;
use tokio::io::AsyncWriteExt; use tokio::io::AsyncWriteExt;
@ -132,12 +132,19 @@ async fn reload() -> Result<()> {
} }
} }
pub fn anyhow_to_zbus(error: Error) -> zbus::Error { pub fn to_zbus_fdo_error<S: ToString>(error: S) -> zbus::fdo::Error {
zbus::fdo::Error::Failed(error.to_string())
}
pub fn to_zbus_error<S: ToString>(error: S) -> zbus::Error {
zbus::Error::Failure(error.to_string()) zbus::Error::Failure(error.to_string())
} }
pub fn anyhow_to_zbus_fdo(error: Error) -> zbus::fdo::Error { pub fn zbus_to_zbus_fdo(error: zbus::Error) -> zbus::fdo::Error {
zbus::fdo::Error::Failed(error.to_string()) match error {
zbus::Error::FDO(error) => *error,
error => zbus::fdo::Error::Failed(error.to_string()),
}
} }
async fn create_connection() -> Result<Connection> { async fn create_connection() -> Result<Connection> {

38
src/manager.rs
View file

@ -22,7 +22,7 @@ use crate::wifi::{
get_wifi_backend, get_wifi_power_management_state, set_wifi_backend, set_wifi_debug_mode, get_wifi_backend, get_wifi_power_management_state, set_wifi_backend, set_wifi_debug_mode,
set_wifi_power_management_state, WifiBackend, WifiDebugMode, WifiPowerManagement, set_wifi_power_management_state, WifiBackend, WifiDebugMode, WifiPowerManagement,
}; };
use crate::{anyhow_to_zbus, anyhow_to_zbus_fdo}; use crate::{to_zbus_error, to_zbus_fdo_error};
#[derive(PartialEq, Debug, Copy, Clone)] #[derive(PartialEq, Debug, Copy, Clone)]
#[repr(u32)] #[repr(u32)]
@ -70,7 +70,7 @@ impl SteamOSManager {
async fn wifi_power_management_state(&self) -> zbus::fdo::Result<u32> { async fn wifi_power_management_state(&self) -> zbus::fdo::Result<u32> {
match get_wifi_power_management_state().await { match get_wifi_power_management_state().await {
Ok(state) => Ok(state as u32), Ok(state) => Ok(state as u32),
Err(e) => Err(anyhow_to_zbus_fdo(e)), Err(e) => Err(to_zbus_fdo_error(e)),
} }
} }
@ -82,7 +82,7 @@ impl SteamOSManager {
}; };
set_wifi_power_management_state(state) set_wifi_power_management_state(state)
.await .await
.map_err(anyhow_to_zbus) .map_err(to_zbus_error)
} }
#[zbus(property(emits_changed_signal = "false"))] #[zbus(property(emits_changed_signal = "false"))]
@ -91,7 +91,7 @@ impl SteamOSManager {
.fan_control .fan_control
.get_state() .get_state()
.await .await
.map_err(anyhow_to_zbus_fdo)? as u32) .map_err(to_zbus_fdo_error)? as u32)
} }
#[zbus(property)] #[zbus(property)]
@ -104,14 +104,14 @@ impl SteamOSManager {
self.fan_control self.fan_control
.set_state(state) .set_state(state)
.await .await
.map_err(anyhow_to_zbus) .map_err(to_zbus_error)
} }
#[zbus(property(emits_changed_signal = "const"))] #[zbus(property(emits_changed_signal = "const"))]
async fn hardware_currently_supported(&self) -> zbus::fdo::Result<u32> { async fn hardware_currently_supported(&self) -> zbus::fdo::Result<u32> {
match check_support().await { match check_support().await {
Ok(res) => Ok(res as u32), Ok(res) => Ok(res as u32),
Err(e) => Err(anyhow_to_zbus_fdo(e)), Err(e) => Err(to_zbus_fdo_error(e)),
} }
} }
@ -149,7 +149,7 @@ impl SteamOSManager {
run_script("/usr/bin/jupiter-biosupdate", &["--auto"]) run_script("/usr/bin/jupiter-biosupdate", &["--auto"])
.await .await
.inspect_err(|message| error!("Error updating BIOS: {message}")) .inspect_err(|message| error!("Error updating BIOS: {message}"))
.map_err(anyhow_to_zbus_fdo) .map_err(to_zbus_fdo_error)
} }
async fn update_dock(&self) -> zbus::fdo::Result<()> { async fn update_dock(&self) -> zbus::fdo::Result<()> {
@ -160,7 +160,7 @@ impl SteamOSManager {
) )
.await .await
.inspect_err(|message| error!("Error updating dock: {message}")) .inspect_err(|message| error!("Error updating dock: {message}"))
.map_err(anyhow_to_zbus_fdo) .map_err(to_zbus_fdo_error)
} }
async fn trim_devices(&self) -> zbus::fdo::Result<()> { async fn trim_devices(&self) -> zbus::fdo::Result<()> {
@ -168,7 +168,7 @@ impl SteamOSManager {
run_script("/usr/lib/hwsupport/trim-devices.sh", &[] as &[String; 0]) run_script("/usr/lib/hwsupport/trim-devices.sh", &[] as &[String; 0])
.await .await
.inspect_err(|message| error!("Error updating trimming devices: {message}")) .inspect_err(|message| error!("Error updating trimming devices: {message}"))
.map_err(anyhow_to_zbus_fdo) .map_err(to_zbus_fdo_error)
} }
async fn format_device( async fn format_device(
@ -184,7 +184,7 @@ impl SteamOSManager {
run_script("/usr/lib/hwsupport/format-device.sh", args.as_ref()) run_script("/usr/lib/hwsupport/format-device.sh", args.as_ref())
.await .await
.inspect_err(|message| error!("Error formatting {device}: {message}")) .inspect_err(|message| error!("Error formatting {device}: {message}"))
.map_err(anyhow_to_zbus_fdo) .map_err(to_zbus_fdo_error)
} }
#[zbus(property(emits_changed_signal = "false"))] #[zbus(property(emits_changed_signal = "false"))]
@ -193,7 +193,7 @@ impl SteamOSManager {
Ok(level) => Ok(level as u32), Ok(level) => Ok(level as u32),
Err(e) => { Err(e) => {
error!("Error getting GPU performance level: {e}"); error!("Error getting GPU performance level: {e}");
Err(anyhow_to_zbus_fdo(e)) Err(to_zbus_fdo_error(e))
} }
} }
} }
@ -207,7 +207,7 @@ impl SteamOSManager {
set_gpu_performance_level(level) set_gpu_performance_level(level)
.await .await
.inspect_err(|message| error!("Error setting GPU performance level: {message}")) .inspect_err(|message| error!("Error setting GPU performance level: {message}"))
.map_err(anyhow_to_zbus) .map_err(to_zbus_error)
} }
#[zbus(property(emits_changed_signal = "false"))] #[zbus(property(emits_changed_signal = "false"))]
@ -215,7 +215,7 @@ impl SteamOSManager {
get_gpu_clocks() get_gpu_clocks()
.await .await
.inspect_err(|message| error!("Error getting manual GPU clock: {message}")) .inspect_err(|message| error!("Error getting manual GPU clock: {message}"))
.map_err(anyhow_to_zbus_fdo) .map_err(to_zbus_fdo_error)
} }
#[zbus(property)] #[zbus(property)]
@ -223,7 +223,7 @@ impl SteamOSManager {
set_gpu_clocks(clocks) set_gpu_clocks(clocks)
.await .await
.inspect_err(|message| error!("Error setting manual GPU clock: {message}")) .inspect_err(|message| error!("Error setting manual GPU clock: {message}"))
.map_err(anyhow_to_zbus) .map_err(to_zbus_error)
} }
#[zbus(property(emits_changed_signal = "const"))] #[zbus(property(emits_changed_signal = "const"))]
@ -240,12 +240,12 @@ impl SteamOSManager {
#[zbus(property(emits_changed_signal = "false"))] #[zbus(property(emits_changed_signal = "false"))]
async fn tdp_limit(&self) -> zbus::fdo::Result<u32> { async fn tdp_limit(&self) -> zbus::fdo::Result<u32> {
get_tdp_limit().await.map_err(anyhow_to_zbus_fdo) get_tdp_limit().await.map_err(to_zbus_fdo_error)
} }
#[zbus(property)] #[zbus(property)]
async fn set_tdp_limit(&self, limit: u32) -> zbus::Result<()> { async fn set_tdp_limit(&self, limit: u32) -> zbus::Result<()> {
set_tdp_limit(limit).await.map_err(anyhow_to_zbus) set_tdp_limit(limit).await.map_err(to_zbus_error)
} }
#[zbus(property(emits_changed_signal = "const"))] #[zbus(property(emits_changed_signal = "const"))]
@ -293,7 +293,7 @@ impl SteamOSManager {
} }
Err(e) => { Err(e) => {
error!("Error setting wifi debug mode: {e}"); error!("Error setting wifi debug mode: {e}");
Err(anyhow_to_zbus_fdo(e)) Err(to_zbus_fdo_error(e))
} }
} }
} }
@ -303,7 +303,7 @@ impl SteamOSManager {
async fn wifi_backend(&self) -> zbus::fdo::Result<u32> { async fn wifi_backend(&self) -> zbus::fdo::Result<u32> {
match get_wifi_backend().await { match get_wifi_backend().await {
Ok(backend) => Ok(backend as u32), Ok(backend) => Ok(backend as u32),
Err(e) => Err(anyhow_to_zbus_fdo(e)), Err(e) => Err(to_zbus_fdo_error(e)),
} }
} }
@ -321,7 +321,7 @@ impl SteamOSManager {
set_wifi_backend(backend) set_wifi_backend(backend)
.await .await
.inspect_err(|message| error!("Error setting wifi backend: {message}")) .inspect_err(|message| error!("Error setting wifi backend: {message}"))
.map_err(anyhow_to_zbus_fdo) .map_err(to_zbus_fdo_error)
} }
/// A version property. /// A version property.