wren · Jun 11, 2022 · Mar 19, 2022 · Mar 19, 2022 · Apr 16, 2022 · Apr 16, 2022
diff --git a/jrnl/EncryptedJournal.py b/jrnl/EncryptedJournal.py
@@ -1,9 +1,7 @@
 import base64
-import getpass
 import hashlib
 import logging
 import os
-import sys
 from typing import Callable
 from typing import Optional
 
@@ -24,7 +22,8 @@
 from jrnl.exception import JrnlException
 from jrnl.messages import Message
 from jrnl.messages import MsgText
-from jrnl.messages import MsgType
+from jrnl.messages import MsgStyle
+from jrnl.output import print_msg
 
 
 def make_key(password):
@@ -46,21 +45,26 @@ def decrypt_content(
     keychain: str = None,
     max_attempts: int = 3,
 ) -> str:
+    def get_pw():
+        return print_msg(
+            Message(MsgText.Password, MsgStyle.PROMPT), get_input=True, hide_input=True
+        )
+
     pwd_from_keychain = keychain and get_keychain(keychain)
-    password = pwd_from_keychain or getpass.getpass()
+    password = pwd_from_keychain or get_pw()
     result = decrypt_func(password)
     # Password is bad:
     if result is None and pwd_from_keychain:
         set_keychain(keychain, None)
     attempt = 1
     while result is None and attempt < max_attempts:
-        print("Wrong password, try again.", file=sys.stderr)
-        password = getpass.getpass()
+        print_msg(Message(MsgText.WrongPasswordTryAgain, MsgStyle.WARNING))
+        password = get_pw()
         result = decrypt_func(password)
         attempt += 1
 
     if result is None:
-        raise JrnlException(Message(MsgText.PasswordMaxTriesExceeded, MsgType.ERROR))
+        raise JrnlException(Message(MsgText.PasswordMaxTriesExceeded, MsgStyle.ERROR))
 
     return result
 
@@ -79,13 +83,22 @@ def open(self, filename=None):
         if not os.path.exists(filename):
             if not os.path.isdir(dirname):
                 os.makedirs(dirname)
-                print(f"[Directory {dirname} created]", file=sys.stderr)
+                print_msg(
+                    Message(
+                        MsgText.DirectoryCreated,
+                        MsgStyle.NORMAL,
+                        {"directory_name": dirname},
+                    )
+                )
             self.create_file(filename)
             self.password = create_password(self.name)
 
-            print(
-                f"Encrypted journal '{self.name}' created at {filename}",
-                file=sys.stderr,
+            print_msg(
+                Message(
+                    MsgText.JournalCreated,
+                    MsgStyle.NORMAL,
+                    {"journal_name": self.name, "filename": filename},
+                )
             )
 
         text = self._load(filename)
@@ -179,7 +192,7 @@ def get_keychain(journal_name):
         return keyring.get_password("jrnl", journal_name)
     except keyring.errors.KeyringError as e:
         if not isinstance(e, keyring.errors.NoKeyringError):
-            print("Failed to retrieve keyring", file=sys.stderr)
+            print_msg(Message(MsgText.KeyringRetrievalFailure, MsgStyle.ERROR))
         return ""
 
 
@@ -196,9 +209,7 @@ def set_keychain(journal_name, password):
             keyring.set_password("jrnl", journal_name, password)
         except keyring.errors.KeyringError as e:
             if isinstance(e, keyring.errors.NoKeyringError):
-                print(
-                    "Keyring backend not found. Please install one of the supported backends by visiting: https://pypi.org/project/keyring/",
-                    file=sys.stderr,
-                )
+                msg = Message(MsgText.KeyringBackendNotFound, MsgStyle.WARNING)
             else:
-                print("Failed to retrieve keyring", file=sys.stderr)
+                msg = Message(MsgText.KeyringRetrievalFailure, MsgStyle.ERROR)
+            print_msg(msg)
diff --git a/jrnl/FolderJournal.py b/jrnl/FolderJournal.py
@@ -81,7 +81,6 @@ def write(self):
         filenames = get_files(self.config["journal"])
         for filename in filenames:
             if os.stat(filename).st_size <= 0:
-                # print("empty file: {}".format(filename))
                 os.remove(filename)
 
     def delete_entries(self, entries_to_delete):

diff --git a/jrnl/Journal.py b/jrnl/Journal.py
@@ -6,13 +6,17 @@
 import logging
 import os
 import re
-import sys
 
 from . import Entry
 from . import time
 from .prompt import yesno
 from .path import expand_path
 
+from jrnl.output import print_msg
+from jrnl.messages import Message
+from jrnl.messages import MsgText
+from jrnl.messages import MsgStyle
+
 
 class Tag:
     def __init__(self, name, count=0):
@@ -83,9 +87,24 @@ def open(self, filename=None):
         if not os.path.exists(filename):
             if not os.path.isdir(dirname):
                 os.makedirs(dirname)
-                print(f"[Directory {dirname} created]", file=sys.stderr)
+                print_msg(
+                    Message(
+                        MsgText.DirectoryCreated,
+                        MsgStyle.NORMAL,
+                        {"directory_name": dirname},
+                    )
+                )
             self.create_file(filename)
-            print(f"[Journal '{self.name}' created at {filename}]", file=sys.stderr)
+            print_msg(
+                Message(
+                    MsgText.JournalCreated,
+                    MsgStyle.NORMAL,
+                    {
+                        "journal_name": self.name,
+                        "filename": filename,
+                    },
+                )
+            )
 
         text = self._load(filename)
         self.entries = self._parse(text)
@@ -269,14 +288,17 @@ def change_date_entries(self, date):
         for entry in self.entries:
             entry.date = date
 
-    def prompt_action_entries(self, message):
+    def prompt_action_entries(self, msg: MsgText):
         """Prompts for action for each entry in a journal, using given message.
         Returns the entries the user wishes to apply the action on."""
         to_act = []
 
         def ask_action(entry):
             return yesno(
-                f"{message} '{entry.pprint(short=True)}'?",
+                Message(
+                    msg,
+                    params={"entry_title": entry.pprint(short=True)},
+                ),
                 default=False,
             )
 
@@ -415,9 +437,14 @@ def open_journal(journal_name, config, legacy=False):
 
     if os.path.isdir(config["journal"]):
         if config["encrypt"]:
-            print(
-                "Warning: This journal's config has 'encrypt' set to true, but this type of journal can't be encrypted.",
-                file=sys.stderr,
+            print_msg(
+                Message(
+                    MsgText.ConfigEncryptedForUnencryptableJournalType,
+                    MsgStyle.WARNING,
+                    {
+                        "journal_name": journal_name,
+                    },
+                )
             )
 
         if config["journal"].strip("/").endswith(".dayone") or "entries" in os.listdir(

diff --git a/jrnl/cli.py b/jrnl/cli.py
@@ -12,7 +12,7 @@
 from jrnl.exception import JrnlException
 from jrnl.messages import Message
 from jrnl.messages import MsgText
-from jrnl.messages import MsgType
+from jrnl.messages import MsgStyle
 
 
 def configure_logger(debug=False):
@@ -45,7 +45,13 @@ def cli(manual_args=None):
 
     except KeyboardInterrupt:
         status_code = 1
-        print_msg("\nKeyboardInterrupt", "\nAborted by user", msg=Message.ERROR)
+
+        print_msg(
+            Message(
+                MsgText.KeyboardInterruptMsg,
+                MsgStyle.ERROR_ON_NEW_LINE,
+            )
+        )
 
     except Exception as e:
         # uncaught exception
@@ -61,13 +67,15 @@ def cli(manual_args=None):
                 debug = True
 
         if debug:
-            print("\n")
+            from rich.console import Console
+
             traceback.print_tb(sys.exc_info()[2])
+            Console(stderr=True).print_exception(extra_lines=1)
 
         print_msg(
             Message(
                 MsgText.UncaughtException,
-                MsgType.ERROR,
+                MsgStyle.ERROR,
                 {"name": type(e).__name__, "exception": e},
             )
         )

diff --git a/jrnl/color.py b/jrnl/color.py
@@ -9,10 +9,6 @@
 if on_windows():
     colorama.init()
 
-WARNING_COLOR = colorama.Fore.YELLOW
-ERROR_COLOR = colorama.Fore.RED
-RESET_COLOR = colorama.Fore.RESET
-
 
 def colorize(string, color, bold=False):
     """Returns the string colored with colorama.Fore.color. If the color set by

diff --git a/jrnl/commands.py b/jrnl/commands.py
@@ -13,10 +13,12 @@
 """
 import platform
 import sys
+
+from jrnl.output import print_msg
 from jrnl.exception import JrnlException
 from jrnl.messages import Message
 from jrnl.messages import MsgText
-from jrnl.messages import MsgType
+from jrnl.messages import MsgStyle
 from jrnl.prompt import create_password
 
 
@@ -77,7 +79,7 @@ def postconfig_encrypt(args, config, original_config, **kwargs):
         raise JrnlException(
             Message(
                 MsgText.CannotEncryptJournalType,
-                MsgType.ERROR,
+                MsgStyle.ERROR,
                 {
                     "journal_name": args.journal_name,
                     "journal_type": journal.__class__.__name__,
@@ -95,9 +97,12 @@ def postconfig_encrypt(args, config, original_config, **kwargs):
     journal.config["encrypt"] = True
     new_journal.write(args.filename)
 
-    print(
-        f"Journal encrypted to {args.filename or new_journal.config['journal']}.",
-        file=sys.stderr,
+    print_msg(
+        Message(
+            MsgText.JournalEncryptedTo,
+            MsgStyle.NORMAL,
+            {"path": args.filename or new_journal.config["journal"]},
+        )
     )
 
     # Update the config, if we encrypted in place
@@ -120,9 +125,12 @@ def postconfig_decrypt(args, config, original_config, **kwargs):
 
     new_journal = PlainJournal.from_journal(journal)
     new_journal.write(args.filename)
-    print(
-        f"Journal decrypted to {args.filename or new_journal.config['journal']}.",
-        file=sys.stderr,
+    print_msg(
+        Message(
+            MsgText.JournalDecryptedTo,
+            MsgStyle.NORMAL,
+            {"path": args.filename or new_journal.config["journal"]},
+        )
     )
 
     # Update the config, if we decrypted in place

diff --git a/jrnl/config.py b/jrnl/config.py
@@ -1,20 +1,18 @@
 import logging
 import os
-import sys
 
 import colorama
 from ruamel.yaml import YAML
 import xdg.BaseDirectory
 
 from . import __version__
+from jrnl.output import list_journals
+from jrnl.output import print_msg
 from jrnl.exception import JrnlException
 from jrnl.messages import Message
 from jrnl.messages import MsgText
-from jrnl.messages import MsgType
+from jrnl.messages import MsgStyle
 
-from .color import ERROR_COLOR
-from .color import RESET_COLOR
-from .output import list_journals
 from .path import home_dir
 
 # Constants
@@ -75,7 +73,7 @@ def get_config_path():
         raise JrnlException(
             Message(
                 MsgText.ConfigDirectoryIsFile,
-                MsgType.ERROR,
+                MsgStyle.ERROR,
                 {
                     "config_directory_path": os.path.join(
                         xdg.BaseDirectory.xdg_config_home, XDG_RESOURCE
@@ -143,11 +141,15 @@ def verify_config_colors(config):
         if upper_color == "NONE":
             continue
         if not getattr(colorama.Fore, upper_color, None):
-            print(
-                "[{2}ERROR{3}: {0} set to invalid color: {1}]".format(
-                    key, color, ERROR_COLOR, RESET_COLOR
-                ),
-                file=sys.stderr,
+            print_msg(
+                Message(
+                    MsgText.InvalidColor,
+                    MsgStyle.NORMAL,
+                    {
+                        "key": key,
+                        "color": color,
+                    },
+                )
             )
             all_valid_colors = False
     return all_valid_colors
@@ -197,7 +199,7 @@ def get_journal_name(args, config):
         raise JrnlException(
             Message(
                 MsgText.NoDefaultJournal,
-                MsgType.ERROR,
+                MsgStyle.ERROR,
                 {"journals": list_journals(config)},
             ),
         )