Merge pull request #599 from stumpylog/minor-bug-fixes

Fixes downloaded filename, add more consumer ignore settings
This commit is contained in:
Quinn Casey
2022-04-05 09:56:54 -07:00
committed by GitHub
4 changed files with 5 additions and 5 deletions

View File

@@ -6,7 +6,7 @@ import zipfile
from datetime import datetime
from time import mktime
from unicodedata import normalize
from urllib.parse import quote_plus
from urllib.parse import quote
from django.conf import settings
from django.db.models import Case
@@ -244,7 +244,7 @@ class DocumentViewSet(
# RFC 5987 addresses this issue
# see https://datatracker.ietf.org/doc/html/rfc5987#section-4.2
filename_normalized = normalize("NFKD", filename).encode("ascii", "ignore")
filename_encoded = quote_plus(filename)
filename_encoded = quote(filename)
content_disposition = (
f"{disposition}; "
f'filename="{filename_normalized}"; '

View File

@@ -455,7 +455,7 @@ CONSUMER_IGNORE_PATTERNS = list(
json.loads(
os.getenv(
"PAPERLESS_CONSUMER_IGNORE_PATTERNS",
'[".DS_STORE/*", "._*", ".stfolder/*"]',
'[".DS_STORE/*", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini"]',
),
),
)