paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-17 10:13:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Update filename correctly if the document is in the trash (#8066)

Browse Source 
* Fixes an issue where the filename is not updated if the document is in the trash (but the file is moved)
This commit is contained in:
Trenton H 2024-10-27 19:45:31 -07:00 committed by GitHub
parent ad23cce2e6
commit 335c6c3820
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,6 +348,8 @@ def cleanup_document_deletion(sender, instance, **kwargs):
f"While deleting document {instance!s}, the file " f"While deleting document {instance!s}, the file "
f"{filename} could not be deleted: {e}", f"{filename} could not be deleted: {e}",
) )
elif filename and not os.path.isfile(filename):
logger.warn(f"Expected {filename} tp exist, but it did not")
delete_empty_directories( delete_empty_directories(
os.path.dirname(instance.source_path), os.path.dirname(instance.source_path),
@ -461,7 +463,7 @@ def update_filename_and_move_files(
shutil.move(old_archive_path, instance.archive_path) shutil.move(old_archive_path, instance.archive_path)
# Don't save() here to prevent infinite recursion. # Don't save() here to prevent infinite recursion.
Document.objects.filter(pk=instance.pk).update( Document.global_objects.filter(pk=instance.pk).update(
filename=instance.filename, filename=instance.filename,
archive_filename=instance.archive_filename, archive_filename=instance.archive_filename,
modified=timezone.now(), modified=timezone.now(),

6
src/documents/tests/test_file_handling.py
View File

@ -150,7 +150,7 @@ class TestFileHandling(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
with ( with (
mock.patch( mock.patch(
"documents.signals.handlers.Document.objects.filter", "documents.signals.handlers.Document.global_objects.filter",
) as m, ) as m,
disable_auditlog(), disable_auditlog(),
): ):
@ -865,7 +865,9 @@ class TestFileHandlingWithArchive(DirectoriesMixin, FileSystemAssertsMixin, Test
archive_filename="0000001.pdf", archive_filename="0000001.pdf",
archive_checksum="B", archive_checksum="B",
) )
with mock.patch("documents.signals.handlers.Document.objects.filter") as m: with mock.patch(
"documents.signals.handlers.Document.global_objects.filter",
) as m:
m.side_effect = DatabaseError() m.side_effect = DatabaseError()
doc.save() doc.save()