lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate file response methods

Browse Source
This commit is contained in:
shamoon 2023-08-16 00:04:43 -07:00
parent 77913c2dea
commit 603da83705
1 changed files with 56 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/documents/views.py
View File

@ -318,38 +318,12 @@ class DocumentViewSet(
doc, doc,
): ):
return HttpResponseForbidden("Insufficient permissions") return HttpResponseForbidden("Insufficient permissions")
if not self.original_requested(request) and doc.has_archive_version: return serve_file(
file_handle = doc.archive_file doc=doc,
filename = doc.get_public_filename(archive=True) use_archive=not self.original_requested(request)
mime_type = "application/pdf" and doc.has_archive_version,
else: disposition=disposition,
file_handle = doc.source_file
filename = doc.get_public_filename()
mime_type = doc.mime_type
# Support browser previewing csv files by using text mime type
if mime_type in {"application/csv", "text/csv"} and disposition == "inline":
mime_type = "text/plain"
if doc.storage_type == Document.STORAGE_TYPE_GPG:
file_handle = GnuPG.decrypted(file_handle)
response = HttpResponse(file_handle, content_type=mime_type)
# Firefox is not able to handle unicode characters in filename field
# RFC 5987 addresses this issue
# see https://datatracker.ietf.org/doc/html/rfc5987#section-4.2
# Chromium cannot handle commas in the filename
filename_normalized = normalize("NFKD", filename.replace(",", "_")).encode(
"ascii",
"ignore",
) )
filename_encoded = quote(filename)
content_disposition = (
f"{disposition}; "
f'filename="{filename_normalized}"; '
f"filename*=utf-8''{filename_encoded}"
)
response["Content-Disposition"] = content_disposition
return response
def get_metadata(self, file, mime_type): def get_metadata(self, file, mime_type):
if not os.path.isfile(file): if not os.path.isfile(file):
@ -595,33 +569,19 @@ class DocumentViewSet(
raise Http404 raise Http404
if request.method == "GET": if request.method == "GET":
try: now = datetime.now()
now = datetime.now() links = [
links = [ {
{ "id": c.id,
"id": c.id, "created": c.created,
"created": c.created, "expiration": c.expiration,
"expiration": c.expiration, "slug": c.slug,
"slug": c.slug, }
} for c in ShareLink.objects.filter(document=doc)
for c in ShareLink.objects.filter(document=doc) .exclude(expiration__lt=now)
.exclude(expiration__lt=now) .order_by("-created")
.order_by("-created") ]
] return Response(links)
return Response(links)
except Exception as e:
logger.warning(f"An error occurred retrieving share links: {e!s}")
return Response(
{
"error": "Error retreiving share links, see logs for details.",
},
)
return Response(
{
"error": "error",
},
)
class SearchResultSerializer(DocumentSerializer, PassUserMixin): class SearchResultSerializer(DocumentSerializer, PassUserMixin):
@ -1205,39 +1165,43 @@ class SharedLinkView(View):
return HttpResponseRedirect("/accounts/login/?sharelink_notfound=1") return HttpResponseRedirect("/accounts/login/?sharelink_notfound=1")
if share_link.expiration is not None and share_link.expiration < timezone.now(): if share_link.expiration is not None and share_link.expiration < timezone.now():
return HttpResponseRedirect("/accounts/login/?sharelink_expired=1") return HttpResponseRedirect("/accounts/login/?sharelink_expired=1")
try: return serve_file(
doc = share_link.document doc=share_link.document,
if share_link.document_version == "archive": use_archive=share_link.document_version == "archive",
file_handle = doc.archive_file disposition="inline",
filename = doc.get_public_filename(archive=True) )
mime_type = "application/pdf"
else:
file_handle = doc.source_file
filename = doc.get_public_filename()
mime_type = doc.mime_type
# Support browser previewing csv files by using text mime type
if mime_type in {"application/csv", "text/csv"}:
mime_type = "text/plain"
if doc.storage_type == Document.STORAGE_TYPE_GPG:
file_handle = GnuPG.decrypted(file_handle)
response = HttpResponse(file_handle, content_type=mime_type) def serve_file(doc: Document, use_archive: bool, disposition: str):
# Firefox is not able to handle unicode characters in filename field if use_archive:
# RFC 5987 addresses this issue file_handle = doc.archive_file
# see https://datatracker.ietf.org/doc/html/rfc5987#section-4.2 filename = doc.get_public_filename(archive=True)
# Chromium cannot handle commas in the filename mime_type = "application/pdf"
filename_normalized = normalize("NFKD", filename.replace(",", "_")).encode( else:
"ascii", file_handle = doc.source_file
"ignore", filename = doc.get_public_filename()
) mime_type = doc.mime_type
filename_encoded = quote(filename) # Support browser previewing csv files by using text mime type
content_disposition = ( if mime_type in {"application/csv", "text/csv"} and disposition == "inline":
"inline; " mime_type = "text/plain"
f'filename="{filename_normalized}"; '
f"filename*=utf-8''{filename_encoded}" if doc.storage_type == Document.STORAGE_TYPE_GPG:
) file_handle = GnuPG.decrypted(file_handle)
response["Content-Disposition"] = content_disposition
return response response = HttpResponse(file_handle, content_type=mime_type)
except (FileNotFoundError, Document.DoesNotExist): # Firefox is not able to handle unicode characters in filename field
raise Http404 # RFC 5987 addresses this issue
# see https://datatracker.ietf.org/doc/html/rfc5987#section-4.2
# Chromium cannot handle commas in the filename
filename_normalized = normalize("NFKD", filename.replace(",", "_")).encode(
"ascii",
"ignore",
)
filename_encoded = quote(filename)
content_disposition = (
f"{disposition}; "
f'filename="{filename_normalized}"; '
f"filename*=utf-8''{filename_encoded}"
)
response["Content-Disposition"] = content_disposition
return response