From 93650f99273e7355e5714bc8aca51201937c89f0 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sun, 1 May 2022 04:25:32 -0700 Subject: [PATCH] update upgrade module to use new message handling --- jrnl/messages.py | 2 +- jrnl/upgrade.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jrnl/messages.py b/jrnl/messages.py index 0ed2cc8a..3c365b18 100644 --- a/jrnl/messages.py +++ b/jrnl/messages.py @@ -94,7 +94,7 @@ class MsgText(Enum): NoDefaultJournal = "No default journal configured\n{journals}" - FileDoesNotExist = "{filename} does not exist" + DoesNotExist = "{name} does not exist" # --- Journal status ---# JournalNotSaved = "Entry NOT saved to journal" diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index ad0f4fa6..f7c7274d 100644 --- a/jrnl/upgrade.py +++ b/jrnl/upgrade.py @@ -37,7 +37,7 @@ def backup(filename, binary=False): except FileNotFoundError: print_msg( - Message(MsgText.FileDoesNotExist, MsgType.WARNING, {"filename": filename}) + Message(MsgText.DoesNotExist, MsgType.WARNING, {"name": filename}) ) cont = yesno(f"\nCreate {filename}?", default=False) if not cont: @@ -73,6 +73,7 @@ def upgrade_jrnl(config_path): path = os.path.expanduser(path) else: print(f"\nError: {path} does not exist.") + print_msg(Message(MsgText.DoesNotExist, MsgType.ERROR, {"name": path})) continue if encrypt: