Completes #872.

mjordan · Jan 27, 2025 · 63a07f8 · 63a07f8
1 parent 2fd7719
commit 63a07f8
Show file tree

Hide file tree

Showing 43 changed files with 759 additions and 222 deletions.
diff --git a/WorkbenchConfig.py b/WorkbenchConfig.py
@@ -295,7 +295,7 @@ def get_default_config(self):
             "media_type_by_media_use": False,
             "paged_content_ignore_files": ["Thumbs.db"],
             "include_password_in_rollback_config_file": False,
-            "recovery_mode": False,
+            "recovery_mode_starting_from_node_id": False,
         }
 
     # Tests validity and existence of configuration file path.

diff --git a/tests/assets/recovery_mode_test/pages_from_directories_full/metadata.csv b/tests/assets/recovery_mode_test/pages_from_directories_full/metadata.csv
@@ -0,0 +1,3 @@
+id,title,field_model
+page_test_01,Recovery mode paged content book 1 (parent),Paged Content
+page_test_02,Recovery mode paged content book 2 (parent),Paged Content
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_001.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_001.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_002.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_002.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_003.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_003.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_004.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_004.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_005.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_005.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_006.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_006.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_007.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_007.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_008.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_008.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_009.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_009.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_010.png b/...covery_mode_test/pages_from_directories_full/page_test_01/paged_test_01_010.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_001.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_001.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_002.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_002.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_003.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_003.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_004.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_004.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_005.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_005.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_006.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_006.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_007.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_007.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_008.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_008.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_009.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_009.png
diff --git a/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_010.png b/...covery_mode_test/pages_from_directories_full/page_test_02/paged_test_02_010.png
diff --git a/tests/assets/recovery_mode_test/pages_from_directories_part/metadata.csv b/tests/assets/recovery_mode_test/pages_from_directories_part/metadata.csv
@@ -0,0 +1,2 @@
+id,title,field_model
+page_test_01,Recovery mode paged content book 1 (parent),Paged Content
diff --git a/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_001.png b/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_001.png
diff --git a/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_002.png b/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_002.png
diff --git a/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_003.png b/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_003.png
diff --git a/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_004.png b/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_004.png
diff --git a/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_005.png b/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_005.png
diff --git a/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_006.png b/...covery_mode_test/pages_from_directories_part/page_test_01/paged_test_01_006.png
diff --git a/tests/assets/recovery_mode_test/recovery_mode_paged_content_full.yml b/tests/assets/recovery_mode_test/recovery_mode_paged_content_full.yml
@@ -0,0 +1,15 @@
+paged_content_from_directories: true
+paged_content_page_model_tid: http://id.loc.gov/ontologies/bibframe/part
+paged_content_sequence_separator: _
+paged_content_image_file_extension: gif
+task: create
+host: https://islandora.dev
+username: admin
+password: password
+input_dir: tests/assets/recovery_mode_test/pages_from_directories_full
+csv_id_to_node_id_map_path: tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db
+rollback_config_file_path: tests/assets/recovery_mode_test/rollback_paged_full.yml
+rollback_csv_file_path: tests/assets/recovery_mode_test/rollback_paged_full.csv
+include_password_in_rollback_config_file: true
+standalone_media_url: true
+secure_ssl_only: false
diff --git a/tests/assets/recovery_mode_test/recovery_mode_paged_content_part.yml b/tests/assets/recovery_mode_test/recovery_mode_paged_content_part.yml
@@ -0,0 +1,15 @@
+paged_content_from_directories: true
+paged_content_page_model_tid: http://id.loc.gov/ontologies/bibframe/part
+paged_content_sequence_separator: _
+paged_content_image_file_extension: gif
+task: create
+host: https://islandora.dev
+username: admin
+password: password
+input_dir: tests/assets/recovery_mode_test/pages_from_directories_part
+csv_id_to_node_id_map_path: tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db
+rollback_config_file_path: tests/assets/recovery_mode_test/rollback_paged_part.yml
+rollback_csv_file_path: tests/assets/recovery_mode_test/rollback_paged_part.csv
+include_password_in_rollback_config_file: true
+standalone_media_url: true
+secure_ssl_only: false
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_full.csv b/tests/assets/recovery_mode_test/recovery_mode_single_full.csv
@@ -19,3 +19,5 @@ rec_mode_single_017,Recovery mode test single 017,Binary,
 rec_mode_single_018,Recovery mode test single 018,Binary,
 rec_mode_single_019,Recovery mode test single 019,Binary,
 rec_mode_single_020,Recovery mode test single 020,Binary,
+rec_mode_single_021,Recovery mode test single 021,Binary,
+rec_mode_single_022,Recovery mode test single 022,Binary,
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_full.yml b/tests/assets/recovery_mode_test/recovery_mode_single_full.yml
@@ -0,0 +1,12 @@
+task: create
+host: https://islandora.dev
+username: admin
+password: password
+input_dir: tests/assets/recovery_mode_test
+input_csv: recovery_mode_single_full.csv
+csv_id_to_node_id_map_path: tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db
+rollback_config_file_path: tests/assets/recovery_mode_test/rollback_full.yml
+rollback_csv_file_path: tests/assets/recovery_mode_test/rollback_full.csv
+include_password_in_rollback_config_file: true
+secure_ssl_only: false
+nodes_only: true 
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_full_with_parent_id.csv b/tests/assets/recovery_mode_test/recovery_mode_single_full_with_parent_id.csv
@@ -0,0 +1,23 @@
+id,title,field_model,file,parent_id,field_member_of
+rec_mode_single_001,Recovery mode test single 001,Binary,,,
+rec_mode_single_002,Recovery mode test single 002,Binary,,,
+rec_mode_single_003,Recovery mode test single 003,Binary,,,
+rec_mode_single_004,Recovery mode test single 004,Binary,,,
+rec_mode_single_005,Recovery mode test single 005,Binary,,,
+rec_mode_single_006,Recovery mode test single 006,Binary,,,
+rec_mode_single_007,Recovery mode test single 007,Binary,,,
+rec_mode_single_008,Recovery mode test single 008 is parent,Binary,,,
+rec_mode_single_009,Recovery mode test single 009 is child of 8,Binary,,rec_mode_single_008,
+rec_mode_single_010,Recovery mode test single 010 is child of 8,Binary,,rec_mode_single_008,
+rec_mode_single_011,Recovery mode test single 011 is child of 8,Binary,,rec_mode_single_008,
+rec_mode_single_012,Recovery mode test single 012 is child of 8,Binary,,rec_mode_single_008,
+rec_mode_single_013,Recovery mode test single 013 is child of 8,Binary,,rec_mode_single_008,
+rec_mode_single_014,Recovery mode test single 014 is child of 8,Binary,,rec_mode_single_008,
+rec_mode_single_015,Recovery mode test single 015,Binary,,,
+rec_mode_single_016,Recovery mode test single 016,Binary,,,
+rec_mode_single_017,Recovery mode test single 017,Binary,,,
+rec_mode_single_018,Recovery mode test single 018,Binary,,,
+rec_mode_single_019,Recovery mode test single 019,Binary,,,
+rec_mode_single_020,Recovery mode test single 020,Binary,,,
+rec_mode_single_021,Recovery mode test single 021,Binary,,,
+rec_mode_single_022,Recovery mode test single 022,Binary,,,
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_full_with_parent_id.yml b/tests/assets/recovery_mode_test/recovery_mode_single_full_with_parent_id.yml
@@ -0,0 +1,12 @@
+task: create
+host: https://islandora.dev
+username: admin
+password: password
+input_dir: tests/assets/recovery_mode_test
+input_csv: recovery_mode_single_full_with_parent_id.csv
+csv_id_to_node_id_map_path: tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db
+rollback_config_file_path: tests/assets/recovery_mode_test/rollback_full.yml
+rollback_csv_file_path: tests/assets/recovery_mode_test/rollback_full.csv
+include_password_in_rollback_config_file: true
+secure_ssl_only: false
+nodes_only: true 
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_part.csv b/tests/assets/recovery_mode_test/recovery_mode_single_part.csv
@@ -0,0 +1,11 @@
+id,title,field_model,file
+rec_mode_single_001,Recovery mode test single 001,Binary,
+rec_mode_single_002,Recovery mode test single 002,Binary,
+rec_mode_single_003,Recovery mode test single 003,Binary,
+rec_mode_single_004,Recovery mode test single 004,Binary,
+rec_mode_single_005,Recovery mode test single 005,Binary,
+rec_mode_single_006,Recovery mode test single 006,Binary,
+rec_mode_single_007,Recovery mode test single 007,Binary,
+rec_mode_single_008,Recovery mode test single 008,Binary,
+rec_mode_single_009,Recovery mode test single 009,Binary,
+rec_mode_single_010,Recovery mode test single 010,Binary,
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_part.yml b/tests/assets/recovery_mode_test/recovery_mode_single_part.yml
@@ -0,0 +1,12 @@
+task: create
+host: https://islandora.dev
+username: admin
+password: password
+input_dir: tests/assets/recovery_mode_test
+input_csv: recovery_mode_single_part.csv
+csv_id_to_node_id_map_path: tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db
+rollback_config_file_path: tests/assets/recovery_mode_test/rollback_part.yml
+rollback_csv_file_path: tests/assets/recovery_mode_test/rollback_part.csv
+include_password_in_rollback_config_file: true
+secure_ssl_only: false
+nodes_only: true 
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_part_with_parent_id.csv b/tests/assets/recovery_mode_test/recovery_mode_single_part_with_parent_id.csv
@@ -0,0 +1,11 @@
+id,title,field_model,file,parent_id,field_member_of
+rec_mode_single_001,Recovery mode test single 001,Binary,,,
+rec_mode_single_002,Recovery mode test single 002,Binary,,,
+rec_mode_single_003,Recovery mode test single 003,Binary,,,
+rec_mode_single_004,Recovery mode test single 004,Binary,,,
+rec_mode_single_005,Recovery mode test single 005,Binary,,,
+rec_mode_single_006,Recovery mode test single 006,Binary,,,
+rec_mode_single_007,Recovery mode test single 007,Binary,,,
+rec_mode_single_008,Recovery mode test single 008 is parent,Binary,,,
+rec_mode_single_009,Recovery mode test single 009 is child of 8,Binary,,rec_mode_single_008,
+rec_mode_single_010,Recovery mode test single 010 is child of 8,Binary,,rec_mode_single_008,
diff --git a/tests/assets/recovery_mode_test/recovery_mode_single_part_with_parent_id.yml b/tests/assets/recovery_mode_test/recovery_mode_single_part_with_parent_id.yml
@@ -0,0 +1,12 @@
+task: create
+host: https://islandora.dev
+username: admin
+password: password
+input_dir: tests/assets/recovery_mode_test
+input_csv: recovery_mode_single_part_with_parent_id.csv
+csv_id_to_node_id_map_path: tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db
+rollback_config_file_path: tests/assets/recovery_mode_test/rollback_part.yml
+rollback_csv_file_path: tests/assets/recovery_mode_test/rollback_part.csv
+include_password_in_rollback_config_file: true
+secure_ssl_only: false
+nodes_only: true 
diff --git a/tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db.empty b/tests/assets/recovery_mode_test/recovery_mode_tests_csv_to_node_id_map.db.empty
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		id,title,field_model
		page_test_01,Recovery mode paged content book 1 (parent),Paged Content