Fixed glob behavior. Missing path separators (/) at the beginning of a string were causing issues.

Author: atollk

fs/base.py

@@ -1674,7 +1674,7 @@ def match(self, patterns, name, accept_prefix=False):
         matcher = wildcard.get_matcher(patterns, case_sensitive)
         return matcher(name)
 
-    def match_glob(self, patterns, name, accept_prefix=False):
+    def match_glob(self, patterns, path, accept_prefix=False):
         # type: (Optional[Iterable[Text]], Text, bool) -> bool
         """Check if a path matches any of a list of glob patterns.
 
@@ -1687,26 +1687,27 @@ def match_glob(self, patterns, name, accept_prefix=False):
         Arguments:
             patterns (list, optional): A list of patterns, e.g.
                 ``['*.py']``, or `None` to match everything.
-            name (str): A file or directory name (not a path)
-            accept_prefix (bool): If ``True``, the name is
+            path (str): A resource path, starting with "/".
+            accept_prefix (bool): If ``True``, the path is
                 not required to match the wildcards themselves
                 but only need to be a prefix of a string that does.
 
         Returns:
-            bool: `True` if ``name`` matches any of the patterns.
+            bool: `True` if ``path`` matches any of the patterns.
 
         Raises:
             TypeError: If ``patterns`` is a single string instead of
                 a list (or `None`).
+            ValueError: If ``path`` is not a string starting with "/".
 
         Example:
-            >>> my_fs.match_glob(['*.py'], '__init__.py')
+            >>> my_fs.match_glob(['*.py'], '/__init__.py')
             True
-            >>> my_fs.match_glob(['*.jpg', '*.png'], 'foo.gif')
+            >>> my_fs.match_glob(['*.jpg', '*.png'], '/foo.gif')
             False
-            >>> my_fs.match_glob(['dir/file.txt'], 'dir/', accept_prefix=True)
+            >>> my_fs.match_glob(['dir/file.txt'], '/dir/', accept_prefix=True)
             True
-            >>> my_fs.match_glob(['dir/file.txt'], 'dir/gile.txt', accept_prefix=True)
+            >>> my_fs.match_glob(['dir/file.txt'], '/dir/gile.txt', accept_prefix=True)
             False
 
         Note:
@@ -1716,6 +1717,8 @@ def match_glob(self, patterns, name, accept_prefix=False):
         """
         if patterns is None:
             return True
+        if not path or path[0] != "/":
+            raise ValueError("%s needs to be a string starting with /" % path)
         if isinstance(patterns, six.text_type):
             raise TypeError("patterns must be a list or sequence")
         case_sensitive = not typing.cast(
@@ -1724,7 +1727,7 @@ def match_glob(self, patterns, name, accept_prefix=False):
         matcher = glob.get_matcher(
             patterns, case_sensitive, accept_prefix=accept_prefix
         )
-        return matcher(name)
+        return matcher(path)
 
     def tree(self, **kwargs):
         # type: (**Any) -> None

fs/glob.py

@@ -150,6 +150,8 @@ def match(pattern, path):
     except KeyError:
         levels, recursive, re_pattern = _translate_glob(pattern, case_sensitive=True)
         _PATTERN_CACHE[(pattern, True)] = (levels, recursive, re_pattern)
+    if path and path[0] != "/":
+        path = "/" + path
     return bool(re_pattern.match(path))
 
 
@@ -170,6 +172,8 @@ def imatch(pattern, path):
     except KeyError:
         levels, recursive, re_pattern = _translate_glob(pattern, case_sensitive=True)
         _PATTERN_CACHE[(pattern, False)] = (levels, recursive, re_pattern)
+    if path and path[0] != "/":
+        path = "/" + path
     return bool(re_pattern.match(path))
 
 
@@ -246,9 +250,11 @@ def get_matcher(patterns, case_sensitive, accept_prefix=False):
         new_patterns = []
         for pattern in patterns:
             split = _split_pattern_by_rec(pattern)
-            for i in range(len(split)):
-                new_pattern = "/".join(split[: i + 1])
+            for i in range(1, len(split)):
+                new_pattern = "/".join(split[:i])
                 new_patterns.append(new_pattern)
+                new_patterns.append(new_pattern + "/")
+            new_patterns.append(pattern)
         patterns = new_patterns
 
     matcher = match_any if case_sensitive else imatch_any

tests/test_glob.py

@@ -22,6 +22,7 @@ def test_match(self):
         tests = [
             ("*.?y", "/test.py", True),
             ("*.py", "/test.py", True),
+            ("*.py", "__init__.py", True),
             ("*.py", "/test.pc", False),
             ("*.py", "/foo/test.py", False),
             ("foo/*.py", "/foo/test.py", True),