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

Address review comments by @danielquinn

Browse Source
This commit is contained in:
Michael Gmelin 2019-09-08 17:00:02 +02:00
parent f0320fb72d
commit 3b88d6722a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/documents/models.py
View File

@ -484,11 +484,15 @@ class FileInfo:
""" """
filename = os.path.basename(path) filename = os.path.basename(path)
# Mutate filename in-place before parsing its components
# by applying at most one of the configured transformations.
for (pattern, repl) in settings.FILENAME_PARSE_TRANSFORMS: for (pattern, repl) in settings.FILENAME_PARSE_TRANSFORMS:
(filename, count) = pattern.subn(repl, filename) (filename, count) = pattern.subn(repl, filename)
if count: if count:
break break
# Parse filename components.
for regex in cls.REGEXES.values(): for regex in cls.REGEXES.values():
m = regex.match(filename) m = regex.match(filename)
if m: if m:

8
src/paperless/settings.py
View File

@ -321,12 +321,8 @@ FILENAME_DATE_ORDER = os.getenv("PAPERLESS_FILENAME_DATE_ORDER")
# Transformations applied before filename parsing # Transformations applied before filename parsing
FILENAME_PARSE_TRANSFORMS = [] FILENAME_PARSE_TRANSFORMS = []
_filename_parse_transforms = os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS") for t in json.loads(os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS", "[]")):
if _filename_parse_transforms: FILENAME_PARSE_TRANSFORMS.append((re.compile(t["pattern"]), t["repl"]))
FILENAME_PARSE_TRANSFORMS = [(
re.compile(t["pattern"]), t["repl"])
for t in json.loads(_filename_parse_transforms)
]
# Specify for how many years a correspondent is considered recent. Recent # Specify for how many years a correspondent is considered recent. Recent
# correspondents will be shown in a separate "Recent correspondents" filter as # correspondents will be shown in a separate "Recent correspondents" filter as