Merge pull request #317 from jacebrowning/match-defaults

Fix matching files for patterns with defaults

Author: jacebrowning

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.2.2 (2024-01-06)
+
+- Fixed `Manager.all()` behavior for patterns with default vales.
+
 ## 2.2.1 (2024-01-04)
 
 - Updated `Manager.get()` to handle default values in pattern arguments.

datafiles/manager.py

@@ -119,7 +119,10 @@ def all(self, *, _exclude: str = "") -> Iterator[Model]:
             path = root / self.model.Meta.datafile_pattern
             log.debug(f"Detected dynamic pattern: {path}")
 
-        pattern = str(path.resolve())
+        pattern = alt_pattern = str(path.resolve())
+        for field in dataclasses.fields(self.model):
+            if not isinstance(field.default, Missing):
+                alt_pattern = alt_pattern.replace("{self." + field.name + "}", "")
         splatted = pattern.format(self=Splats()).replace(
             f"{os.sep}*{os.sep}", f"{os.sep}**{os.sep}"
         )
@@ -131,7 +134,7 @@ def all(self, *, _exclude: str = "") -> Iterator[Model]:
                 continue
 
             log.debug(f"Found matching path {index + 1}: {filename}")
-            result = parse(pattern, filename)
+            result = parse(pattern, filename) or parse(alt_pattern, filename)
             if result:
                 values = list(result.named.values())
 

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "datafiles"
-version = "2.2.1"
+version = "2.2.2"
 description = "File-based ORM for dataclasses."
 
 license = "MIT"