src/grung/types.py

@@ -295,28 +295,13 @@ class BinaryFilePointer(Field):
     def relpath(self, record):
         return Path(record._metadata.table) / record[record._metadata.primary_key] / f"{self.name}{self.extension}"
 
-    def reference(self, record):
-        return f"/::{self.relpath(record)}"
-
-    def dereference(self, reference, db):
-        relpath = reference.replace("/::", "", 1)
-        try:
-            return (db.path / relpath).read_bytes()
-        except FileNotFoundError:
-            return None
-
-    def serialize(self, value: value_type | str, record: Record | None = None) -> str:
-        return self.reference(record)
-
     def deserialize(self, value: str, db: TinyDB, recurse: bool = True) -> value_type:
         if not value:
             return None
-        return self.dereference(value, db)
+        _, relpath = value.split("::")
+        return self.value_type((db.path / relpath).read_bytes())
 
     def prepare(self, data: value_type):
-        """
-        Return bytes to be written to disk
-        """
         if not data:
             return
         if not isinstance(data, self.value_type):
@@ -330,6 +315,7 @@ class BinaryFilePointer(Field):
         path = db.path / relpath
         path.parent.mkdir(parents=True, exist_ok=True)
         path.write_bytes(self.prepare(value))
+        record[self.name] = f"File::{self.relpath(record)}"
 
 
 @dataclass
@@ -343,14 +329,14 @@ class TextFilePointer(BinaryFilePointer):
     extension: str = ".txt"
 
     def prepare(self, data: value_type):
-        if data and not isinstance(data, bytes):
+        if data:
             return str(data).encode()
 
     def deserialize(self, value: str, db: TinyDB, recurse: bool = True) -> value_type:
         if not value:
             return None
-        buf = super().deserialize(value, db)
+        _, relpath = value.split("::")
-        return buf.decode() if buf else None
+        return (db.path / relpath).read_text()
 
 
 @dataclass