Format code and add GTK dependencies

CI now installs GTK development dependencies on Linux. Rust code
simplified to use let-else chains and range patterns where applicable.

Author: vim-zz

.github/workflows/ci.yml

@@ -41,6 +41,12 @@ jobs:
       - name: cargo test (core)
         run: cargo test -p something_bg_core
 
+      - name: Install GTK deps (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libgtk-3-dev libayatana-appindicator3-dev
+
       - name: cargo check (mac app)
         if: runner.os == 'macOS'
         run: cargo check -p something_bg

core/src/config.rs

@@ -146,25 +146,25 @@ impl Config {
 
         let mut tunnels = Vec::new();
 
-        if let Some(tunnels_value) = table.get("tunnels") {
-            if let Some(tunnels_table) = tunnels_value.as_table() {
-                // With preserve_order feature, this iteration maintains order
-                for (key, value) in tunnels_table {
-                    let tunnel_config: TunnelConfig = value.clone().try_into()?;
-                    tunnels.push((key.clone(), tunnel_config));
-                }
+        if let Some(tunnels_value) = table.get("tunnels")
+            && let Some(tunnels_table) = tunnels_value.as_table()
+        {
+            // With preserve_order feature, this iteration maintains order
+            for (key, value) in tunnels_table {
+                let tunnel_config: TunnelConfig = value.clone().try_into()?;
+                tunnels.push((key.clone(), tunnel_config));
             }
         }
 
         let mut schedules = Vec::new();
 
-        if let Some(tasks_value) = table.get("schedules") {
-            if let Some(tasks_table) = tasks_value.as_table() {
-                // With preserve_order feature, this iteration maintains order
-                for (key, value) in tasks_table {
-                    let task_config: ScheduledTaskConfig = value.clone().try_into()?;
-                    schedules.push((key.clone(), task_config));
-                }
+        if let Some(tasks_value) = table.get("schedules")
+            && let Some(tasks_table) = tasks_value.as_table()
+        {
+            // With preserve_order feature, this iteration maintains order
+            for (key, value) in tasks_table {
+                let task_config: ScheduledTaskConfig = value.clone().try_into()?;
+                schedules.push((key.clone(), task_config));
             }
         }
 

core/src/scheduler.rs

@@ -32,7 +32,7 @@ fn load_task_states(path: &PathBuf) -> HashMap<String, TaskState> {
         return HashMap::new();
     }
 
-    match fs::read_to_string(&path) {
+    match fs::read_to_string(path) {
         Ok(contents) => match toml::from_str(&contents) {
             Ok(states) => {
                 info!("Loaded task states from {}", path.display());
@@ -53,16 +53,16 @@ fn load_task_states(path: &PathBuf) -> HashMap<String, TaskState> {
 /// Save task states to disk
 fn save_task_states(path: &PathBuf, states: &HashMap<String, TaskState>) {
     // Ensure the directory exists
-    if let Some(parent) = path.parent() {
-        if let Err(e) = fs::create_dir_all(parent) {
-            error!("Failed to create state directory: {}", e);
-            return;
-        }
+    if let Some(parent) = path.parent()
+        && let Err(e) = fs::create_dir_all(parent)
+    {
+        error!("Failed to create state directory: {}", e);
+        return;
     }
 
     match toml::to_string_pretty(&states) {
         Ok(toml_content) => {
-            if let Err(e) = fs::write(&path, toml_content) {
+            if let Err(e) = fs::write(path, toml_content) {
                 error!("Failed to write task state file: {}", e);
             } else {
                 debug!("Saved task states to {}", path.display());
@@ -547,7 +547,7 @@ fn format_relative_datetime(dt: &DateTime<Local>) -> String {
 /// Return ordinal suffix for a day (1st, 2nd, 3rd, 4th, ...).
 fn ordinal(day: u32) -> String {
     let suffix = match day % 100 {
-        11 | 12 | 13 => "th",
+        11..=13 => "th",
         _ => match day % 10 {
             1 => "st",
             2 => "nd",

core/src/tunnel.rs

@@ -74,10 +74,9 @@ impl TunnelManager {
                     let new_path = cmd
                         .get_envs()
                         .find(|(key, _)| key == &OsStr::new("PATH"))
-                        .map(|(_, value)| {
+                        .and_then(|(_, value)| {
                             value.map(|path| format!("{}:{}", config_path, path.to_string_lossy()))
                         })
-                        .flatten()
                         .unwrap_or_else(|| config_path.clone());
 
                     debug!("Update PATH to: {new_path}");