glob-tilde-expansion #149

src/lib.rs

@@ -70,6 +70,8 @@ extern crate doc_comment;
 #[cfg(test)]
 doctest!("../README.md");
 
+mod utils;
+
 use std::cmp;
 use std::cmp::Ordering;
 use std::error::Error;
@@ -179,6 +181,7 @@ pub fn glob(pattern: &str) -> Result<Paths, PatternError> {
 ///
 /// Paths are yielded in alphabetical order.
 pub fn glob_with(pattern: &str, options: MatchOptions) -> Result<Paths, PatternError> {
+    use utils::{get_home_dir, get_user_name};
     #[cfg(windows)]
     fn check_windows_verbatim(p: &Path) -> bool {
         match p.components().next() {
@@ -211,7 +214,28 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Result<Paths, PatternE
 
     // make sure that the pattern is valid first, else early return with error
     let _ = Pattern::new(pattern)?;
-
+    let mut new_pattern = pattern.to_owned();
+    if options.glob_tilde_expansion {
+        let home_dir = get_home_dir();
+        if pattern == "~" || pattern.starts_with("~/") {
+            if let Some(home) = home_dir {
+                new_pattern = pattern.replacen("~", &home, 1);
+            }
+        } else if pattern.starts_with("~") {
+            if let Some(user) = get_user_name() {
+                match pattern.strip_prefix("~").unwrap().strip_prefix(&user) {
+                    Some(v) if v.starts_with("/") || v.is_empty() => {
+                        if let Some(mut p) = home_dir {
+                            p.push_str(v);
+                            new_pattern = p;
+                        }
+                    }
+                    _ => {}
+                };
+            }
+        }
+    }
+    let pattern = new_pattern.as_str();
     let mut components = Path::new(pattern).components().peekable();
     loop {
         match components.peek() {
@@ -1050,7 +1074,7 @@ fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool {
 
 /// Configuration options to modify the behaviour of `Pattern::matches_with(..)`.
 #[allow(missing_copy_implementations)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct MatchOptions {
     /// Whether or not patterns should be matched in a case-sensitive manner.
     /// This currently only considers upper/lower case relationships between
@@ -1069,6 +1093,21 @@ pub struct MatchOptions {
     /// conventionally considered hidden on Unix systems and it might be
     /// desirable to skip them when listing files.
     pub require_literal_leading_dot: bool,
+
+    /// Whether or not tilde expansion should be performed. if home directory
+    /// or user name cannot be determined, then no tilde expansion is performed.
+    pub glob_tilde_expansion: bool,
+}
+
+impl Default for MatchOptions {
+    fn default() -> Self {
+        Self {
+            case_sensitive: true,
+            require_literal_separator: false,
+            require_literal_leading_dot: false,
+            glob_tilde_expansion: false,
+        }
+    }
 }
 
 impl MatchOptions {
@@ -1083,19 +1122,14 @@ impl MatchOptions {
     ///     case_sensitive: true,
     ///     require_literal_separator: false,
     ///     require_literal_leading_dot: false
+    ///     glob_tilde_expansion: false,
     /// }
     /// ```
-    ///
     /// # Note
     /// The behavior of this method doesn't match `default()`'s. This returns
     /// `case_sensitive` as `true` while `default()` does it as `false`.
-    // FIXME: Consider unity the behavior with `default()` in a next major release.
     pub fn new() -> Self {
-        Self {
-            case_sensitive: true,
-            require_literal_separator: false,
-            require_literal_leading_dot: false,
-        }
+        Self::default()
     }
 }
 

src/utils.rs

@@ -0,0 +1,14 @@
+#[inline(always)]
+pub(crate) fn get_home_dir() -> Option<String> {
+	#[allow(deprecated)]
+    std::env::home_dir().and_then(|v| v.to_str().map(String::from))
+}
+
+// This function is required when `glob_tilde_expansion` field of `glob::MatchOptions` is
+// set `true` and pattern starts with `~` followed by any char expect `/`
+pub(crate) fn get_user_name() -> Option<String> {
+    #[cfg(not(target_os = "windows"))]
+    return std::env::var("USER").ok();
+    #[cfg(target_os = "windows")]
+    std::env::var("USERNAME").ok()
+}