From 2c71f4ad2be9b7c687b9fe7c00e8bdd04add018a Mon Sep 17 00:00:00 2001
From: LordGrimmauld <soeren@benjos.de>
Date: Tue, 2 Apr 2024 12:26:25 +0200
Subject: [PATCH] allow searching css independent of config path

---
 rmenu/src/cli.rs  | 50 ++++++++++++++++++++++++-----------------------
 rmenu/src/main.rs | 10 ++++------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/rmenu/src/cli.rs b/rmenu/src/cli.rs
index 169ecce..7f16489 100644
--- a/rmenu/src/cli.rs
+++ b/rmenu/src/cli.rs
@@ -10,7 +10,7 @@ use rmenu_plugin::{Entry, Message};
 use thiserror::Error;
 
 use crate::config::{cfg_replace, Config, Keybind};
-use crate::{DEFAULT_CONFIG, DEFAULT_THEME};
+use crate::{DEFAULT_CONFIG, DEFAULT_THEME, XDG_PREFIX};
 
 /// Allowed Formats for Entry Ingestion
 #[derive(Debug, Clone)]
@@ -179,28 +179,31 @@ pub enum RMenuError {
 pub type Result<T> = std::result::Result<T, RMenuError>;
 
 impl Args {
-    /// Find Configuration Path
-    pub fn find_config(&self) -> PathBuf {
-        self.config.clone().unwrap_or_else(|| {
-            xdg::BaseDirectories::with_prefix("rmenu")
+    /// Find a specifically named file across xdg config paths
+    fn find_xdg_file(&self, name: &str, base: &Option<PathBuf>) -> Option<String> {
+        return base.clone().or_else(|| {
+            xdg::BaseDirectories::with_prefix(XDG_PREFIX)
                 .expect("Failed to read xdg base dirs")
-                .find_config_file(DEFAULT_CONFIG)
-                .unwrap_or_else(PathBuf::new)
-        })
+                .find_config_file(name)
+        }).map(|f| f.to_string_lossy().to_string());
     }
 
     /// Load Configuration File
-    pub fn get_config(&self, path: &PathBuf) -> Result<Config> {
-        let path = path.to_string_lossy().to_string();
-        let path = shellexpand::tilde(&path).to_string();
-        let config: Config = match read_to_string(path) {
-            Ok(content) => serde_yaml::from_str(&content),
-            Err(err) => {
-                log::error!("Failed to Load Config: {err:?}");
-                Ok(Config::default())
-            }
-        }?;
-        Ok(config)
+    pub fn get_config(&self) -> Result<Config> {
+        let config = self.find_xdg_file(DEFAULT_CONFIG, &self.config);
+
+        if let Some (path) = config {
+            let config: Config = match read_to_string(path) {
+                Ok(content) => serde_yaml::from_str(&content),
+                Err(err) => {
+                    log::error!("Failed to Load Config: {err:?}");
+                    Ok(Config::default())
+                }
+            }?;
+            return Ok(config);
+        }
+        log::error!("Failed to Load Config: no file found in xdg config paths");
+        Ok(Config::default())
     }
 
     /// Update Configuration w/ CLI Specified Settings
@@ -242,11 +245,10 @@ impl Args {
     }
 
     /// Load CSS Theme or Default
-    pub fn get_theme(&self, cfgdir: &PathBuf) -> String {
-        let theme = self.theme.clone().or(Some(cfgdir.join(DEFAULT_THEME)));
-        if let Some(theme) = theme {
-            let path = theme.to_string_lossy().to_string();
-            let path = shellexpand::tilde(&path).to_string();
+    pub fn get_theme(&self) -> String {
+        let theme = self.find_xdg_file(DEFAULT_THEME, &self.theme);
+
+        if let Some(path) = theme {
             match read_to_string(&path) {
                 Ok(css) => return css,
                 Err(err) => log::error!("Failed to load CSS: {err:?}"),
diff --git a/rmenu/src/main.rs b/rmenu/src/main.rs
index e95ece2..08438ea 100644
--- a/rmenu/src/main.rs
+++ b/rmenu/src/main.rs
@@ -13,6 +13,7 @@ use rmenu_plugin::{self_exe, Entry};
 static CONFIG_DIR: &'static str = "~/.config/rmenu/";
 static DEFAULT_THEME: &'static str = "style.css";
 static DEFAULT_CONFIG: &'static str = "config.yaml";
+static XDG_PREFIX: &'static str = "rmenu";
 static DEFAULT_CSS_CONTENT: &'static str = include_str!("../public/default.css");
 
 /// Application State for GUI
@@ -43,8 +44,7 @@ fn main() -> cli::Result<()> {
 
     // parse cli and retrieve values for app
     let mut cli = cli::Args::parse();
-    let mut cfgpath = cli.find_config();
-    let mut config = cli.get_config(&cfgpath)?;
+    let mut config = cli.get_config()?;
     let entries = cli.get_entries(&mut config)?;
 
     // update config based on cli-settings and entries
@@ -55,10 +55,8 @@ fn main() -> cli::Result<()> {
             .any(|e| e.icon.is_some() || e.icon_alt.is_some());
     config.use_comments = config.use_comments && entries.iter().any(|e| e.comment.is_some());
 
-    // retrieve cfgdir and get theme/css
-    cfgpath.pop();
-    let cfgdir = cfgpath;
-    let theme = cli.get_theme(&cfgdir);
+
+    let theme = cli.get_theme();
     let css = cli.get_css(&config);
 
     // genrate app context and run gui