fix: Directory matching behavior, ignore empty patterns

Author: effigies

src/bids_validator/bidsignore.py

@@ -49,7 +49,7 @@ def compile_pat(pattern: str) -> Union[re.Pattern, None]:
     ]
 
     prefix = '^' if relative_match else '^(?:.*/|)'
-    postfix = r'/\Z' if directory_match else r'/?\Z'
+    postfix = r'/' if directory_match else r'(/|\Z)'
 
     # "**/" matches zero or more directories, so wrap in an optional segment
     out_pattern = '/'.join(parts).replace('.*/', '(?:.*/)?')
@@ -84,7 +84,7 @@ def from_file(cls, pathlike: os.PathLike):
 
     def match(self, relpath: str) -> bool:
         """Match a relative path against a collection of ignore patterns."""
-        if any(compile_pat(pattern).match(relpath) for pattern in self.patterns):
+        if any(compile_pat(pattern).match(relpath) for pattern in self.patterns if pattern):
             self.history.append(relpath)
             return True
         return False

tests/test_bidsignore.py

@@ -23,13 +23,13 @@
         ('frotz/', ['frotz/', 'doc/frotz/', 'a/doc/frotz/'], []),
         # * matches everything because everything has a basename
         ('*', ['foo', 'foo/', 'foo/bar', 'foo/bar/'], []),
-        # *o matches things with basename ending in o
-        ('*o', ['foo', 'foo/', 'bar/foo', 'bar/foo/'], ['foo/bar', 'foo/bar/']),
+        # *o matches things with basename ending in o, including parent directories
+        ('*o', ['foo', 'foo/', 'bar/foo', 'bar/foo/', 'foo/bar'], ['bar', 'bar/baz', 'bar/bar/']),
         # Leading **/ matches in all directories
         (
             '**/foo',
-            ['foo', 'foo/', 'bar/foo', 'bar/foo/'],
-            ['foo/bar', 'foo/bar/', 'baz/foobar', 'baz/barfoo'],
+            ['foo', 'foo/', 'bar/foo', 'bar/foo/', 'foo/bar'],
+            ['foobar/baz', 'foobar/baz/', 'baz/foobar', 'baz/barfoo'],
         ),
         ('**/foo/bar', ['foo/bar', 'foo/bar/', 'a/foo/bar'], ['foo/', 'bar/foo', 'bar']),
         # Trailing /** matches everything inside a root-relative directory