refactor

Author: Byron

crates/but-settings/src/persistence.rs

@@ -20,7 +20,6 @@ impl AppSettings {
 
         // merge customizations from disk into the defaults to get a complete set of settings.
         let customizations = serde_json_lenient::from_str(&std::fs::read_to_string(config_path)?)?;
-
         let mut settings: serde_json::Value = serde_json_lenient::from_str(DEFAULTS)?;
 
         merge_non_null_json_value(customizations, &mut settings);

crates/but-settings/src/watch.rs

@@ -1,8 +1,7 @@
 use crate::AppSettings;
 use anyhow::Result;
-use notify::{
-    Config, Event, RecommendedWatcher, RecursiveMode, Watcher, event::ModifyKind, event::RemoveKind,
-};
+use notify::event::RemoveKind;
+use notify::{Config, Event, RecommendedWatcher, RecursiveMode, Watcher, event::ModifyKind};
 use std::ops::{Deref, DerefMut};
 use std::path::Path;
 use std::{
@@ -132,6 +131,10 @@ 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),
                         ..
@@ -140,9 +143,11 @@ impl AppSettingsWithDiskSync {
                             continue;
                         };
                         if let Ok(update) = AppSettings::load(&config_path) {
-                            tracing::info!("settings.json modified; refreshing settings");
-                            *last_seen_settings = update.clone();
+                            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)?;
                         }
                     }