paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-26 03:36:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2062 from paperless-ngx/fix/2053-long-names-too-quiet

Browse Source 
Bugfix: Don't silence an exception when trying to handle file naming
This commit is contained in:
shamoon
2022-11-28 14:05:57 -08:00
committed by GitHub
parent 5d3a6e230d a1a802fc92
commit 71382e9c62
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/documents/signals/handlers.py
View File

@@ -447,7 +447,8 @@ def update_filename_and_move_files(sender, instance, **kwargs):
archive_filename=instance.archive_filename, archive_filename=instance.archive_filename,
) )
except (OSError, DatabaseError, CannotMoveFilesException): except (OSError, DatabaseError, CannotMoveFilesException) as e:
logger.warn(f"Exception during file handling: {e}")
# This happens when either: # This happens when either:
# - moving the files failed due to file system errors # - moving the files failed due to file system errors
# - saving to the database failed due to database errors # - saving to the database failed due to database errors
@@ -456,9 +457,11 @@ def update_filename_and_move_files(sender, instance, **kwargs):
# Try to move files to their original location. # Try to move files to their original location.
try: try:
if move_original and os.path.isfile(instance.source_path): if move_original and os.path.isfile(instance.source_path):
logger.info("Restoring previous original path")
os.rename(instance.source_path, old_source_path) os.rename(instance.source_path, old_source_path)
if move_archive and os.path.isfile(instance.archive_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) os.rename(instance.archive_path, old_archive_path)
except Exception: except Exception:
@@ -468,7 +471,7 @@ def update_filename_and_move_files(sender, instance, **kwargs):
# issue that's going to get caught by the santiy checker. # issue that's going to get caught by the santiy checker.
# All files remain in place and will never be overwritten, # All files remain in place and will never be overwritten,
# so this is not the end of the world. # so this is not the end of the world.
# B: if moving the orignal file failed, nothing has changed # B: if moving the original file failed, nothing has changed
# anyway. # anyway.
pass pass