From cd464eebe08c1ee339eb3296e1d8386d616e28d1 Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sun, 1 May 2022 04:17:31 -0700
Subject: [PATCH] update upgrade module to use new message handling

---
 jrnl/messages.py |  3 +++
 jrnl/upgrade.py  | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jrnl/messages.py b/jrnl/messages.py
index 1da61e55..0954f7d7 100644
--- a/jrnl/messages.py
+++ b/jrnl/messages.py
@@ -75,6 +75,8 @@ class MsgText(Enum):
 
     NoDefaultJournal = "No default journal configured\n{journals}"
 
+    FileDoesNotExist = "{filename} does not exist"
+
     # --- Journal status ---#
     JournalNotSaved = "Entry NOT saved to journal"
     JournalEntryAdded = "Entry added to {journal_name} journal"
@@ -90,6 +92,7 @@ class MsgText(Enum):
     JournalCreated = "Journal '{journal_name}' created at {filename}"
     DirectoryCreated = "Directory {directory_name} created"
     JournalEncrypted = "Journal will be encrypted."
+    BackupCreated = "Created a backup at {filename}"
 
     # --- Editor ---#
     WritingEntryStart = """
diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py
index 981f1c39..e775eff9 100644
--- a/jrnl/upgrade.py
+++ b/jrnl/upgrade.py
@@ -20,7 +20,6 @@ from jrnl.messages import MsgType
 
 
 def backup(filename, binary=False):
-    print(f"  Created a backup at {filename}.backup", file=sys.stderr)
     filename = os.path.expanduser(os.path.expandvars(filename))
 
     try:
@@ -29,8 +28,17 @@ def backup(filename, binary=False):
 
         with open(filename + ".backup", "wb" if binary else "w") as backup:
             backup.write(contents)
+
+        print_msg(
+            Message(
+                MsgText.BackupCreated, MsgType.NORMAL, {"filename": f"filename.backup"}
+            )
+        )
+
     except FileNotFoundError:
-        print(f"\nError: {filename} does not exist.")
+        print_msg(
+            Message(MsgText.FileDoesNotExist, MsgType.WARNING, {"filename": filename})
+        )
         cont = yesno(f"\nCreate {filename}?", default=False)
         if not cont:
             raise JrnlException(Message(MsgText.UpgradeAborted, MsgType.WARNING))