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

---
 jrnl/messages.py |  5 +++++
 jrnl/upgrade.py  | 26 ++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/jrnl/messages.py b/jrnl/messages.py
index 275ccdc6..15b85f8b 100644
--- a/jrnl/messages.py
+++ b/jrnl/messages.py
@@ -166,6 +166,11 @@ class MsgText(Enum):
         The following journals will not be touched:
 
         """
+
+    UpgradingJournal = """
+        Upgrading {journal_type} '{journal_name}' journal stored in {path}...
+        """
+
     PaddedJournalName = "{journal_name:{pad}} -> {path}"
 
     # -- Config --- #
diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py
index 90e97887..9adc7795 100644
--- a/jrnl/upgrade.py
+++ b/jrnl/upgrade.py
@@ -122,10 +122,17 @@ def upgrade_jrnl(config_path):
         raise JrnlException(Message(MsgText.UpgradeAborted), MsgType.WARNING)
 
     for journal_name, path in encrypted_journals.items():
-        print(
-            f"\nUpgrading encrypted '{journal_name}' journal stored in {path}...",
-            file=sys.stderr,
+        print_msg(
+            Message(
+                MsgText.UpgradingJournal,
+                params={
+                    "journal_type": "encrypted",
+                    "journal_name": journal_name,
+                    "path": path,
+                },
+            )
         )
+
         backup(path, binary=True)
         old_journal = Journal.open_journal(
             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))
 
     for journal_name, path in plain_journals.items():
-        print(
-            f"\nUpgrading plain text '{journal_name}' journal stored in {path}...",
-            file=sys.stderr,
+        print_msg(
+            Message(
+                MsgText.UpgradingJournal,
+                params={
+                    "journal_type": "plain text",
+                    "journal_name": journal_name,
+                    "path": path,
+                },
+            )
         )
+
         backup(path)
         old_journal = Journal.open_journal(
             journal_name, scope_config(config, journal_name), legacy=True