mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-17 11:38:32 +02:00
update upgrade module to use new message handling
This commit is contained in:
parent
03c0ae33f0
commit
3ccf695f50
2 changed files with 25 additions and 6 deletions
|
@ -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 --- #
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Add table
Reference in a new issue