src/paperless/db.py: If encryption is disabled, just directly read the file contents

This commit is contained in:
Mike Cronce 2017-08-07 18:33:56 -04:00 committed by Daniel Quinn
parent 8783c2af88
commit 3b6a3219f5

View File

@ -12,11 +12,15 @@ class GnuPG(object):
@classmethod @classmethod
def decrypted(cls, file_handle): def decrypted(cls, file_handle):
if(not settings.ENABLE_ENCRYPTION):
return file_handle.read()
return cls.gpg.decrypt_file( return cls.gpg.decrypt_file(
file_handle, passphrase=settings.PASSPHRASE).data file_handle, passphrase=settings.PASSPHRASE).data
@classmethod @classmethod
def encrypted(cls, file_handle): def encrypted(cls, file_handle):
if(not settings.ENABLE_ENCRYPTION):
return file_handle.read()
return cls.gpg.encrypt_file( return cls.gpg.encrypt_file(
file_handle, file_handle,
recipients=None, recipients=None,