Merge pull request #142 from ramnes/consistent-manager-methods

Use a new Manager.get() method to make manager's getters consistent

Author: jacebrowning

datafiles/manager.py

@@ -12,6 +12,8 @@
 import log
 from parse import parse
 
+from . import hooks
+
 
 if TYPE_CHECKING:
     from .mapper import Mapper
@@ -33,31 +35,32 @@ def all(self) -> Iterator[HasDatafile]:
         for filename in iglob(splatted):
             log.debug(f'Found matching path: {filename}')
             results = parse(pattern, filename)
-            fields = dataclasses.fields(self.model)
-            args = list(results.named.values())
-            args += [Missing] * (len(fields) - len(args))
-            yield self.model(*args)
+            yield self.get(*results.named.values())
 
-    def get_or_none(self, *args, **kwargs) -> Optional[HasDatafile]:
-        original_manual = self.model.Meta.datafile_manual
+    def get(self, *args, **kwargs) -> HasDatafile:
+        fields = dataclasses.fields(self.model)
+        missing_args = [Missing] * (len(fields) - len(args) - len(kwargs))
+        args = (*args, *missing_args)
 
-        self.model.Meta.datafile_manual = True
-        instance = self.model(*args, **kwargs)
-        self.model.Meta.datafile_manual = original_manual
+        with hooks.disabled():
+            instance = self.model(*args, **kwargs)
+            instance.datafile.load()
 
-        if instance.datafile.exists:
-            instance.datafile._manual = original_manual
-            return instance
+        return instance
 
-        return None
+    def get_or_none(self, *args, **kwargs) -> Optional[HasDatafile]:
+        try:
+            return self.get(*args, **kwargs)
+        except FileNotFoundError:
+            log.info("File not found")
+            return None
 
     def get_or_create(self, *args, **kwargs) -> HasDatafile:
-        instance = self.model(*args, **kwargs)
-
-        if not instance.datafile.exists:
-            instance.datafile.save()
-
-        return instance
+        try:
+            return self.get(*args, **kwargs)
+        except FileNotFoundError:
+            log.info(f"File not found, creating '{self.model.__name__}' object")
+            return self.model(*args, **kwargs)
 
     def filter(self, **query):
         for item in self.all():