Skip to content

Commit

Permalink
CLN: Change to Path inside FileDataProvider
Browse files Browse the repository at this point in the history
  • Loading branch information
tnatt committed Mar 22, 2024
1 parent eadf87f commit fb94f97
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
12 changes: 4 additions & 8 deletions src/fmu/dataio/_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,15 +232,11 @@ def _populate_meta_file(self) -> None:
checksum_md5 = None

self.meta_file = meta.File(
absolute_path=Path(fdata.absolute_path),
relative_path=Path(fdata.relative_path),
absolute_path=fdata.absolute_path,
relative_path=fdata.relative_path,
checksum_md5=checksum_md5,
relative_path_symlink=Path(fdata.relative_path_symlink)
if fdata.relative_path_symlink
else None,
absolute_path_symlink=Path(fdata.absolute_path_symlink)
if fdata.absolute_path_symlink
else None,
relative_path_symlink=fdata.relative_path_symlink,
absolute_path_symlink=fdata.absolute_path_symlink,
).model_dump(
mode="json",
exclude_none=True,
Expand Down
12 changes: 6 additions & 6 deletions src/fmu/dataio/providers/_filedata.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ class FileDataProvider:
realname: str = ""

# storing results in these variables
relative_path: str = field(default="", init=False)
relative_path_symlink: Optional[str] = field(default="", init=False)
relative_path: Path = field(default_factory=Path)
relative_path_symlink: Optional[Path] = field(default=None)

absolute_path: str = field(default="", init=False)
absolute_path_symlink: Optional[str] = field(default="", init=False)
absolute_path: Path = field(default_factory=Path)
absolute_path_symlink: Optional[Path] = field(default=None)

checksum_md5: Optional[str] = field(default="", init=False)
forcefolder_is_absolute: bool = field(default=False, init=False)
Expand All @@ -68,7 +68,7 @@ def derive_filedata(self) -> None:

logger.info("Derived filedata")

def _derive_filedata_generic(self, inrelpath: Path) -> tuple[str, str]:
def _derive_filedata_generic(self, inrelpath: Path) -> tuple[Path, Path]:
"""This works with both normal data and symlinks."""
stem = self._get_filestem()

Expand Down Expand Up @@ -104,7 +104,7 @@ def _derive_filedata_generic(self, inrelpath: Path) -> tuple[str, str]:
relpath = path.relative_to(self.rootpath)

logger.info("Derived filedata")
return str(relpath), str(abspath)
return relpath, abspath

def _get_filestem(self) -> str:
"""Construct the file"""
Expand Down
6 changes: 4 additions & 2 deletions tests/test_units/test_filedataprovider_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,10 @@ def test_filedata_provider(regsurf, edataobj1, tmp_path):
fdata.derive_filedata()

print(fdata.relative_path)
assert fdata.relative_path == "share/results/efolder/parent--name--tag--t2_t1.ext"
absdata = str(tmp_path / "share/results/efolder/parent--name--tag--t2_t1.ext")
assert (
str(fdata.relative_path) == "share/results/efolder/parent--name--tag--t2_t1.ext"
)
absdata = tmp_path / "share/results/efolder/parent--name--tag--t2_t1.ext"
assert fdata.absolute_path == absdata


Expand Down

0 comments on commit fb94f97

Please sign in to comment.