✨ add xdg dir back

Signed-off-by: Wei Zhang <[email protected]>

Cargo.toml

@@ -42,6 +42,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 url = "2.1"
 vsort = "0.2"
+xdg = "2.5"
 
 [target."cfg(not(all(windows, target_arch = \"x86\", target_env = \"gnu\")))".dependencies]
 # if ssl feature is enabled compilation will fail on arm-unknown-linux-gnueabihf and i686-pc-windows-gnu

src/config_file.rs

@@ -173,9 +173,16 @@ impl Config {
     /// `%APPDATA%\lsd` or `%USERPROFILE%\.config\lsd` in that order.
     /// This will apply both to the config file and the theme file.
     pub fn config_paths() -> impl Iterator<Item = PathBuf> {
+        #[cfg(not(windows))]
+        use xdg::BaseDirectories;
+
         [
-            dirs::config_dir(),
             dirs::home_dir().map(|h| h.join(".config")),
+            dirs::config_dir(),
+            #[cfg(not(windows))]
+            BaseDirectories::with_prefix("")
+                .ok()
+                .map(|p| p.get_config_home()),
         ]
         .iter()
         .filter_map(|p| p.as_ref().map(|p| p.join("lsd")))

src/core.rs

@@ -18,8 +18,6 @@ use std::os::unix::io::AsRawFd;
 use crate::flags::blocks::Block;
 use crate::git_theme::GitTheme;
 #[cfg(target_os = "windows")]
-use crate::meta::windows_utils;
-#[cfg(target_os = "windows")]
 use terminal_size::terminal_size;
 
 pub struct Core {
@@ -107,7 +105,12 @@ impl Core {
         };
 
         #[cfg(target_os = "windows")]
-        let paths: Vec<PathBuf> = paths.into_iter().map(windows_utils::expand_home).collect();
+        use crate::config_file;
+        #[cfg(target_os = "windows")]
+        let paths: Vec<PathBuf> = paths
+            .into_iter()
+            .filter_map(config_file::expand_home)
+            .collect();
 
         for path in paths {
             let mut meta =

src/meta/windows_utils.rs

@@ -2,7 +2,7 @@ use std::ffi::{OsStr, OsString};
 use std::io;
 use std::mem::MaybeUninit;
 use std::os::windows::ffi::{OsStrExt, OsStringExt};
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use windows::Win32::Foundation::PSID;
 use windows::Win32::Security::{self, Authorization::TRUSTEE_W, ACL};
@@ -343,18 +343,6 @@ pub fn is_path_system(path: &Path) -> bool {
     )
 }
 
-/// Expands the `~` in a path to the current user's home directory
-pub fn expand_home(path: PathBuf) -> PathBuf {
-    if path.starts_with("~") {
-        if let Some(home) = dirs::home_dir() {
-            let mut expanded = home.to_path_buf();
-            expanded.push(path.strip_prefix("~").unwrap());
-            return expanded;
-        }
-    }
-    path
-}
-
 #[cfg(test)]
 mod test {
     use super::*;