Merge pull request #22 from AaronErhardt/fix-missing-perf-prof

tailord: Gracefully handle missing performance profiles
AaronErhardt · Aug 30, 2023 · a1338db · a1338db
2 parents 30209f9 + 7a45ee7
commit a1338db
Show file tree

Hide file tree

Showing 12 changed files with 145 additions and 74 deletions.
diff --git a/tailor_cli/src/main.rs b/tailor_cli/src/main.rs
@@ -9,9 +9,8 @@ use crate::cli::{Command, Opts};
 #[tokio::main]
 async fn main() -> Result<()> {
     let args = Opts::parse();
-    match args.command {
-        Some(Command::Profile { profile_cmd }) => profile::handle(profile_cmd).await?,
-        None => {}
+    if let Some(Command::Profile { profile_cmd }) = args.command {
+        profile::handle(profile_cmd).await?;
     }
     Ok(())
 }
diff --git a/tailor_cli/src/profile.rs b/tailor_cli/src/profile.rs
@@ -34,7 +34,7 @@ pub(crate) async fn handle(cmd: ProfileCommand) -> Result<()> {
             if let Some(next_profile_name) = next_profile_name {
                 let profile_updated_msg = format!("Current profile: {}", next_profile_name);
                 connection
-                    .set_active_global_profile_name(&next_profile_name)
+                    .set_active_global_profile_name(next_profile_name)
                     .await?;
                 if verbose {
                     println!("{}", profile_updated_msg)

diff --git a/tailor_gui/.vscode/settings.json b/tailor_gui/.vscode/settings.json
@@ -16,8 +16,8 @@
     "mesonbuild.configureOnOpen": false,
     "mesonbuild.buildFolder": "_build",
     "mesonbuild.mesonPath": "/home/aaron/Nextcloud/dev/Projects/Active/tuxedo-rs/tailor_gui/.flatpak/meson.sh",
-    "rust-analyzer.server.path": "/home/aaron/Nextcloud/dev/Projects/Active/tuxedo-rs/tailor_gui/.flatpak/rust-analyzer.sh",
-    "rust-analyzer.runnables.command": "/home/aaron/Nextcloud/dev/Projects/Active/tuxedo-rs/tailor_gui/.flatpak/cargo.sh",
+    "rust-analyzer.server.path": "${workspaceFolder}/.flatpak/rust-analyzer.sh",
+    "rust-analyzer.runnables.command": "${workspaceFolder}/.flatpak/cargo.sh",
     "rust-analyzer.files.excludeDirs": [
         ".flatpak"
     ]

diff --git a/tailor_gui/Cargo.lock b/tailor_gui/Cargo.lock
diff --git a/tailor_gui/Cargo.toml b/tailor_gui/Cargo.toml
@@ -11,12 +11,12 @@ repository = "https://github.com/AaronErhardt/tuxedo-rs"
 futures = "0.3.28"
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
 once_cell = "1.17.1"
-relm4-components = { version = "0.6.0-beta.1" }
-relm4 = { version = "0.6.0-beta.1", features = ["libadwaita", "gnome_44"] }
+relm4-components = { version = "0.6.0" }
+relm4 = { version = "0.6.0", features = ["libadwaita", "gnome_44"] }
 tailor_api = "0.2.1"
 tailor_client = "0.2.1"
 tokio = { version = "1.27", features = ["parking_lot"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"
 tracker = "0.2"
-relm4-icons = { version = "0.6.0-beta.6", features = ["plus", "settings", "speedometer", "menu-large", "up", "down", "color", "cross-filled", "data-bar-vertical-ascending-filled"] }
+relm4-icons = { version = "0.6.0", features = ["plus", "settings", "speedometer", "menu-large", "up", "down", "color", "cross-filled", "data-bar-vertical-ascending-filled"] }
diff --git a/tailor_gui/src/components/factories/profile.rs b/tailor_gui/src/components/factories/profile.rs
@@ -24,7 +24,7 @@ pub struct Profile {
     pub active: bool,
     pub leds: FactoryVecDeque<ProfileItemLed>,
     pub fans: FactoryVecDeque<ProfileItemFan>,
-    pub performance: Controller<SimpleComboBox<String>>,
+    pub performance: Option<Controller<SimpleComboBox<String>>>,
 }
 
 #[derive(Debug)]
@@ -96,6 +96,8 @@ impl FactoryComponent for Profile {
 
             #[template]
             add_row = &templates::ProfileListItem {
+                set_visible: self.performance.is_some(),
+
                 #[template_child]
                 image -> gtk::Image {
                     set_icon_name: Some(icon_name::SPEEDOMETER),
@@ -108,7 +110,7 @@ impl FactoryComponent for Profile {
 
                 #[template_child]
                 row -> gtk::Box {
-                    append: self.performance.widget(),
+                    append?: self.performance.as_ref().map(Controller::widget),
                 }
             }
         }
@@ -186,18 +188,21 @@ impl FactoryComponent for Profile {
             }
         }
 
-        let active_index = info.performance_profile.as_ref().and_then(|profile| {
-            capabilities
-                .performance_profiles
-                .iter()
-                .position(|name| name == profile)
-        });
-        let performance = SimpleComboBox::builder()
-            .launch(SimpleComboBox {
-                variants: capabilities.performance_profiles.clone(),
-                active_index,
-            })
-            .forward(sender.input_sender(), |_| ProfileInput::UpdateProfile);
+        let performance = capabilities
+            .performance_profiles
+            .as_ref()
+            .map(|cap_perf_prof| {
+                let active_index = info
+                    .performance_profile
+                    .as_ref()
+                    .and_then(|profile| cap_perf_prof.iter().position(|name| name == profile));
+                SimpleComboBox::builder()
+                    .launch(SimpleComboBox {
+                        variants: cap_perf_prof.clone(),
+                        active_index,
+                    })
+                    .forward(sender.input_sender(), |_| ProfileInput::UpdateProfile)
+            });
 
         Self {
             name,
@@ -227,11 +232,8 @@ impl FactoryComponent for Profile {
 
                 let performance_profile = self
                     .performance
-                    .state()
-                    .get()
-                    .model
-                    .get_active_elem()
-                    .cloned();
+                    .as_ref()
+                    .and_then(|perf| perf.state().get().model.get_active_elem().cloned());
 
                 self.info = ProfileInfo {
                     leds,