Windows tilde expansion and multiple config / theme paths

CHANGELOG.md

@@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   configuration fields) to truncate user and group names if they exceed a certain number
   of characters (disabled by default).
 - Add support for `--literal` from [PanGan21](https://github.com/PanGan21)
+- Add support for tilde (`~`) expansion on Windows from [Ofer Sadan](https://github.com/ofersadan85)
+- Add support to search multiple paths for config file and theme files from [Ofer Sadan](https://github.com/ofersadan85):
+  - `$XDG_CONFIG_HOME/lsd` or `$HOME/.config/lsd` (in that order) on non-Windows platforms (these are usually the same)
+  - `%APPDATA%\lsd` or `%USERPROFILE%\.config\lsd` (in that order) on Windows
+- Add support for both `config.yaml` and `config.yml` for the config file name from [Ofer Sadan](https://github.com/ofersadan85)
 
 ## [v1.0.0] - 2023-08-25
 

Cargo.toml

@@ -23,7 +23,7 @@ version_check = "0.9.*"
 
 [dependencies]
 crossterm = { version = "0.27.0", features = ["serde"] }
-dirs = "4"
+dirs = "5.0.1"
 libc = "0.2.*"
 human-sort = "0.2.2"
 term_grid = "0.1.*"
@@ -37,7 +37,6 @@ unicode-width = "0.1.*"
 lscolors = "0.15.0"
 wild = "2.0"
 globset = "0.4.*"
-xdg = "2.1"
 yaml-rust = "0.4.*"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.8"

README.md

@@ -102,16 +102,21 @@ Check [Config file content](#config-file-content) for details.
 
 On non-Windows systems `lsd` follows the
 [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html)
-convention for the location of the configuration file. The configuration dir
-`lsd` uses is itself named `lsd`. In that directory it looks first for a file
-called `config.yaml`.
-For most people it should be enough to put their config file at
-`~/.config/lsd/config.yaml`.
+convention for the location of the configuration file. A `config.yaml` or `config.yml` file will be searched for in these locations, in order:
+
+- `$XDG_CONFIG_HOME/lsd`
+- `$HOME/.config/lsd`
+
+On most systems these are mapped to the same location, which is `~/.config/lsd/config.yaml`.
 
 ### Windows
 
-On Windows systems `lsd` only looks for the `config.yaml` files in one location:
-`%APPDATA%\lsd\`
+On Windows systems `lsd` searches for `config.yaml` or `config.yml` in the following locations, in order:
+
+- `%APPDATA%\lsd`
+- `%USERPROFILE%\.config\lsd`
+
+These are usually something like `C:\Users\username\AppData\Roaming\lsd\config.yaml` and `C:\Users\username\.config\lsd\config.yaml` respectively.
 
 ### Custom
 

src/config_file.rs

@@ -17,9 +17,6 @@
 use std::fs;
 use std::io;
 
-const CONF_DIR: &str = "lsd";
-const CONF_FILE_NAME: &str = "config.yaml";
-
 /// A struct to hold an optional configuration items, and provides methods
 /// around error handling in a config file.
 #[derive(Eq, PartialEq, Debug, Deserialize)]
@@ -144,27 +141,6 @@
         serde_yaml::from_str::<Self>(yaml)
     }
 
-    /// This provides the path for a configuration file, according to the XDG_BASE_DIRS specification.
-    /// return None if error like PermissionDenied
-    #[cfg(not(windows))]
-    pub fn config_file_path() -> Option<PathBuf> {
-        use xdg::BaseDirectories;
-        match BaseDirectories::with_prefix(CONF_DIR) {
-            Ok(p) => Some(p.get_config_home()),
-            Err(e) => {
-                print_error!("Can not open config file: {}.", e);
-                None
-            }
-        }
-    }
-
-    /// This provides the path for a configuration file, inside the %APPDATA% directory.
-    /// return None if error like PermissionDenied
-    #[cfg(windows)]
-    pub fn config_file_path() -> Option<PathBuf> {
-        dirs::config_dir().map(|x| x.join(CONF_DIR))
-    }
-
     /// This expand the `~` in path to HOME dir
     /// returns the origin one if no `~` found;
     /// returns None if error happened when getting home dir
@@ -189,16 +165,44 @@
             }
         })
     }
+
+    /// Config paths for non-Windows platforms will be read from
+    /// `$XDG_CONFIG_HOME/lsd` or `$HOME/.config/lsd`
+    /// (usually, those are the same) in that order.
+    /// The default paths for Windows will be read from
+    /// `%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> {
+        [
+            dirs::config_dir(),
+            dirs::home_dir().map(|h| h.join(".config")),
+        ]
+        .iter()
+        .filter_map(|p| p.as_ref().map(|p| p.join("lsd")))
+        .collect::<Vec<_>>()
+        .into_iter()
+    }
 }
 
 impl Default for Config {
+    /// Try to find either config.yaml or config.yml in the config directories
+    /// and use the first one that is found. If none are found, or the parsing fails,
+    /// use the default from DEFAULT_CONFIG.
     fn default() -> Self {
-        if let Some(p) = Self::config_file_path() {
-            if let Some(c) = Self::from_file(p.join(CONF_FILE_NAME)) {
-                return c;
-            }
-        }
-        Self::from_yaml(DEFAULT_CONFIG).unwrap()
+        Config::config_paths()
+            .find_map(|p| {
+                let yaml = p.join("config.yaml");
+                let yml = p.join("config.yml");
+                if yaml.is_file() {
+                    Config::from_file(yaml)
+                } else if yml.is_file() {
+                    Config::from_file(yml)
+                } else {
+                    None
+                }
+            })
+            .or(Self::from_yaml(DEFAULT_CONFIG).ok())
+            .expect("Failed to read both config file and default config")
     }
 }
 

src/core.rs

@@ -19,6 +19,8 @@
 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 {
@@ -105,6 +107,9 @@
             _ => 1,
         };
 
+        #[cfg(target_os = "windows")]
+        let paths: Vec<PathBuf> = paths.into_iter().map(windows_utils::expand_home).collect();
+
         for path in paths {
             let mut meta = match Meta::from_path(
                 &path,

src/main.rs

@@ -18,7 +18,6 @@ extern crate terminal_size;
 extern crate unicode_width;
 extern crate url;
 extern crate wild;
-extern crate xdg;
 extern crate yaml_rust;
 
 #[cfg(unix)]

src/meta/filetype.rs

@@ -16,7 +16,7 @@ pub enum FileType {
 
 impl FileType {
     #[cfg(windows)]
-    const EXECUTABLE_EXTENSIONS: &[&'static str] = &["exe", "msi", "bat", "ps1"];
+    const EXECUTABLE_EXTENSIONS: &'static[&'static str] = &["exe", "msi", "bat", "ps1"];
 
     #[cfg(unix)]
     pub fn new(

src/meta/mod.rs

@@ -13,7 +13,7 @@
 mod symlink;
 
 #[cfg(windows)]
-mod windows_utils;
+pub mod windows_utils;
 
 pub use self::access_control::AccessControl;
 pub use self::date::Date;
@@ -27,7 +27,7 @@
 pub use self::permissions::Permissions;
 pub use self::size::Size;
 pub use self::symlink::SymLink;
 pub use crate::icon::Icons;
 
 use crate::flags::{Display, Flags, Layout, PermissionFlag};
 use crate::{print_error, ExitCode};

src/meta/windows_utils.rs

@@ -2,7 +2,7 @@
 use std::io;
 use std::mem::MaybeUninit;
 use std::os::windows::ffi::{OsStrExt, OsStringExt};
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use windows::Win32::Foundation::PSID;
 use windows::Win32::Security::{self, Authorization::TRUSTEE_W, ACL};
@@ -343,6 +343,18 @@
     )
 }
 
+/// 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::*;

src/theme.rs

@@ -38,9 +38,9 @@
 }
 
 impl Theme {
-    /// This read theme from file,
-    /// use the file path if it is absolute
-    /// prefix the config_file dir to it if it is not
+    /// Read theme from a file path
+    /// use the file path as-is if it is absolute
+    /// search the config paths folders for it if not
     pub fn from_path<D>(file: &str) -> Result<D, Error>
     where
         D: DeserializeOwned + Default,
@@ -54,9 +54,16 @@
         let path = if Path::new(&real).is_absolute() {
             real
         } else {
-            match config_file::Config::config_file_path() {
-                Some(p) => p.join(real),
-                None => return Err(Error::InvalidPath("config home not existed".into())),
+            let path = config_file::Config::config_paths()
+                .map(|p| p.join(real.clone()))
+                .find(|p| p.is_file());
+            match path {
+                Some(p) => p,
+                None => {
+                    return Err(Error::InvalidPath(
+                        "Did not find theme file in config folders".into(),
+                    ))
+                }
             }
         };