diff options
author | Sumit Sahrawat <sumitsahrawat@outlook.com> | 2019-09-14 12:00:20 +0530 |
---|---|---|
committer | Pierre Peltier <dev@halium.fr> | 2019-10-23 10:46:03 +0200 |
commit | b5e13f25c7234cc6b8892bf44319bc8d57700c37 (patch) | |
tree | bbdc5471f52f2d628306b773108dbdeb47ed8ded | |
parent | 148c78d418ad9a8fcfdc59aaaff70bc10a2dec72 (diff) |
Match ignore-glob(s) against name instead of path
-rw-r--r-- | src/meta/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/meta/mod.rs b/src/meta/mod.rs index 0648861..86a103b 100644 --- a/src/meta/mod.rs +++ b/src/meta/mod.rs @@ -95,16 +95,16 @@ impl Meta { for entry in entries { let path = entry?.path(); - if ignore_globs.is_match(&path) { + let name = path + .file_name() + .ok_or_else(|| Error::new(ErrorKind::InvalidInput, "invalid file name"))?; + + if ignore_globs.is_match(&name) { continue; } if let Display::DisplayOnlyVisible = display { - if path - .file_name() - .ok_or_else(|| Error::new(ErrorKind::InvalidInput, "invalid file name"))? - .to_string_lossy() - .starts_with('.') + if name.to_string_lossy().starts_with('.') { continue; } |