smokephil/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-09 00:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace usages of os.rename with shutil.move to properly handle cases where the source and dest arent't on the same filesystem

Browse source
This commit is contained in:
Trenton Holmes 2023-04-30 17:55:25 -07:00 • committed by Trenton H
parent 613b71d23b
commit b7577038a0
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/documents/signals/handlers.py
View file

@ -429,12 +429,12 @@ def update_filename_and_move_files(sender, instance: Document, **kwargs):
if move_original:
validate_move(instance, old_source_path, instance.source_path)
create_source_path_directory(instance.source_path)
os.rename(old_source_path, instance.source_path)
shutil.move(old_source_path, instance.source_path)
if move_archive:
validate_move(instance, old_archive_path, instance.archive_path)
create_source_path_directory(instance.archive_path)
os.rename(old_archive_path, instance.archive_path)
shutil.move(old_archive_path, instance.archive_path)
# Don't save() here to prevent infinite recursion.
Document.objects.filter(pk=instance.pk).update(
@ -453,11 +453,11 @@ def update_filename_and_move_files(sender, instance: Document, **kwargs):
try:
if move_original and os.path.isfile(instance.source_path):
logger.info("Restoring previous original path")
os.rename(instance.source_path, old_source_path)
shutil.move(instance.source_path, old_source_path)
if move_archive and os.path.isfile(instance.archive_path):
logger.info("Restoring previous archive path")
os.rename(instance.archive_path, old_archive_path)
shutil.move(instance.archive_path, old_archive_path)
except Exception:
# This is fine, since: