Merge c251393 into 9ab6410

artefactual-labs · Jun 23, 2019 · 8ed209b · 8ed209b
2 parents 9ab6410 + c251393
commit 8ed209b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/metsrw/fsentry.py b/metsrw/fsentry.py
@@ -183,6 +183,7 @@ def dir(cls, label, children):
     def from_fptr(cls, label, type_, fptr):
         """Return ``FSEntry`` object."""
         return FSEntry(
+            fileid=fptr.fileid,
             label=label,
             type=type_,
             path=fptr.path,
@@ -197,7 +198,7 @@ def __str__(self):
         return "{s.type}: {s.path}".format(s=self)
 
     def __repr__(self):
-        return "FSEntry(type={s.type!r}, path={s.path!r}, use={s.use!r}, label={s.label!r}, file_uuid={s.file_uuid!r}, checksum={s.checksum!r}, checksumtype={s.checksumtype!r})".format(
+        return "FSEntry(type={s.type!r}, path={s.path!r}, fileid={s._fileid!r}, use={s.use!r}, label={s.label!r}, file_uuid={s.file_uuid!r}, checksum={s.checksum!r}, checksumtype={s.checksumtype!r})".format(
             s=self
         )
 

diff --git a/metsrw/mets.py b/metsrw/mets.py
@@ -22,7 +22,7 @@
 
 AIP_ENTRY_TYPE = "archival information package"
 FPtr = namedtuple(
-    "FPtr", "file_uuid derived_from use path amdids checksum checksumtype"
+    "FPtr", "file_uuid derived_from use path amdids checksum checksumtype fileid"
 )
 
 
@@ -455,7 +455,9 @@ def _analyze_fptr(fptr_elem, tree, entry_type):
         group_uuid = file_elem.get("GROUPID", "").replace(utils.GROUP_ID_PREFIX, "", 1)
         if group_uuid != file_uuid:
             derived_from = group_uuid  # Use group_uuid as placeholder
-        return FPtr(file_uuid, derived_from, use, path, amdids, checksum, checksumtype)
+        return FPtr(
+            file_uuid, derived_from, use, path, amdids, checksum, checksumtype, file_id
+        )
 
     @staticmethod
     def _add_dmdsecs_to_fs_entry(elem, fs_entry, tree):

diff --git a/tests/test_mets.py b/tests/test_mets.py
@@ -323,6 +323,7 @@ def test_analyze_fptr(self):
         # Test the integrity of the ``FPtr`` object returned.
         fptr = mw._analyze_fptr(fptr_elem, tree, "directory")
         assert fptr == metsrw.mets.FPtr(
+            fileid="AM68.csv-fc0e52ca-a688-41c0-a10b-c1d36e21e804",
             file_uuid="fc0e52ca-a688-41c0-a10b-c1d36e21e804",
             derived_from=None,
             use="original",