fix: hidden don't works on some files (#188)

like --hidden '*.abc-cba' matches xyz.abc-cba but do not matches 123.xyz.abc-cba

diff --git a/Cargo.lock b/Cargo.lock
index 49fb386507808c5c09b27df2a070a5d59430f8a4..400effaf16d8c09f5e33208a0df154e08710bada 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -444,6 +444,7 @@ dependencies = [
  "diqwest",
  "form_urlencoded",
  "futures",
+ "glob",
  "headers",
  "hyper",
  "if-addrs",
@@ -683,6 +684,12 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "globset"
 version = "0.4.10"

diff --git a/Cargo.toml b/Cargo.toml
index 8a7a68c6b86030252e910e7d74e09a461d0175bd..72bf47b412ebfafa9e8e6a6a783917f4a37e227a 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,7 @@ alphanumeric-sort = "1.4"
 content_inspector = "0.2"
 anyhow = "1.0"
 chardetng = "0.1"
+glob = "0.3.1"
 
 [features]
 default = ["tls"]

diff --git a/README.md b/README.md
index 1f6b1decb60d1601c437125ed505af00ed343d8a..3ff314db3eebb724cf4a17f741c32fa2589c7def 100644 (file)
--- a/README.md
+++ b/README.md
@@ -243,21 +243,18 @@ Since dufs only allows viewing/downloading, `admin` can only view/download files
 
 ### Hide Paths
 
-Dufs supports hiding paths from directory listings via option `--hidden`.
+Dufs supports hiding paths from directory listings via option `--hidden <glob>,...`.
 
 ```
 dufs --hidden .git,.DS_Store,tmp
 ```
 
-`--hidden` also supports a variant glob:
-
-- `?` matches any single character
-- `*` matches any (possibly empty) sequence of characters
-- `**`, `[..]`, `[!..]` is not supported
+> The glob used in --hidden only matches file and directory names, not paths. So `--hidden dir1/file` is invalid.
 
 ```sh
-dufs --hidden '.*'
-dufs --hidden '*.log,*.lock'
+dufs --hidden '.*'            # hidden dotfiles
+dufs --hidden '*/'            # hidden all folders
+dufs --hidden '*.log,*.lock'  # hidden by exts
 ```
 
 ### Log Format

diff --git a/src/utils.rs b/src/utils.rs
index 4a8a6fea17dfc072bdee16a022358f6e0fb2f5ba..b9e11b73aba1a1e1e33e8fea876f673ffe7f81d9 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -34,45 +34,12 @@ pub fn try_get_file_name(path: &Path) -> Result<&str> {
         .ok_or_else(|| anyhow!("Failed to get file name of `{}`", path.display()))
 }
 
-pub fn glob(source: &str, target: &str) -> bool {
-    let ss: Vec<char> = source.chars().collect();
-    let mut iter = target.chars();
-    let mut i = 0;
-    'outer: while i < ss.len() {
-        let s = ss[i];
-        match s {
-            '*' => match ss.get(i + 1) {
-                Some(s_next) => {
-                    for t in iter.by_ref() {
-                        if t == *s_next {
-                            i += 2;
-                            continue 'outer;
-                        }
-                    }
-                    return false;
-                }
-                None => return true,
-            },
-            '?' => match iter.next() {
-                Some(_) => {
-                    i += 1;
-                    continue;
-                }
-                None => return false,
-            },
-            _ => match iter.next() {
-                Some(t) => {
-                    if s == t {
-                        i += 1;
-                        continue;
-                    }
-                    return false;
-                }
-                None => return false,
-            },
-        }
-    }
-    iter.next().is_none()
+pub fn glob(pattern: &str, target: &str) -> bool {
+    let pat = match ::glob::Pattern::new(pattern) {
+        Ok(pat) => pat,
+        Err(_) => return false,
+    };
+    pat.matches(target)
 }
 
 #[test]
@@ -91,6 +58,10 @@ fn test_glob_key() {
     assert!(!glob("abc", "abcd"));
     assert!(!glob("a?c", "abbc"));
     assert!(!glob("*.log", "log"));
+    assert!(glob("*.abc-cba", "xyz.abc-cba"));
+    assert!(glob("*.abc-cba", "123.xyz.abc-cba"));
     assert!(glob("*.log", ".log"));
     assert!(glob("*.log", "a.log"));
+    assert!(glob("*/", "abc/"));
+    assert!(!glob("*/", "abc"));
 }