kenkeiras/org-rw
1
0
Fork 1
Code Issues 3 Pull requests 3 Releases Wiki Activity Actions

Improve Timestamp and TimeRange handling.

Browse source
This commit is contained in:
Sergio Martínez Portela 2020-12-10 00:12:13 +01:00
parent 7f67c768c6
commit b2779dbc41
3 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
org_dom/org_dom.py
View file

@ -313,6 +313,10 @@ def token_from_type(tok_type):
return ModeToMarker[tok_type]
def parse_org_time_range(start, end):
return TimeRange(parse_org_time(start), parse_org_time(end))
def parse_org_time(value):
if m := ACTIVE_TIME_STAMP_RE.match(value):
active = True
@ -348,11 +352,15 @@ def parse_org_time(value):
int(m.group("month")),
int(m.group("day")),
m.group("dow"),
int(m.group("start_hour")),
int(m.group("start_minute")),
int(m.group("start_hour")) if m.group("start_hour") else None,
int(m.group("start_minute")) if m.group("start_minute") else None,
)
def timerange_to_string(tr: TimeRange):
return timestamp_to_string(tr.start_time) + "--" + timestamp_to_string(tr.end_time)
def timestamp_to_string(ts):
date = "{year}-{month:02d}-{day:02d}".format(
year=ts.year, month=ts.month, day=ts.day
@ -803,6 +811,8 @@ class OrgDom:
if isinstance(prop.value, Timestamp):
value = timestamp_to_string(prop.value)
elif isinstance(prop.value, TimeRange):
value = timerange_to_string(prop.value)
else:
value = prop.value
@ -1012,8 +1022,8 @@ class OrgDomReader:
if (value.count(">--<") == 1) or (value.count("]--[") == 1):
# Time ranges with two different dates
# @TODO properly consider "=> DURATION" section
chunks = value.split("=").split("--")
as_time_range = parse_org_time(chunks[0], chunks[1])
start, end = value.split("=")[0].split("--")
as_time_range = parse_org_time_range(start, end)
if (as_time_range[0] is not None) and (as_time_range[1] is not None):
value = TimeRange(as_time_range[0], as_time_range[1])
elif as_time := parse_org_time(value):