smokephil/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-07 23:35:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Drop STORAGE_TYPE in favour of just using PAPERLESS_PASSPHRASE

Browse source
This commit is contained in:
Daniel Quinn 2018-05-27 23:20:04 +01:00
parent 5643d89270
commit 6e1f2b3f03
3 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/documents/consumer.py
View file

@ -48,15 +48,9 @@ class Consumer:
except FileExistsError:
pass
acceptable_storage_types = [_[0] for _ in Document.STORAGE_TYPES]
if settings.STORAGE_TYPE not in acceptable_storage_types:
raise ConsumerError(
'Invalid STORAGE_TYPE "{}" defined. It must be one of {}. '
'Exiting.'.format(
settings.STORAGE_TYPE,
", ".join(acceptable_storage_types)
)
)
self.storage_type = Document.STORAGE_TYPE_UNENCRYPTED
if settings.PASSPHRASE:
self.storage_type = Document.STORAGE_TYPE_GPG
self.stats = {}
self._ignore = []
@ -209,7 +203,7 @@ class Consumer:
checksum=hashlib.md5(f.read()).hexdigest(),
created=created,
modified=created,
storage_type=settings.STORAGE_TYPE
storage_type=self.storage_type
)
relevant_tags = set(list(Tag.match_all(text)) + list(file_info.tags))
@ -231,7 +225,7 @@ class Consumer:
if document.storage_type == Document.STORAGE_TYPE_UNENCRYPTED:
write_file.write(read_file.read())
return
self.log("debug", "Encrypting the thumbnail")
self.log("debug", "Encrypting")
write_file.write(GnuPG.encrypted(read_file))
def _cleanup_doc(self, doc):