fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-07 00:36:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make backup of config when upgrading

Browse source 
Fixes #307
This commit is contained in:
Manuel Ebert 2015-04-04 18:36:34 +11:00
parent dd79639095
commit b90a4b16bb
4 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
jrnl/EncryptedJournal.py
View file

@ -26,7 +26,12 @@ class EncryptedJournal(Journal.Journal):
super(EncryptedJournal, self).__init__(name, **kwargs)
self.config['encrypt'] = True
def _load(self, filename):
def _load(self, filename, password=None):
"""Loads an encrypted journal from a file and tries to decrypt it.
If password is not provided, will look for password in the keychain
and otherwise ask the user to enter a password up to three times.
If the password is provided but wrong (or corrupt), this will simply
return None."""
with open(filename) as f:
journal_encrypted = f.read()
@ -36,7 +41,8 @@ class EncryptedJournal(Journal.Journal):
return Fernet(key).decrypt(journal_encrypted).decode('utf-8')
except (InvalidToken, IndexError):
return None
if password:
return validate_password(password)
return util.get_password(keychain=self.name, validator=validate_password)
def _store(self, filename, text):