fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for #117

Browse source
This commit is contained in:
Manuel Ebert 2013-12-22 14:52:06 +01:00
parent 0e637d26d0
commit 67c012a98a
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
jrnl/Journal.py
View file

@ -11,6 +11,7 @@ try: import parsedatetime.parsedatetime_consts as pdt
except ImportError: import parsedatetime.parsedatetime as pdt except ImportError: import parsedatetime.parsedatetime as pdt
import re import re
from datetime import datetime from datetime import datetime
import dateutil
import time import time
import sys import sys
try: try:
@ -252,7 +253,12 @@ class Journal(object):
elif isinstance(date_str, datetime): elif isinstance(date_str, datetime):
return date_str return date_str
date, flag = self.dateparse.parse(date_str) try:
date = dateutil.parser.parse(date_str)
flag = 1 if date.hour == 0 and date.minute == 0 else 2
date = date.timetuple()
except:
date, flag = self.dateparse.parse(date_str)
if not flag: # Oops, unparsable. if not flag: # Oops, unparsable.
try: # Try and parse this as a single year try: # Try and parse this as a single year
@ -288,11 +294,11 @@ class Journal(object):
title, body = (raw[:sep.end()], raw[sep.end():]) if sep else (raw, "") title, body = (raw[:sep.end()], raw[sep.end():]) if sep else (raw, "")
starred = False starred = False
if not date: if not date:
if title.find(":") > 0: if title.find(": ") > 0:
starred = "*" in title[:title.find(":")] starred = "*" in title[:title.find(": ")]
date = self.parse_date(title[:title.find(":")]) date = self.parse_date(title[:title.find(": ")])
if date or starred: # Parsed successfully, strip that from the raw text if date or starred: # Parsed successfully, strip that from the raw text
title = title[title.find(":")+1:].strip() title = title[title.find(": ")+1:].strip()
elif title.strip().startswith("*"): elif title.strip().startswith("*"):
starred = True starred = True
title = title[1:].strip() title = title[1:].strip()