unified data folders

jonaswinkler · Oct 25, 2020 · c596fe6 · c596fe6
1 parent d324e43
commit c596fe6
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 639 deletions.
diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
@@ -20,9 +20,6 @@ class Command(BaseCommand):
     consumption directory, and fetch any mail available.
     """
 
-    ORIGINAL_DOCS = os.path.join(settings.MEDIA_ROOT, "documents", "originals")
-    THUMB_DOCS = os.path.join(settings.MEDIA_ROOT, "documents", "thumbnails")
-
     def __init__(self, *args, **kwargs):
 
         self.verbosity = 0
@@ -79,7 +76,7 @@ def handle(self, *args, **options):
         except (ConsumerError, MailFetcherError) as e:
             raise CommandError(e)
 
-        for d in (self.ORIGINAL_DOCS, self.THUMB_DOCS):
+        for d in (settings.ORIGINALS_DIR, settings.THUMBNAIL_DIR):
             os.makedirs(d, exist_ok=True)
 
         logging.getLogger(__name__).info(

diff --git a/src/documents/models.py b/src/documents/models.py
@@ -196,9 +196,7 @@ def source_path(self):
             file_name += ".gpg"
 
         return os.path.join(
-            settings.MEDIA_ROOT,
-            "documents",
-            "originals",
+            settings.ORIGINALS_DIR,
             file_name
         )
 
@@ -222,9 +220,7 @@ def thumbnail_path(self):
             file_name += ".gpg"
 
         return os.path.join(
-            settings.MEDIA_ROOT,
-            "documents",
-            "thumbnails",
+            settings.THUMBNAIL_DIR,
             file_name
         )