fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 21:18:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce timeformat_strict configuration

Browse source
This commit is contained in:
Lenahan Michael 2020-09-30 15:28:02 +02:00
parent 82f3bf732a
commit 455db728c0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jrnl/Journal.py
View file

@ -31,6 +31,7 @@ class Journal:
"default_hour": 9, "default_hour": 9,
"default_minute": 0, "default_minute": 0,
"timeformat": "%Y-%m-%d %H:%M", "timeformat": "%Y-%m-%d %H:%M",
"timeformat_strict": False,
"tagsymbols": "@", "tagsymbols": "@",
"highlight": True, "highlight": True,
"linewrap": 80, "linewrap": 80,
@ -129,9 +130,12 @@ class Journal:
date_blob_re = re.compile("(?:^|\n)\\[([^\\]]+)\\] ") date_blob_re = re.compile("(?:^|\n)\\[([^\\]]+)\\] ")
# Use strict date matching, if using the default time format # Use strict date matching
# (1) if using the default time format, and
# (2) if timeformat_strict is set to true.
if self.config["timeformat"] == "%Y-%m-%d %H:%M": if self.config["timeformat"] == "%Y-%m-%d %H:%M":
date_blob_re = re.compile("(?:^|\n)\\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2})\\] ") if self.config["timeformat_strict"]:
date_blob_re = re.compile("(?:^|\n)\\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2})\\] ")
last_entry_pos = 0 last_entry_pos = 0
for match in date_blob_re.finditer(journal_txt): for match in date_blob_re.finditer(journal_txt):