Cutlery/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-11-04 03:27:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: correct PAPERLESS_EMPTY_TRASH_DIR to Path (#10227)

Browse Source
This commit is contained in:
shamoon 2025-06-19 11:50:23 -07:00 committed by GitHub
parent 240c9ac511
commit f214440d2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,9 +331,8 @@ def cleanup_document_deletion(sender, instance, **kwargs):
(old_filebase, old_fileext) = os.path.splitext(old_filename) (old_filebase, old_fileext) = os.path.splitext(old_filename)
while True: while True:
new_file_path = os.path.join( new_file_path = settings.EMPTY_TRASH_DIR / (
settings.EMPTY_TRASH_DIR, old_filebase + (f"_{counter:02}" if counter else "") + old_fileext
old_filebase + (f"_{counter:02}" if counter else "") + old_fileext,
) )
if os.path.exists(new_file_path): if os.path.exists(new_file_path):

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

@ -188,7 +188,7 @@ class TestFileHandling(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
@override_settings( @override_settings(
FILENAME_FORMAT="{correspondent}/{correspondent}", FILENAME_FORMAT="{correspondent}/{correspondent}",
EMPTY_TRASH_DIR=tempfile.mkdtemp(), EMPTY_TRASH_DIR=Path(tempfile.mkdtemp()),
) )
def test_document_delete_trash_dir(self): def test_document_delete_trash_dir(self):
document = Document() document = Document()

7
src/paperless/settings.py
View File

@ -270,9 +270,10 @@ DATA_DIR = __get_path("PAPERLESS_DATA_DIR", BASE_DIR.parent / "data")
NLTK_DIR = __get_path("PAPERLESS_NLTK_DIR", "/usr/share/nltk_data") NLTK_DIR = __get_path("PAPERLESS_NLTK_DIR", "/usr/share/nltk_data")
# Check deprecated setting first # Check deprecated setting first
EMPTY_TRASH_DIR = os.getenv( EMPTY_TRASH_DIR = (
"PAPERLESS_TRASH_DIR", __get_path("PAPERLESS_TRASH_DIR", os.getenv("PAPERLESS_EMPTY_TRASH_DIR"))
os.getenv("PAPERLESS_EMPTY_TRASH_DIR"), if os.getenv("PAPERLESS_TRASH_DIR") or os.getenv("PAPERLESS_EMPTY_TRASH_DIR")
else None
) )
# Lock file for synchronizing changes to the MEDIA directory across multiple # Lock file for synchronizing changes to the MEDIA directory across multiple