feat(clipcatd): search for fallback configuration directories

xrelkd · Apr 21, 2024 · ce1e49d · ce1e49d
1 parent ddf63ea
commit ce1e49d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/clipcatd/src/command.rs b/clipcatd/src/command.rs
@@ -107,7 +107,7 @@ impl Cli {
     }
 
     fn load_config(&self) -> Result<Config, Error> {
-        let config_file = &self.config_file.clone().unwrap_or_else(Config::default_path);
+        let config_file = &self.config_file.clone().unwrap_or_else(Config::search_config_file_path);
         let mut config = Config::load(config_file)?;
 
         config.daemonize = !self.no_daemon;

diff --git a/clipcatd/src/config/mod.rs b/clipcatd/src/config/mod.rs
@@ -78,6 +78,27 @@ impl Default for Config {
 }
 
 impl Config {
+    pub fn search_config_file_path() -> PathBuf {
+        let paths = vec![Self::default_path()]
+            .into_iter()
+            .chain(clipcat_base::fallback_project_config_directories().into_iter().map(
+                |mut path| {
+                    path.push(clipcat_base::DAEMON_CONFIG_NAME);
+                    path
+                },
+            ))
+            .collect::<Vec<_>>();
+        for path in paths {
+            let Ok(exists) = path.try_exists() else {
+                continue;
+            };
+            if exists {
+                return path;
+            }
+        }
+        Self::default_path()
+    }
+
     #[inline]
     pub fn default_path() -> PathBuf {
         [