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

update the upgrade process for new encryption classes

Browse source
This commit is contained in:
Jonathan Wren 2022-09-25 15:52:14 -07:00
parent 358e6c7f68
commit 41a5af533d
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
jrnl/encryption/NoEncryption.py
View file

@ -10,5 +10,8 @@ class NoEncryption(BaseEncryption):
def _encrypt(self, text: str) -> str: def _encrypt(self, text: str) -> str:
return text return text
def _decrypt(self, text: str) -> str: def _decrypt(self, text: bytes | str) -> str:
return text result = text
if isinstance(result, bytes):
result = result.decode(self._encoding)
return result

11
jrnl/upgrade.py
View file

@ -134,8 +134,15 @@ def upgrade_jrnl(config_path):
) )
logging.debug(f"Clearing encryption method for '{journal_name}' journal") logging.debug(f"Clearing encryption method for '{journal_name}' journal")
old_journal.encryption_method = None
all_journals.append(old_journal) # Update the encryption method
new_journal = Journal.PlainJournal.from_journal(old_journal)
new_journal.config["encrypt"] = "jrnlv2"
new_journal._get_encryption_method()
# Copy over password (jrnlv1 only supported password-based encryption)
new_journal.encryption_method.password = old_journal.encryption_method.password
all_journals.append(new_journal)
for journal_name, path in plain_journals.items(): for journal_name, path in plain_journals.items():
print_msg( print_msg(