Strip FILEID prefix from AIC FSEntry UUID

artefactual-labs · Mar 18, 2021 · 9588c92 · 9588c92
1 parent 19a75ae
commit 9588c92
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/metsrw/mets.py b/metsrw/mets.py
@@ -447,7 +447,10 @@ def _analyze_fptr(fptr_elem, tree, entry_type):
         # plus `file-` on 1.10+. Therefore we need to get the extension-less
         # basename of the AIP's path and remove its UUID suffix to ge
         # the prefix to remove from the FILEID attribute value.
-        if entry_type.lower() == "archival information package":
+        if entry_type.lower() in (
+            "archival information package",
+            "archival information collection",
+        ):
             aip_name = os.path.splitext(os.path.basename(path))[0][:-36]
             if file_id.startswith(file_id_prefix):
                 file_id_prefix = file_id_prefix + aip_name

diff --git a/tests/test_mets.py b/tests/test_mets.py
@@ -376,6 +376,39 @@ def test_analyze_fptr_sets_uuid_from_aip_with_file_id_prefix(self):
 
         assert fptr.file_uuid == "9b9f129c-8062-471b-a009-9ee0ad655f08"
 
+    def test_analyze_fptr_sets_uuid_from_aic_with_file_id_prefix(self):
+        """
+        Test that AIC FILEIDs with a leading `file-` are parsed properly.
+        """
+        tree = etree.fromstring(
+            b"""<?xml version='1.0' encoding='utf-8'?>
+<mets:mets xmlns:mets="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/METS/ http://www.loc.gov/standards/mets/version1121/mets.xsd">
+  <mets:fileSec>
+    <mets:fileGrp USE="Archival Information Package">
+      <mets:file ID="file-aictest_replica_aic-258f73d1-08fe-4ade-9770-1d8812cde545" GROUPID="Group-258f73d1-08fe-4ade-9770-1d8812cde545" ADMID="amdSec_10">
+        <mets:FLocat xlink:href="/var/archivematica/sharedDirectory/www/AIPsStore/258f/73d1/08fe/4ade/9770/1d88/12cd/e545/aictest_replica_aic-258f73d1-08fe-4ade-9770-1d8812cde545.7z" LOCTYPE="OTHER" OTHERLOCTYPE="SYSTEM"/>
+        <mets:transformFile TRANSFORMTYPE="decompression" TRANSFORMORDER="1" TRANSFORMALGORITHM="bzip2"/>
+      </mets:file>
+    </mets:fileGrp>
+  </mets:fileSec>
+  <mets:structMap ID="structMap_1" LABEL="Archivematica default" TYPE="physical">
+    <mets:div TYPE="Archival Information Collection" LABEL="aictest_replica_aic-258f73d1-08fe-4ade-9770-1d8812cde545.7z">
+      <mets:fptr FILEID="file-aictest_replica_aic-258f73d1-08fe-4ade-9770-1d8812cde545"/>
+    </mets:div>
+  </mets:structMap>
+  <mets:structMap ID="structMap_2" LABEL="Normative Directory Structure" TYPE="logical">
+    <mets:div TYPE="Archival Information Collection" LABEL="aictest_replica_aic-258f73d1-08fe-4ade-9770-1d8812cde545.7z"/>
+  </mets:structMap>
+</mets:mets>
+        """
+        )
+        fptr_elem = tree.find(".//mets:fptr[1]", namespaces=metsrw.utils.NAMESPACES)
+        fptr = metsrw.METSDocument()._analyze_fptr(
+            fptr_elem, tree, "Archival Information Collection"
+        )
+
+        assert fptr.file_uuid == "258f73d1-08fe-4ade-9770-1d8812cde545"
+
     def test_duplicate_ids(self):
         """
         We don't want duplicate ids to be generated, but if specified, they shouldn't break