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

update upgrade module to use new message handling

Browse source
This commit is contained in:
Jonathan Wren 2022-05-01 05:27:33 -07:00
parent 03c0ae33f0
commit 3ccf695f50
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
jrnl/messages.py
View file

@ -166,6 +166,11 @@ class MsgText(Enum):
The following journals will not be touched: The following journals will not be touched:
""" """
UpgradingJournal = """
Upgrading {journal_type} '{journal_name}' journal stored in {path}...
"""
PaddedJournalName = "{journal_name:{pad}} -> {path}" PaddedJournalName = "{journal_name:{pad}} -> {path}"
# -- Config --- # # -- Config --- #

26
jrnl/upgrade.py
View file

@ -122,10 +122,17 @@ def upgrade_jrnl(config_path):
raise JrnlException(Message(MsgText.UpgradeAborted), MsgType.WARNING) raise JrnlException(Message(MsgText.UpgradeAborted), MsgType.WARNING)
for journal_name, path in encrypted_journals.items(): for journal_name, path in encrypted_journals.items():
print( print_msg(
f"\nUpgrading encrypted '{journal_name}' journal stored in {path}...", Message(
file=sys.stderr, MsgText.UpgradingJournal,
params={
"journal_type": "encrypted",
"journal_name": journal_name,
"path": path,
},
) )
)
backup(path, binary=True) backup(path, binary=True)
old_journal = Journal.open_journal( old_journal = Journal.open_journal(
journal_name, scope_config(config, journal_name), legacy=True journal_name, scope_config(config, journal_name), legacy=True
@ -133,10 +140,17 @@ def upgrade_jrnl(config_path):
all_journals.append(EncryptedJournal.from_journal(old_journal)) all_journals.append(EncryptedJournal.from_journal(old_journal))
for journal_name, path in plain_journals.items(): for journal_name, path in plain_journals.items():
print( print_msg(
f"\nUpgrading plain text '{journal_name}' journal stored in {path}...", Message(
file=sys.stderr, MsgText.UpgradingJournal,
params={
"journal_type": "plain text",
"journal_name": journal_name,
"path": path,
},
) )
)
backup(path) backup(path)
old_journal = Journal.open_journal( old_journal = Journal.open_journal(
journal_name, scope_config(config, journal_name), legacy=True journal_name, scope_config(config, journal_name), legacy=True