Merge pull request #254 from RockefellerArchiveCenter/service-edited

Target master_edited dir instead of master
RockefellerArchiveCenter · Oct 24, 2024 · 9d52b69 · 9d52b69
2 parents be437d3 + d5925c6
commit 9d52b69
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/...aster/3aai9usY3AZzCSFkB3RSQ9/bag-info.txt → ...dited/3aai9usY3AZzCSFkB3RSQ9/bag-info.txt b/...aster/3aai9usY3AZzCSFkB3RSQ9/bag-info.txt → ...dited/3aai9usY3AZzCSFkB3RSQ9/bag-info.txt
diff --git a/...f_master/3aai9usY3AZzCSFkB3RSQ9/bagit.txt → ...r_edited/3aai9usY3AZzCSFkB3RSQ9/bagit.txt b/...f_master/3aai9usY3AZzCSFkB3RSQ9/bagit.txt → ...r_edited/3aai9usY3AZzCSFkB3RSQ9/bagit.txt
diff --git a/...ata/master/file_example_TIFF_10MB_001.tif → ...ter_edited/file_example_TIFF_10MB_001.tif b/...ata/master/file_example_TIFF_10MB_001.tif → ...ter_edited/file_example_TIFF_10MB_001.tif
diff --git a/...data/master/file_example_TIFF_1MB_001.tif → ...ster_edited/file_example_TIFF_1MB_001.tif b/...data/master/file_example_TIFF_1MB_001.tif → ...ster_edited/file_example_TIFF_1MB_001.tif
diff --git a/...data/master/file_example_TIFF_5MB_001.tif → ...ster_edited/file_example_TIFF_5MB_001.tif b/...data/master/file_example_TIFF_5MB_001.tif → ...ster_edited/file_example_TIFF_5MB_001.tif
diff --git a/...r/3aai9usY3AZzCSFkB3RSQ9/manifest-md5.txt → ...d/3aai9usY3AZzCSFkB3RSQ9/manifest-md5.txt b/...r/3aai9usY3AZzCSFkB3RSQ9/manifest-md5.txt → ...d/3aai9usY3AZzCSFkB3RSQ9/manifest-md5.txt
diff --git a/...aai9usY3AZzCSFkB3RSQ9/tagmanifest-md5.txt → ...aai9usY3AZzCSFkB3RSQ9/tagmanifest-md5.txt b/...aai9usY3AZzCSFkB3RSQ9/tagmanifest-md5.txt → ...aai9usY3AZzCSFkB3RSQ9/tagmanifest-md5.txt
diff --git a/create_derivatives/routines.py b/create_derivatives/routines.py
@@ -76,8 +76,8 @@ def get_tiff_file_paths(self, bag_path):
             tiff_files (list of pathlib.Paths): absolute filepaths for TIFF files.
         """
         service_dir = Path(bag_path, "data", "service")
-        master_dir = Path(bag_path, "data", "master")
-        for tiff_dir in service_dir, master_dir:
+        master_edited_dir = Path(bag_path, "data", "master_edited")
+        for tiff_dir in service_dir, master_edited_dir:
             if tiff_dir.is_dir() and any(tiff_dir.iterdir()):
                 tiff_files_dir = tiff_dir
                 break

diff --git a/create_derivatives/tests.py b/create_derivatives/tests.py
@@ -247,15 +247,15 @@ def test_tiff_file_paths(self):
         for fixture_path, expected_service, expected_master in [
                 ("unpacked_bag_with_tiff", False, False),
                 ("unpacked_bag_with_tiff_empty_service", False, False),
-                ("unpacked_bag_with_tiff_master", False, True),
+                ("unpacked_bag_with_tiff_master_edited", False, True),
                 ("unpacked_bag_with_tiff_service", True, False)]:
             set_up_bag(settings.TMP_DIR, fixture_path, self.bag_id)
             bag = Bag.objects.last()
             tiffs = JP2Maker().get_tiff_file_paths(bag.bag_path)
             for path in tiffs:
                 self.assertTrue("data" in str(path))
                 self.assertEqual("service" in str(path), expected_service)
-                self.assertEqual("master" in str(path), expected_master)
+                self.assertEqual("master_edited" in str(path), expected_master)
             shutil.rmtree(bag.bag_path)
 
     def tearDown(self):