From 1f145c6cbaea8f13c72881f41327241761e9d2e3 Mon Sep 17 00:00:00 2001 From: CkuT Date: Sat, 6 May 2017 14:59:09 +0200 Subject: [PATCH 1/6] Fix the source file checking --- src/documents/management/commands/document_importer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 63c961815..afa0164ab 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -77,7 +77,7 @@ class Command(Renderable, BaseCommand): ) doc_file = record["__exported_file_name__"] - if not os.path.exists(os.path.join(self.source, doc_file)): + if not os.path.exists(doc_file): raise CommandError( 'The manifest file refers to "{}" which does not ' 'appear to be in the source directory.'.format(doc_file) From 2e0e6bb8d2a05cbbeb6aae908b038ed34c14b746 Mon Sep 17 00:00:00 2001 From: CkuT Date: Sat, 6 May 2017 14:32:28 +0200 Subject: [PATCH 2/6] Add thumbnail export --- src/documents/management/commands/document_exporter.py | 7 +++++++ src/documents/management/commands/document_importer.py | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index 1c6ac6e44..8203f930e 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -62,7 +62,9 @@ class Command(Renderable, BaseCommand): document = document_map[document_dict["pk"]] target = os.path.join(self.target, document.file_name) + thumbnail_target = target + "-tumbnail.png" document_dict["__exported_file_name__"] = target + document_dict["__exported_thumbnail_name__"] = thumbnail_target print("Exporting: {}".format(target)) @@ -71,6 +73,11 @@ class Command(Renderable, BaseCommand): t = int(time.mktime(document.created.timetuple())) os.utime(target, times=(t, t)) + with open(thumbnail_target, "wb") as f: + f.write(GnuPG.decrypted(document.thumbnail_file)) + t = int(time.mktime(document.created.timetuple())) + os.utime(target, times=(t, t)) + manifest += json.loads( serializers.serialize("json", Correspondent.objects.all())) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index afa0164ab..be6fbc8bd 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -91,9 +91,15 @@ class Command(Renderable, BaseCommand): continue doc_file = record["__exported_file_name__"] + thumb_file = record["__exported_thumbnail_name__"] document = Document.objects.get(pk=record["pk"]) with open(doc_file, "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(thumb_file, "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)) From da71eab0ae2ec91cadbda5842dadd6f31189a454 Mon Sep 17 00:00:00 2001 From: CkuT Date: Mon, 8 May 2017 14:54:48 +0200 Subject: [PATCH 3/6] Use constants for manifest --- src/documents/management/commands/document_exporter.py | 5 +++-- src/documents/management/commands/document_importer.py | 10 ++++++---- src/documents/settings.py | 3 +++ src/documents/tests/test_importer.py | 4 +++- 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 src/documents/settings.py diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index 8203f930e..2a4e03ad7 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/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): @@ -63,8 +64,8 @@ class Command(Renderable, BaseCommand): target = os.path.join(self.target, document.file_name) thumbnail_target = target + "-tumbnail.png" - document_dict["__exported_file_name__"] = target - document_dict["__exported_thumbnail_name__"] = thumbnail_target + document_dict[EXPORTER_FILE_NAME] = target + document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_target print("Exporting: {}".format(target)) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index be6fbc8bd..942f10c00 100644 --- a/src/documents/management/commands/document_importer.py +++ b/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(doc_file): raise CommandError( 'The manifest file refers to "{}" which does not ' @@ -90,8 +92,8 @@ class Command(Renderable, BaseCommand): if not record["model"] == "documents.document": continue - doc_file = record["__exported_file_name__"] - thumb_file = record["__exported_thumbnail_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: with open(document.source_path, "wb") as encrypted: diff --git a/src/documents/settings.py b/src/documents/settings.py new file mode 100644 index 000000000..ca73dc298 --- /dev/null +++ b/src/documents/settings.py @@ -0,0 +1,3 @@ +# 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__" \ No newline at end of file diff --git a/src/documents/tests/test_importer.py b/src/documents/tests/test_importer.py index 8880aba66..0efddbd71 100644 --- a/src/documents/tests/test_importer.py +++ b/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: From 3f1392769d520a986fd47785c9082aa27bc27e02 Mon Sep 17 00:00:00 2001 From: CkuT Date: Mon, 8 May 2017 15:01:01 +0200 Subject: [PATCH 4/6] Refactor to get the document time once --- src/documents/management/commands/document_exporter.py | 5 ++--- src/documents/management/commands/document_importer.py | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index 2a4e03ad7..f7a06139e 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -69,15 +69,14 @@ class Command(Renderable, BaseCommand): print("Exporting: {}".format(target)) + t = int(time.mktime(document.created.timetuple())) with open(target, "wb") as f: f.write(GnuPG.decrypted(document.source_file)) - t = int(time.mktime(document.created.timetuple())) os.utime(target, times=(t, t)) with open(thumbnail_target, "wb") as f: f.write(GnuPG.decrypted(document.thumbnail_file)) - t = int(time.mktime(document.created.timetuple())) - os.utime(target, times=(t, t)) + os.utime(thumbnail_target, times=(t, t)) manifest += json.loads( serializers.serialize("json", Correspondent.objects.all())) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 942f10c00..a2a496edf 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -95,11 +95,13 @@ class Command(Renderable, BaseCommand): 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: 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(thumb_file, "rb") as unencrypted: with open(document.thumbnail_path, "wb") as encrypted: print("Encrypting {} and saving it to {}".format( From 22c8049bed87a6dce851dc37c242fc80eeb2aa7b Mon Sep 17 00:00:00 2001 From: CkuT Date: Mon, 8 May 2017 15:23:35 +0200 Subject: [PATCH 5/6] Use relatives paths instead of absolutes paths for document export/import --- .../management/commands/document_exporter.py | 17 ++++++++++------- .../management/commands/document_importer.py | 9 ++++++--- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index f7a06139e..41838b182 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -62,17 +62,20 @@ class Command(Renderable, BaseCommand): document = document_map[document_dict["pk"]] - target = os.path.join(self.target, document.file_name) - thumbnail_target = target + "-tumbnail.png" - document_dict[EXPORTER_FILE_NAME] = target - document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_target + file_target = os.path.join(self.target, document.file_name) - print("Exporting: {}".format(target)) + thumbnail_name = document.file_name + "-tumbnail.png" + thumbnail_target = os.path.join(self.target, thumbnail_name) + + 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(target, "wb") as f: + with open(file_target, "wb") as f: f.write(GnuPG.decrypted(document.source_file)) - os.utime(target, times=(t, t)) + os.utime(file_target, times=(t, t)) with open(thumbnail_target, "wb") as f: f.write(GnuPG.decrypted(document.thumbnail_file)) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index a2a496edf..a89f0d4ef 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -79,7 +79,7 @@ class Command(Renderable, BaseCommand): ) doc_file = record[EXPORTER_FILE_NAME] - if not os.path.exists(doc_file): + if not os.path.exists(os.path.join(self.source, doc_file)): raise CommandError( 'The manifest file refers to "{}" which does not ' 'appear to be in the source directory.'.format(doc_file) @@ -96,13 +96,16 @@ class Command(Renderable, BaseCommand): 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(thumb_file, "rb") as 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)) From 279e421ad56268dab88409e3e51f2cc32bb5aa48 Mon Sep 17 00:00:00 2001 From: CkuT Date: Mon, 8 May 2017 15:48:37 +0200 Subject: [PATCH 6/6] PEP8 --- src/documents/settings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/documents/settings.py b/src/documents/settings.py index ca73dc298..20b0b2023 100644 --- a/src/documents/settings.py +++ b/src/documents/settings.py @@ -1,3 +1,4 @@ -# Defines the names of file/thumbnail for the manifest for exporting/importing commands +# 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__" \ No newline at end of file +EXPORTER_THUMBNAIL_NAME = "__exported_thumbnail_name__"