Merge branch 'master' of github.com:danielquinn/paperless

src/documents/management/commands/document_exporter.py

@@ -10,6 +10,7 @@ from documents.models import Document, Correspondent, Tag
 from paperless.db import GnuPG
 
 from ...mixins import Renderable
+from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME
 
 
 class Command(Renderable, BaseCommand):
@@ -61,15 +62,24 @@ class Command(Renderable, BaseCommand):
 
             document = document_map[document_dict["pk"]]
 
-            target = os.path.join(self.target, document.file_name)
+            file_target = os.path.join(self.target, document.file_name)
-            document_dict["__exported_file_name__"] = target
 
-            print("Exporting: {}".format(target))
+            thumbnail_name = document.file_name + "-tumbnail.png"
+            thumbnail_target = os.path.join(self.target, thumbnail_name)
 
-            with open(target, "wb") as f:
+            document_dict[EXPORTER_FILE_NAME] = document.file_name
+            document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name
+
+            print("Exporting: {}".format(file_target))
+
+            t = int(time.mktime(document.created.timetuple()))
+            with open(file_target, "wb") as f:
                 f.write(GnuPG.decrypted(document.source_file))
-                t = int(time.mktime(document.created.timetuple()))
+                os.utime(file_target, times=(t, t))
-                os.utime(target, times=(t, t))
+
+            with open(thumbnail_target, "wb") as f:
+                f.write(GnuPG.decrypted(document.thumbnail_file))
+                os.utime(thumbnail_target, times=(t, t))
 
         manifest += json.loads(
             serializers.serialize("json", Correspondent.objects.all()))

src/documents/management/commands/document_importer.py

@@ -10,6 +10,8 @@ from paperless.db import GnuPG
 
 from ...mixins import Renderable
 
+from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME
+
 
 class Command(Renderable, BaseCommand):
 
@@ -70,13 +72,13 @@ class Command(Renderable, BaseCommand):
             if not record["model"] == "documents.document":
                 continue
 
-            if "__exported_file_name__" not in record:
+            if EXPORTER_FILE_NAME not in record:
                 raise CommandError(
                     'The manifest file contains a record which does not '
                     'refer to an actual document file.'
                 )
 
-            doc_file = record["__exported_file_name__"]
+            doc_file = record[EXPORTER_FILE_NAME]
             if not os.path.exists(os.path.join(self.source, doc_file)):
                 raise CommandError(
                     'The manifest file refers to "{}" which does not '
@@ -90,10 +92,21 @@ class Command(Renderable, BaseCommand):
             if not record["model"] == "documents.document":
                 continue
 
-            doc_file = record["__exported_file_name__"]
+            doc_file = record[EXPORTER_FILE_NAME]
+            thumb_file = record[EXPORTER_THUMBNAIL_NAME]
             document = Document.objects.get(pk=record["pk"])
-            with open(doc_file, "rb") as unencrypted:
+
+            document_path = os.path.join(self.source, doc_file)
+            thumbnail_path = os.path.join(self.source, thumb_file)
+
+            with open(document_path, "rb") as unencrypted:
                 with open(document.source_path, "wb") as encrypted:
                     print("Encrypting {} and saving it to {}".format(
                         doc_file, document.source_path))
                     encrypted.write(GnuPG.encrypted(unencrypted))
+
+            with open(thumbnail_path, "rb") as unencrypted:
+                with open(document.thumbnail_path, "wb") as encrypted:
+                    print("Encrypting {} and saving it to {}".format(
+                        thumb_file, document.thumbnail_path))
+                    encrypted.write(GnuPG.encrypted(unencrypted))

src/documents/settings.py

@@ -0,0 +1,4 @@
+# Defines the names of file/thumbnail for the manifest
+# for exporting/importing commands
+EXPORTER_FILE_NAME = "__exported_file_name__"
+EXPORTER_THUMBNAIL_NAME = "__exported_thumbnail_name__"

src/documents/tests/test_importer.py

@@ -3,6 +3,8 @@ from django.test import TestCase
 
 from ..management.commands.document_importer import Command
 
+from documents.settings import EXPORTER_FILE_NAME
+
 
 class TestImporter(TestCase):
 
@@ -27,7 +29,7 @@ class TestImporter(TestCase):
 
         cmd.manifest = [{
             "model": "documents.document",
-            "__exported_file_name__": "noexist.pdf"
+            EXPORTER_FILE_NAME: "noexist.pdf"
         }]
         # self.assertRaises(CommandError, cmd._check_manifest)
         with self.assertRaises(CommandError) as cm: