Merge pull request #201 from gerlero/files

Fix file IO
gerlero · Sep 29, 2024 · 58e0ed7 · 58e0ed7
2 parents ab51a87 + d7cecae
commit 58e0ed7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/foamlib/_files/_files.py b/foamlib/_files/_files.py
@@ -184,17 +184,24 @@ def __setitem__(
             elif not isinstance(keywords, tuple):
                 keywords = (keywords,)
 
-            if (
-                not self
-                and "FoamFile" not in self
-                and (not keywords or keywords[0] != "FoamFile")
-            ):
+            try:
+                write_header = (
+                    not self
+                    and "FoamFile" not in self
+                    and (not keywords or keywords[0] != "FoamFile")
+                )
+            except FileNotFoundError:
+                write_header = not keywords or keywords[0] != "FoamFile"
+
+            if write_header:
                 self["FoamFile"] = {}
                 self.version = 2.0
                 self.format = "ascii"
                 self.class_ = "dictionary"
                 self.location = f'"{self.path.parent.name}"'
-                self.object_ = self.path.name
+                self.object_ = (
+                    self.path.stem if self.path.suffix == ".gz" else self.path.name
+                )
 
             kind = Kind.DEFAULT
             if keywords == ("internalField",) or (

diff --git a/foamlib/_files/_io.py b/foamlib/_files/_io.py
@@ -49,19 +49,21 @@ def _read(self, *, missing_ok: bool = False) -> Tuple[bytes, Parsed]:
             try:
                 contents = self.path.read_bytes()
             except FileNotFoundError:
-                if missing_ok:
-                    contents = b""
-                else:
-                    raise
-
-            if self.path.suffix == ".gz":
-                contents = gzip.decompress(contents)
+                contents = None
+            else:
+                assert isinstance(contents, bytes)
+                if self.path.suffix == ".gz":
+                    contents = gzip.decompress(contents)
 
             if contents != self.__contents:
                 self.__contents = contents
                 self.__parsed = None
 
-        assert self.__contents is not None
+        if self.__contents is None:
+            if missing_ok:
+                return b"", Parsed(b"")
+            else:
+                raise FileNotFoundError(self.path)
 
         if self.__parsed is None:
             parsed = Parsed(self.__contents)

diff --git a/tests/test_files/test_files.py b/tests/test_files/test_files.py
@@ -19,6 +19,10 @@ def test_write_read(tmp_path: Path) -> None:
     with pytest.raises(FileNotFoundError):
         d["key"]
 
+    with d:
+        with pytest.raises(FileNotFoundError):
+            d["key"]
+
     d[None] = "touch"
     assert len(d) == 1
     assert d[None] == "touch"