From 7621e10840b3cb5ae914e68ceeec5cfa4f9aa1e3 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 8 Feb 2021 23:54:07 +0100 Subject: [PATCH] only move unaffected files, regenerate affected files --- .../migrations/1012_fix_archive_files.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py index 98794aad0..ab7e88a6a 100644 --- a/src/documents/migrations/1012_fix_archive_files.py +++ b/src/documents/migrations/1012_fix_archive_files.py @@ -102,11 +102,17 @@ def move_old_to_new_locations(apps, schema_editor): old_path = archive_path_old(doc) new_path = archive_path_new(doc) - if old_path != new_path and not os.path.isfile(new_path): - logger.debug( - f"Moving {old_path} to {new_path}" - ) - shutil.move(old_path, new_path) + if doc.id in affected_document_ids: + # remove affected archive versions + if os.path.isfile(old_path): + os.unlink(old_path) + else: + # move unaffected archive versions + if old_path != new_path and os.path.isfile(old_path) and not os.path.isfile(new_path): + logger.debug( + f"Moving {old_path} to {new_path}" + ) + shutil.move(old_path, new_path) # regenerate archive documents for doc_id in affected_document_ids: