Merge pull request #10379 from TheGB0077/revert

fix(settings): Enhance settings file observability

Author: krlvi

crates/but-path/src/lib.rs

@@ -13,7 +13,7 @@ pub fn app_config_dir() -> anyhow::Result<PathBuf> {
     if let Ok(test_dir) = std::env::var("E2E_TEST_APP_DATA_DIR") {
         return Ok(PathBuf::from(test_dir).join("gitbutler"));
     }
-    dirs::data_dir()
+    dirs::config_dir()
         .ok_or(anyhow::anyhow!("Could not get app data dir"))
         .map(|dir| dir.join("gitbutler"))
 }

crates/but-settings/src/watch.rs

@@ -1,5 +1,6 @@
 use crate::AppSettings;
 use anyhow::Result;
+use notify::event::RemoveKind;
 use notify::{Config, Event, RecommendedWatcher, RecursiveMode, Watcher, event::ModifyKind};
 use std::ops::{Deref, DerefMut};
 use std::path::Path;
@@ -130,7 +131,26 @@ impl AppSettingsWithDiskSync {
                             send_event(update)?;
                         }
                     }
+                    // On linux (maybe even other platforms) Modify doesn't trigger as we replace
+                    // the original file with a new one when writing.
+                    // On Linux, the watcher then also doesn't keep watching the new file, despite being
+                    // at the same path.
+                    Ok(Ok(Event {
+                        kind: notify::event::EventKind::Remove(RemoveKind::File),
+                        ..
+                    })) if cfg!(target_os = "linux") => {
+                        let Ok(mut last_seen_settings) = snapshot.write() else {
+                            continue;
+                        };
+                        if let Ok(update) = AppSettings::load(&config_path) {
+                            tracing::info!("settings.json replaced; refreshing settings");
+                            // Have to rewatch the path here as the watcher loses track.
+                            watcher.watch(&config_path, RecursiveMode::NonRecursive)?;
 
+                            *last_seen_settings = update.clone();
+                            send_event(update)?;
+                        }
+                    }
                     Err(_) => {
                         tracing::error!(
                             "Error watching config file {:?} - watcher terminated",

crates/gitbutler-tauri/src/main.rs

@@ -37,9 +37,7 @@ fn main() {
     let mut tauri_context = generate_context!();
     gitbutler_secret::secret::set_application_namespace(&tauri_context.config().identifier);
 
-    let config_dir = but_path::app_config_dir()
-        .expect("missing config dir")
-        .join("gitbutler");
+    let config_dir = but_path::app_config_dir().expect("missing config dir");
     std::fs::create_dir_all(&config_dir).expect("failed to create config dir");
     let mut app_settings =
         AppSettingsWithDiskSync::new(config_dir.clone()).expect("failed to create app settings");