From ea845a84088a89d9d59605aef80629512557ec14 Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 30 Jan 2021 13:47:26 -0800
Subject: [PATCH] Make journal selection behavior more consistent when there's
 a colon with no date (#1164)

---
 features/multiple_journals.feature | 14 ++++++++++++++
 jrnl/config.py                     | 16 ++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/features/multiple_journals.feature b/features/multiple_journals.feature
index 6a9efe783..222be100e 100644
--- a/features/multiple_journals.feature
+++ b/features/multiple_journals.feature
@@ -29,6 +29,20 @@ Feature: Multiple journals
         And journal "work" should have 1 entry
         And journal "work" should contain "2012-07-23"
 
+    Scenario: Write to specified journal without a timestamp but with colon
+        Given we use the config "multiple.yaml"
+        When we run "jrnl work : a long day in the office"
+        Then journal "default" should have 2 entries
+        And journal "work" should have 1 entry
+        And journal "work" should contain "a long day in the office"
+
+    Scenario: Write to specified journal without a timestamp but with colon
+        Given we use the config "multiple.yaml"
+        When we run "jrnl work: a long day in the office"
+        Then journal "default" should have 2 entries
+        And journal "work" should have 1 entry
+        And journal "work" should contain "a long day in the office"
+
    Scenario: Create new journals as required
         Given we use the config "multiple.yaml"
         Then journal "ideas" should not exist
diff --git a/jrnl/config.py b/jrnl/config.py
index 9e57de3d8..a5a1d1cc1 100644
--- a/jrnl/config.py
+++ b/jrnl/config.py
@@ -138,10 +138,18 @@ def update_config(config, new_config, scope, force_local=False):
 
 def get_journal_name(args, config):
     args.journal_name = DEFAULT_JOURNAL_KEY
-    if args.text and args.text[0] in config["journals"]:
-        args.journal_name = args.text[0]
-        args.text = args.text[1:]
-    elif DEFAULT_JOURNAL_KEY not in config["journals"]:
+
+    # The first arg might be a journal name
+    if args.text:
+        potential_journal_name = args.text[0]
+        if potential_journal_name[-1] == ":":
+            potential_journal_name = potential_journal_name[0:-1]
+
+        if potential_journal_name in config["journals"]:
+            args.journal_name = potential_journal_name
+            args.text = args.text[1:]
+
+    if args.journal_name not in config["journals"]:
         print("No default journal configured.", file=sys.stderr)
         print(list_journals(config), file=sys.stderr)
         sys.exit(1)