Using xdg crate.

- Using xdg to find config files on Linux/BSD systems.
- Quality of life improvements

Author: edfloreshz

Cargo.toml

@@ -25,6 +25,7 @@ rust-ini = "0.18"
 ashpd = { git = "https://github.com/bilelmoussaoui/ashpd", branch = "master" }
 crossbeam = "0.8.2"
 tokio = { version = "1.23.0", features = ["full"] }
+xdg = "2.4.1"
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.10"

src/freedesktop/detect.rs

@@ -1,59 +1,59 @@
 use anyhow::Context;
 use detect_desktop_environment::DesktopEnvironment;
 use ini::Ini;
-use std::path::{Path, PathBuf};
 
 use crate::Mode;
 
-const XDG_KDEGLOBALS: &str = "/etc/xdg/kdeglobals";
+use super::{CINNAMON, GNOME, MATE};
 
-fn detect_gtk(pattern: &str) -> Mode {
-    match dconf_rs::get_string(pattern) {
-        Ok(theme) => Mode::from(theme.to_lowercase().contains("dark")),
+pub fn detect() -> Mode {
+    match legacy_detect() {
+        Ok(mode) => mode,
         Err(_) => Mode::Default,
     }
 }
 
-fn detect_kde(path: &str) -> anyhow::Result<Mode> {
-    let cfg = Ini::load_from_file(path)?;
-    let section = cfg.section(Some("Colors:Window")).with_context(|| "Failed to get section Colors:Window")?;
-    let values = section.get("BackgroundNormal").with_context(|| "Failed to get BackgroundNormal inside Colors:Window")?;
-    let rgb = values
-        .split(',')
-        .map(|s| s.parse::<u32>().unwrap_or(255))
-        .collect::<Vec<u32>>();
-    let rgb = if rgb.len() >= 3 {
-        rgb
-    } else {
-        vec![255, 255, 255]
-    };
-    let (r, g, b) = (rgb[0], rgb[1], rgb[2]);
-    Ok(Mode::from_rgb(r, g, b))
-}
-
 fn legacy_detect() -> anyhow::Result<Mode> {
     let mode = match DesktopEnvironment::detect() {
-        DesktopEnvironment::Kde => {
-            let path = if Path::new(XDG_KDEGLOBALS).exists() {
-                PathBuf::from(XDG_KDEGLOBALS)
-            } else {
-                dirs::home_dir().unwrap().join(".config/kdeglobals")
-            };
-            detect_kde(path.to_str().unwrap())?
-        }
-        DesktopEnvironment::Cinnamon => detect_gtk("/org/cinnamon/desktop/interface/gtk-theme"),
-        DesktopEnvironment::Gnome => detect_gtk("/org/gnome/desktop/interface/gtk-theme"),
-        DesktopEnvironment::Mate => detect_gtk("/org/mate/desktop/interface/gtk-theme"),
-        DesktopEnvironment::Unity => detect_gtk("/org/gnome/desktop/interface/gtk-theme"),
+        DesktopEnvironment::Kde => kde_detect()?,
+        DesktopEnvironment::Cinnamon => dconf_detect(CINNAMON),
+        DesktopEnvironment::Gnome => dconf_detect(GNOME),
+        DesktopEnvironment::Mate => dconf_detect(MATE),
+        DesktopEnvironment::Unity => dconf_detect(GNOME),
         _ => Mode::Default,
     };
     Ok(mode)
 }
 
-pub fn detect() -> Mode {
-    match legacy_detect() {
-        Ok(mode) => mode,
+fn dconf_detect(path: &str) -> Mode {
+    match dconf_rs::get_string(path) {
+        Ok(theme) => Mode::from(Some(theme.to_lowercase().contains("dark"))),
         Err(_) => Mode::Default,
     }
 }
 
+fn kde_detect() -> anyhow::Result<Mode> {
+    let xdg = xdg::BaseDirectories::new()?;
+    let path = xdg.find_config_file("kdeglobals")
+        .context("Path not found")?;
+    let cfg = Ini::load_from_file(path)?;
+    let properties = cfg.section(Some("Colors:Window"))
+        .context("Failed to get section Colors:Window")?;
+    let background = properties.get("BackgroundNormal")
+        .context("Failed to get BackgroundNormal inside Colors:Window")?;
+    let rgb = rgb_from_string(background)?;
+    Ok(Mode::from_rgb(&rgb))
+}
+
+fn rgb_from_string(rgb: &str) -> anyhow::Result<Vec<u32>> {
+    rgb.split(',')
+        .map(|s| s.parse::<u32>().unwrap_or_else(|_| 255))
+        .try_fold(vec![255, 255, 255], |mut acc, x| {
+            if acc.len() < 3 {
+                acc.push(x);
+                Ok(acc)
+            } else {
+                Err(anyhow::anyhow!("Too many elements"))
+            }
+        })
+}

src/freedesktop/mod.rs

@@ -1,17 +1,6 @@
-use ashpd::desktop::settings::{Settings, ColorScheme};
-
-use crate::Mode;
-
 pub mod detect;
 pub mod notify;
 
-async fn get_freedesktop_color_scheme() -> anyhow::Result<Mode> {
-    let proxy = Settings::new().await?;
-    let color_scheme = proxy.color_scheme().await?;
-    let mode = match color_scheme {
-        ColorScheme::PreferDark => Mode::Dark,
-        ColorScheme::PreferLight => Mode::Light,
-        ColorScheme::NoPreference => Mode::Default,
-    };
-    Ok(mode)
-}
+const MATE: &str = "/org/mate/desktop/interface/gtk-theme";
+const GNOME: &str = "/org/gnome/desktop/interface/gtk-theme";
+const CINNAMON: &str = "/org/cinnamon/desktop/interface/gtk-theme";

src/freedesktop/notify.rs

@@ -4,8 +4,6 @@ use ashpd::desktop::settings::{Settings, ColorScheme};
 
 use crate::{Mode, detect};
 
-use super::get_freedesktop_color_scheme;
-
 pub async fn notify(tx: Sender<crate::Mode>) -> anyhow::Result<()> {
     if get_freedesktop_color_scheme().await.is_ok() {
         tokio::spawn(freedesktop_watch(tx));
@@ -16,6 +14,17 @@ pub async fn notify(tx: Sender<crate::Mode>) -> anyhow::Result<()> {
     Ok(())
 }
 
+async fn get_freedesktop_color_scheme() -> anyhow::Result<Mode> {
+    let proxy = Settings::new().await?;
+    let color_scheme = proxy.color_scheme().await?;
+    let mode = match color_scheme {
+        ColorScheme::PreferDark => Mode::Dark,
+        ColorScheme::PreferLight => Mode::Light,
+        ColorScheme::NoPreference => Mode::Default,
+    };
+    Ok(mode)
+}
+
 async fn freedesktop_watch(tx: Sender<Mode>) -> anyhow::Result<()> {
     let proxy = Settings::new().await?;
     while let Ok(color_scheme) = proxy.receive_color_scheme_changed().await {

src/lib.rs

@@ -77,15 +77,19 @@ pub enum Mode {
 }
 
 impl Mode {
-    fn from(b: bool) -> Self {
-        if b {
-            Mode::Dark
+    fn from(mode: Option<bool>) -> Self {
+        if let Some(mode) = mode {
+            if mode {
+                Mode::Dark
+            } else {
+                Mode::Light
+            }
         } else {
-            Mode::Light
+            Mode::Default
         }
     }
-    fn from_rgb(r: u32, g: u32, b: u32) -> Self {
-        let window_background_gray = (r * 11 + g * 16 + b * 5) / 32;
+    fn from_rgb(rgb: &[u32]) -> Self {
+        let window_background_gray = (rgb[0] * 11 + rgb[1] * 16 + rgb[2] * 5) / 32;
         if window_background_gray < 192 {
             Self::Dark
         } else {

src/macos/detect.rs

@@ -52,5 +52,5 @@ fn is_dark_mode_enabled() -> bool {
 }
 
 pub fn detect() -> crate::Mode {
-    Mode::from(is_dark_mode_enabled())
+    Mode::from(Some(is_dark_mode_enabled()))
 }

src/windows/detect.rs

@@ -8,7 +8,7 @@ pub fn detect() -> Mode {
     let hkcu = RegKey::predef(winreg::enums::HKEY_CURRENT_USER);
     if let Ok(subkey) = hkcu.open_subkey(SUBKEY) {
         if let Ok(dword) = subkey.get_value::<u32, _>(VALUE) {
-            return Mode::from(dword == 0);
+            return Mode::from(Some(dword == 0));
         }
     }
     Mode::Light