Skip to content

fix(merge): clean up distributed subdir after merge #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
degenaro merged 2 commits into from
Aug 28, 2026
+10 −3
Merged

fix(merge): clean up distributed subdir after merge #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef1121
fix(merge): clean up distributed subdir after merge
Acuspeedster Apr 8, 2026
88f2ee2
Merge branch 'develop' into fix/merge-cleanup-distributed-subdirs
degenaro Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/trestle/core/commands/merge_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ def test_merge_expanded_metadata_into_catalog(testdata_dir, tmp_trestle_dir, kee
expected_plan.add_action(write_destination_action)
delete_element_action = RemovePathAction(metadata_file)
expected_plan.add_action(delete_element_action)
delete_metadata_dir_action = RemovePathAction(metadata_dir.resolve())
expected_plan.add_action(delete_metadata_dir_action)

# Call merge()
generated_plan = MergeCmd.merge(Path.cwd(), ElementPath('catalog.metadata'), tmp_trestle_dir)
Expand Down
11 changes: 8 additions & 3 deletions trestle/core/commands/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ def merge(cls, effective_cwd: Path, element_path: ElementPath, trestle_root: Pat
write_destination_action = WriteFileAction(
destination_model_path, merged_destination_element, content_type=file_type
)
# FIXME this will delete metadata.json but it will leave metadata/roles/roles.*
# need to clean up all lower dirs
trace.log(f'remove path action {target_model_filename}')
delete_target_action = RemovePathAction(target_model_filename)

Expand All @@ -203,6 +201,13 @@ def merge(cls, effective_cwd: Path, element_path: ElementPath, trestle_root: Pat
plan.add_action(write_destination_action)
plan.add_action(delete_target_action)

# TODO: Destination model directory is empty or already merged? Then clean up.
# If merge loaded from <alias>.json and a sibling distributed folder <alias>/ exists,
# remove it as well to avoid leaving stale decomposed content behind.
if target_model_filename.is_file():
distributed_target_dir = target_model_filename.with_suffix('')
if distributed_target_dir.exists() and distributed_target_dir.is_dir():
trace.log(f'remove distributed target dir action {distributed_target_dir}')
delete_distributed_target_action = RemovePathAction(distributed_target_dir)
plan.add_action(delete_distributed_target_action)

return plan
Loading