From efaa1c4dd77fd327a55a9c0d20a2c08125e0f56b Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Mon, 26 Dec 2022 13:43:30 -0800 Subject: [PATCH] Fixes minor depracation I noticed --- src/documents/signals/handlers.py | 2 +- src/documents/views.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 4c2554f02..cd42c9030 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -447,7 +447,7 @@ def update_filename_and_move_files(sender, instance, **kwargs): ) except (OSError, DatabaseError, CannotMoveFilesException) as e: - logger.warn(f"Exception during file handling: {e}") + logger.warning(f"Exception during file handling: {e}") # This happens when either: # - moving the files failed due to file system errors # - saving to the database failed due to database errors diff --git a/src/documents/views.py b/src/documents/views.py index 147dd2e07..abd2e5f2f 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -12,6 +12,7 @@ from time import mktime from unicodedata import normalize from urllib.parse import quote +import pathvalidate from django.conf import settings from django.contrib.auth.models import User from django.db.models import Case @@ -625,7 +626,7 @@ class PostDocumentView(GenericAPIView): os.makedirs(settings.SCRATCH_DIR, exist_ok=True) temp_file_path = Path(tempfile.mkdtemp(dir=settings.SCRATCH_DIR)) / Path( - doc_name, + pathvalidate.sanitize_filename(doc_name), ) temp_file_path.write_bytes(doc_data) @@ -634,8 +635,9 @@ class PostDocumentView(GenericAPIView): task_id = str(uuid.uuid4()) - async_task = consume_file.delay( - temp_file_path, + consume_file.delay( + # Paths are not JSON friendly + str(temp_file_path), override_title=title, override_correspondent_id=correspondent_id, override_document_type_id=document_type_id,