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

Change a bit to have separate SubProcess vs ProcessManager.

Browse source 
Keep next_process, connection, etc. in ProcessManager instead
of SteamOSManager.
Also change exit_code to only give the exit code if known.
Added wait to do the wait and get the proper
exit code on completion.
Also added libc::pid_t use in process.rs.
This commit is contained in:
Jeremy Whiting 2024-05-02 21:25:44 -06:00
parent cf1bf84d30
commit 88ce0ee123
5 changed files with 139 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/manager.rs
View file

@ -38,18 +38,17 @@ pub struct SteamOSManager {
// Whether we should use trace-cmd or not.
// True on galileo devices, false otherwise
should_trace: bool,
// Used by ProcessManager but need to only have one of these
next_process: u32,
process_manager: ProcessManager,
}
impl SteamOSManager {
pub async fn new(connection: Connection) -> Result<Self> {
Ok(SteamOSManager {
fan_control: FanControl::new(connection.clone()),
connection,
wifi_debug_mode: WifiDebugMode::Off,
should_trace: variant().await? == HardwareVariant::Galileo,
next_process: 0,
process_manager: ProcessManager::new(connection.clone()),
connection,
})
}
}
@ -147,38 +146,31 @@ impl SteamOSManager {
async fn update_bios(&mut self) -> zbus::fdo::Result<zbus::zvariant::OwnedObjectPath> {
// Update the bios as needed
ProcessManager::get_command_object_path(
"/usr/bin/jupiter-biosupdate",
&["--auto"],
&mut self.connection,
&mut self.next_process,
"updating BIOS",
)
.await
self.process_manager
.get_command_object_path("/usr/bin/jupiter-biosupdate", &["--auto"], "updating BIOS")
.await
}
async fn update_dock(&mut self) -> zbus::fdo::Result<zbus::zvariant::OwnedObjectPath> {
// Update the dock firmware as needed
ProcessManager::get_command_object_path(
"/usr/lib/jupiter-dock-updater/jupiter-dock-updater.sh",
&[] as &[String; 0],
&mut self.connection,
&mut self.next_process,
"updating dock",
)
.await
self.process_manager
.get_command_object_path(
"/usr/lib/jupiter-dock-updater/jupiter-dock-updater.sh",
&[] as &[String; 0],
"updating dock",
)
.await
}
async fn trim_devices(&mut self) -> zbus::fdo::Result<zbus::zvariant::OwnedObjectPath> {
// Run steamos-trim-devices script
ProcessManager::get_command_object_path(
"/usr/lib/hwsupport/trim-devices.sh",
&[] as &[String; 0],
&mut self.connection,
&mut self.next_process,
"trimming devices",
)
.await
self.process_manager
.get_command_object_path(
"/usr/lib/hwsupport/trim-devices.sh",
&[] as &[String; 0],
"trimming devices",
)
.await
}
async fn format_device(
@ -191,14 +183,13 @@ impl SteamOSManager {
if !validate {
args.push("--skip-validation");
}
ProcessManager::get_command_object_path(
"/usr/lib/hwsupport/format-device.sh",
args.as_ref(),
&mut self.connection,
&mut self.next_process,
format!("formatting {device}").as_str(),
)
.await
self.process_manager
.get_command_object_path(
"/usr/lib/hwsupport/format-device.sh",
args.as_ref(),
format!("formatting {device}").as_str(),
)
.await
}
#[zbus(property(emits_changed_signal = "false"))]