Merge branch 'master' of github.com:Kozea/Radicale

radicale/xmlutils.py

@@ -307,8 +307,30 @@ def _time_range_match(vobject_item, filter_, child_name):
             return True
         
     elif child_name == "VJOURNAL":
-        # TODO: implement this
+        dtstart = getattr(child, "dstart", None)
-        pass
+        
+        if dtstart is not None:
+            dtstart = dtstart.value
+            if not isinstance(dtstart, datetime):
+                dtstart_is_datetime = False
+                # TODO: changing dates to datetimes may be wrong because of tz
+                dtstart = datetime.combine(dtstart, datetime.min.time()).replace(
+                    tzinfo=timezone.utc)
+            else:
+                dtstart_is_datetime = True
+
+            
+            if dtstart_is_datetime:
+            # Line 1
+                return start <= dtstart and end > dtstart
+            else:
+            # Line 2
+                return start < dtstart + timedelta(days=1) and end > dtstart
+   
+        else:
+            # Line 3
+            return False
+        
     return True