Fixes minor depracation I noticed

This commit is contained in:
Trenton Holmes 2022-12-26 13:43:30 -08:00 committed by Trenton H
parent a88b318d7d
commit efaa1c4dd7
2 changed files with 6 additions and 4 deletions

View File

@ -447,7 +447,7 @@ def update_filename_and_move_files(sender, instance, **kwargs):
) )
except (OSError, DatabaseError, CannotMoveFilesException) as e: 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: # 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

View File

@ -12,6 +12,7 @@ from time import mktime
from unicodedata import normalize from unicodedata import normalize
from urllib.parse import quote from urllib.parse import quote
import pathvalidate
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db.models import Case from django.db.models import Case
@ -625,7 +626,7 @@ class PostDocumentView(GenericAPIView):
os.makedirs(settings.SCRATCH_DIR, exist_ok=True) os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
temp_file_path = Path(tempfile.mkdtemp(dir=settings.SCRATCH_DIR)) / Path( 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) temp_file_path.write_bytes(doc_data)
@ -634,8 +635,9 @@ class PostDocumentView(GenericAPIView):
task_id = str(uuid.uuid4()) task_id = str(uuid.uuid4())
async_task = consume_file.delay( consume_file.delay(
temp_file_path, # Paths are not JSON friendly
str(temp_file_path),
override_title=title, override_title=title,
override_correspondent_id=correspondent_id, override_correspondent_id=correspondent_id,
override_document_type_id=document_type_id, override_document_type_id=document_type_id,