Added support for open clock dates

Author: tbruckmaier

orgparse/date.py

@@ -548,7 +548,7 @@ class OrgDateClock(OrgDate):
 
     _allow_short_range = False
 
-    def __init__(self, start, end, duration=None, active=None):
+    def __init__(self, start, end=None, duration=None, active=None):
         """
         Create OrgDateClock object
         """
@@ -600,20 +600,25 @@ def from_str(cls, line: str) -> 'OrgDateClock':
         match = cls._re.search(line)
         if not match:
             return cls(None, None)
-        groups = [int(d) for d in match.groups()]
-        ymdhm1 = groups[:5]
-        ymdhm2 = groups[5:10]
-        hm3 = groups[10:]
+
+        ymdhm1 = [int(d) for d in match.groups()[:5]]
+
+        # second part starting with "--", does not exist for open clock dates
+        has_end = bool(match.group(6))
+        if has_end:
+            ymdhm2 = [int(d) for d in match.groups()[6:11]]
+            hm3 = [int(d) for d in match.groups()[11:]]
+
         return cls(
             datetime.datetime(*ymdhm1), # type: ignore[arg-type]
-            datetime.datetime(*ymdhm2), # type: ignore[arg-type]
-            hm3[0] * 60 + hm3[1],
+            datetime.datetime(*ymdhm2) if has_end else None, # type: ignore[arg-type]
+            hm3[0] * 60 + hm3[1] if has_end else None,
         )
 
     _re = re.compile(
         r'^(?!#).*CLOCK:\s+'
-        r'\[(\d+)\-(\d+)\-(\d+)[^\]\d]*(\d+)\:(\d+)\]--'
-        r'\[(\d+)\-(\d+)\-(\d+)[^\]\d]*(\d+)\:(\d+)\]\s+=>\s+(\d+)\:(\d+)'
+        r'\[(\d+)\-(\d+)\-(\d+)[^\]\d]*(\d+)\:(\d+)\]'
+        r'(--\[(\d+)\-(\d+)\-(\d+)[^\]\d]*(\d+)\:(\d+)\]\s+=>\s+(\d+)\:(\d+))?'
         )
 
 

orgparse/tests/data/04_logbook.org

@@ -1,5 +1,6 @@
 * LOGBOOK drawer test
   :LOGBOOK:
+  CLOCK: [2012-10-26 Fri 16:01]
   CLOCK: [2012-10-26 Fri 14:50]--[2012-10-26 Fri 15:00] =>  0:10
   CLOCK: [2012-10-26 Fri 14:30]--[2012-10-26 Fri 14:40] =>  0:10
   CLOCK: [2012-10-26 Fri 14:10]--[2012-10-26 Fri 14:20] =>  0:10

orgparse/tests/data/04_logbook.py

@@ -3,6 +3,7 @@
 data = [dict(
     heading='LOGBOOK drawer test',
     clock=[
+        OrgDateClock((2012, 10, 26, 16, 1)),
         OrgDateClock((2012, 10, 26, 14, 50), (2012, 10, 26, 15, 00)),
         OrgDateClock((2012, 10, 26, 14, 30), (2012, 10, 26, 14, 40)),
         OrgDateClock((2012, 10, 26, 14, 10), (2012, 10, 26, 14, 20)),

orgparse/tests/test_date.py

@@ -29,8 +29,9 @@ def test_date_as_string() -> None:
 
     assert str(OrgDateClock(testdatetime, testdatetime2)) == "[2021-09-03 Fri 16:19]--[2021-09-03 Fri 17:00]"
     assert str(OrgDateClock(testdatetime, testdatetime_nextday)) == "[2021-09-03 Fri 16:19]--[2021-09-04 Sat 00:02]"
+    assert str(OrgDateClock(testdatetime)) == "[2021-09-03 Fri 16:19]"
+
 
-    
 def test_date_as_datetime() -> None:
     testdate = (2021, 9, 3)
     testdatetime = (2021, 9, 3, 16, 19, 13)