From b4e578b63a303aa8ddebdcce5e9051e6e61bb759 Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Sun, 5 Apr 2015 18:38:30 +0200 Subject: [PATCH] Fix parsing issue --- jrnl/Journal.py | 2 +- jrnl/upgrade.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jrnl/Journal.py b/jrnl/Journal.py index 74c82470..af9e6b9e 100644 --- a/jrnl/Journal.py +++ b/jrnl/Journal.py @@ -85,7 +85,7 @@ class Journal(object): # Initialise our current entry entries = [] current_entry = None - date_blob_re = re.compile("^\[.+\] ") + date_blob_re = re.compile("^\[[^\\]]+\] ") for line in journal_txt.splitlines(): line = line.rstrip() date_blob = date_blob_re.findall(line) diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index 96f4869d..c73fa086 100644 --- a/jrnl/upgrade.py +++ b/jrnl/upgrade.py @@ -58,8 +58,8 @@ older versions of jrnl anymore. else: plain_journals[journal_name] = path + longest_journal_name = max([len(journal) for journal in config['journals']]) if encrypted_journals: - longest_journal_name = max([len(journal) for journal in config['journals']]) util.prompt("\nFollowing encrypted journals will be upgraded to jrnl {}:".format(__version__)) for journal, path in encrypted_journals.items(): util.prompt(" {:{pad}} -> {}".format(journal, path, pad=longest_journal_name))