paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-08-14 00:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unified PAPERLESS_DIRECTORY_FORMAT and PAPERLESS_FILENAME_FORMAT into

Browse Source 
one configuration setting
This commit is contained in:
Wolf-Bastian Poettner
2020-02-01 20:09:36 +00:00
parent 86a51c6fa5
commit 6a671ebd22
4 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/documents/models.py
View File

@@ -299,31 +299,17 @@ class Document(models.Model):
return mydictionary
def generate_source_filename(self):
# Create directory name based on configured format
if settings.PAPERLESS_DIRECTORY_FORMAT is not None:
directory = settings.PAPERLESS_DIRECTORY_FORMAT.format(
correspondent=slugify(self.correspondent),
title=slugify(self.title),
created=slugify(self.created),
added=slugify(self.added),
tags=defaultdict(str,
self.many_to_dictionary(self.tags)))
else:
directory = ""
# Create filename based on configured format
if settings.PAPERLESS_FILENAME_FORMAT is not None:
filename = settings.PAPERLESS_FILENAME_FORMAT.format(
correspondent=slugify(self.correspondent),
title=slugify(self.title),
created=slugify(self.created),
added=slugify(self.added),
tags=defaultdict(str,
self.many_to_dictionary(self.tags)))
path = settings.PAPERLESS_FILENAME_FORMAT.format(
correspondent=slugify(self.correspondent),
title=slugify(self.title),
created=slugify(self.created),
added=slugify(self.added),
tags=defaultdict(str,
self.many_to_dictionary(self.tags)))
else:
filename = ""
path = os.path.join(directory, filename)
path = ""
# Always append the primary key to guarantee uniqueness of filename
if len(path) > 0: