ics-query 0.1.1a0__tar.gz → 0.2.0a0__tar.gz

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.3
 Name: ics-query
-Version: 0.1.1a0
+Version: 0.2.0a0
 Summary: Find out what happens in ICS calendar files - query and filter RFC 5545 compatible .ics files for events, journals, TODOs and more.
 Project-URL: Homepage, https://github.com/niccokunzmann/ics-query/
 Project-URL: Repository, https://github.com/niccokunzmann/ics-query/
-Project-URL: source_archive, https://github.com/niccokunzmann/ics-query/archive/fb12ef2822d23f693aa5f9faaa0cb97fa9f67516.zip
+Project-URL: source_archive, https://github.com/niccokunzmann/ics-query/archive/c7eeb503fae7da069308a27a37232be96851c3e5.zip
 Project-URL: Issues, https://github.com/niccokunzmann/ics-query/issues
 Project-URL: Documentation, https://github.com/niccokunzmann/ics-query/
 Project-URL: Changelog, https://github.com/niccokunzmann/ics-query/#changelog
@@ -695,10 +695,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Office/Business :: Scheduling
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: click
 Requires-Dist: icalendar
-Requires-Dist: recurring-ical-events
+Requires-Dist: recurring-ical-events<4,>=3.2.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == 'test'
 Description-Content-Type: text/markdown
@@ -780,8 +780,46 @@ ics-query at <date-time> calendar.ics -
 Please see the command documentation for more help:
 
 ```shell
-ics-query --help
 ics-query at --help
+ics-query --help
+```
+
+### Events within a Time Span
+
+You can query which events happen between certain times:
+
+```shell
+ics-query between <start> <end> calendar.ics -
+ics-query between <start> <duration> calendar.ics -
+```
+
+Please see the command documentation for more help:
+
+```shell
+ics-query between --help
+ics-query --help
+```
+
+### Time Span Examples
+
+This example returns the events within the next week:
+
+```shell
+ics-query between `date +%Y%m%d` +7d calendar.ics -
+```
+
+This example saves the events from the 1st of May 2024 to the 10th of June in
+events.ics:
+
+```shell
+ics-query between 2024-5-1 2024-6-10 calendar.ics events.ics
+```
+
+In this example, you can check what is happening on New Years Eve 2025 around
+midnight:
+
+```shell
+ics-query between 2025-12-31T21:00 +6h calendar.ics events.ics
 ```
 
 ## Vision
@@ -810,13 +848,10 @@ ics-query --components VTODO at 2029-12-24 calendar.ics
 
 ### `ics-query at` - time ranges
 
-
 ### `ics-query --output=count` - count occurrences
 
-
 ### `ics-query --output=ics` - use ics as output (default)
 
-
 ### `ics-query --select-index` - reduce output size
 
 Examples: `0,2,4` `0-10`
@@ -832,10 +867,8 @@ ics-query between dt duration
 
 ### `ics-query --select-component` - filter for components
 
-
 ### `ics-query --select-uid` - filter by uid
 
-
 ## How to edit an event
 
 To edit a component like an event, you can append it to the calendar and increase the sequence number.
@@ -920,7 +953,7 @@ Run this to format the code and show problems:
 tox -e ruff
 ```
 
-## New Release
+### New Release
 
 To release new versions,
 
@@ -938,10 +971,15 @@ To release new versions,
 
 ## Changelog
 
+- v0.2.0a
+
+  - Add `ics-query first <calendar> <output>` for earliest occurrences
+  - Add `ics-query between <span_start> <span_stop> <calendar> <output>` to query time ranges
+
 - v0.1.1a
 
   - Add `--version`
-  - Add `ics-query at <date>`
+  - Add `ics-query at <date> <calendar> <output>`
   - Add support for multiple calendars in one input
 
 - v0.1.0a
@@ -952,3 +990,7 @@ To release new versions,
 - v0.0.1a
 
   - first version
+
+## Related Work
+
+- [icalBuddy](https://hasseg.org/icalBuddy/)

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/README.md

@@ -75,8 +75,46 @@ ics-query at <date-time> calendar.ics -
 Please see the command documentation for more help:
 
 ```shell
-ics-query --help
 ics-query at --help
+ics-query --help
+```
+
+### Events within a Time Span
+
+You can query which events happen between certain times:
+
+```shell
+ics-query between <start> <end> calendar.ics -
+ics-query between <start> <duration> calendar.ics -
+```
+
+Please see the command documentation for more help:
+
+```shell
+ics-query between --help
+ics-query --help
+```
+
+### Time Span Examples
+
+This example returns the events within the next week:
+
+```shell
+ics-query between `date +%Y%m%d` +7d calendar.ics -
+```
+
+This example saves the events from the 1st of May 2024 to the 10th of June in
+events.ics:
+
+```shell
+ics-query between 2024-5-1 2024-6-10 calendar.ics events.ics
+```
+
+In this example, you can check what is happening on New Years Eve 2025 around
+midnight:
+
+```shell
+ics-query between 2025-12-31T21:00 +6h calendar.ics events.ics
 ```
 
 ## Vision
@@ -105,13 +143,10 @@ ics-query --components VTODO at 2029-12-24 calendar.ics
 
 ### `ics-query at` - time ranges
 
-
 ### `ics-query --output=count` - count occurrences
 
-
 ### `ics-query --output=ics` - use ics as output (default)
 
-
 ### `ics-query --select-index` - reduce output size
 
 Examples: `0,2,4` `0-10`
@@ -127,10 +162,8 @@ ics-query between dt duration
 
 ### `ics-query --select-component` - filter for components
 
-
 ### `ics-query --select-uid` - filter by uid
 
-
 ## How to edit an event
 
 To edit a component like an event, you can append it to the calendar and increase the sequence number.
@@ -215,7 +248,7 @@ Run this to format the code and show problems:
 tox -e ruff
 ```
 
-## New Release
+### New Release
 
 To release new versions,
 
@@ -233,10 +266,15 @@ To release new versions,
 
 ## Changelog
 
+- v0.2.0a
+
+  - Add `ics-query first <calendar> <output>` for earliest occurrences
+  - Add `ics-query between <span_start> <span_stop> <calendar> <output>` to query time ranges
+
 - v0.1.1a
 
   - Add `--version`
-  - Add `ics-query at <date>`
+  - Add `ics-query at <date> <calendar> <output>`
   - Add support for multiple calendars in one input
 
 - v0.1.0a
@@ -247,3 +285,7 @@ To release new versions,
 - v0.0.1a
 
   - first version
+
+## Related Work
+
+- [icalBuddy](https://hasseg.org/icalBuddy/)

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/ics_query/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.1a0'
-__version_tuple__ = version_tuple = (0, 1, 1)
+__version__ = version = '0.2.0a0'
+__version_tuple__ = version_tuple = (0, 2, 0)

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/ics_query/cli.py

@@ -10,7 +10,6 @@ import typing as t
 import click
 import recurring_ical_events
 from icalendar.cal import Calendar, Component
-from recurring_ical_events import CalendarQuery
 
 from . import parse
 from .version import __version__
@@ -20,7 +19,7 @@ if t.TYPE_CHECKING:
 
     from icalendar.cal import Component
 
-    from .parse import DateArgument
+    from .parse import Date
 
 print = functools.partial(print, file=sys.stderr)  # noqa: A001
 
@@ -36,6 +35,11 @@ class ComponentsResult:
         """Return a component."""
         self._file.write(component.to_ical())
 
+    def add_components(self, components: t.Iterable[Component]):
+        """Add all components."""
+        for component in components:
+            self.add_component(component)
+
 
 class ComponentsResultArgument(click.File):
     """Argument for the result."""
@@ -61,6 +65,19 @@ class JoinedCalendars:
         for query in self.queries:
             yield from query.at(dt)
 
+    def first(self) -> t.Generator[Component]:
+        """Return the first events of all calendars."""
+        for query in self.queries:
+            for component in query.all():
+                yield component
+                break
+
+    def between(
+        self, start: parse.Date, end: parse.DateAndDelta
+    ) -> t.Generator[Component]:
+        for query in self.queries:
+            yield from query.between(start, end)
+
 
 class CalendarQueryInputArgument(click.File):
     """Argument for the result."""
@@ -133,7 +150,7 @@ pass_datetime = click.make_pass_decorator(parse.to_time)
 @click.argument("date", type=parse.to_time)
 @arg_calendar
 @arg_output
-def at(calendar: CalendarQuery, output: ComponentsResult, date: DateArgument):
+def at(calendar: JoinedCalendars, output: ComponentsResult, date: Date):
     """Occurrences at a certain dates.
 
     YEAR
@@ -156,7 +173,7 @@ def at(calendar: CalendarQuery, output: ComponentsResult, date: DateArgument):
 
     \b
         Formats:
-
+    \b
             YYYY-MM
             YYYY-M
             YYYYMM
@@ -175,7 +192,7 @@ def at(calendar: CalendarQuery, output: ComponentsResult, date: DateArgument):
 
     \b
         Formats:
-
+    \b
             YYYY-MM-DD
             YYYY-M-D
             YYYYMMDD
@@ -253,8 +270,206 @@ def at(calendar: CalendarQuery, output: ComponentsResult, date: DateArgument):
             ics-query at 19900101235959       # 1st January 1990, 23:59:59
             ics-query at `date +%Y%m%d%H%M%S` # now
     """  # noqa: D301
-    for event in calendar.at(date):
-        output.add_component(event)
+    output.add_components(calendar.at(date))
+
+
+@main.command()
+@arg_calendar
+@arg_output
+def first(calendar: JoinedCalendars, output: ComponentsResult):
+    """Print only the first occurrence in each calendar.
+
+    \b
+    This example prints the first event in calendar.ics:
+    \b
+        ics-query first calendar.ics -
+
+    """  # noqa: D301
+    output.add_components(calendar.first())
+
+
+@main.command()
+@click.argument("start", type=parse.to_time)
+@click.argument("end", type=parse.to_time_and_delta)
+@arg_calendar
+@arg_output
+def between(
+    start: parse.Date,
+    end: parse.DateAndDelta,
+    calendar: JoinedCalendars,
+    output: ComponentsResult,
+):
+    """Print all occurrences between the START and the END.
+
+    The start is inclusive, the end is exclusive.
+
+    This example returns the events within the next week:
+
+    \b
+        ics-query between `date +%Y%m%d` +7d calendar.ics -
+
+    This example saves the events from the 1st of May 2024 to the 10th of June in
+    events.ics:
+
+    \b
+        ics-query between 2024-5-1 2024-6-10 calendar.ics events.ics
+
+    In this example, you can check what is happening on New Years Eve 2025 around
+    midnight:
+
+    \b
+        ics-query between 2025-12-31T21:00 +6h calendar.ics events.ics
+
+    \b
+    Absolute Time
+    -------------
+
+    START must be specified as an absolute time.
+    END can be absolute or relative to START, see Relative Time below.
+
+    Each of the formats specify the earliest time e.g. the start of a day.
+    Thus, if START == END, there are 0 seconds in between and the result is
+    only what happens during that time or starts exactly at that time.
+
+    YEAR
+
+        Specifiy the start of the year.
+
+    \b
+        Formats:
+    \b
+            YYYY
+    \b
+        Examples:
+    \b
+            2024       # start of 2024
+            `date +%Y` # this year
+
+    MONTH
+
+        The start of the month.
+
+    \b
+        Formats:
+    \b
+            YYYY-MM
+            YYYY-M
+            YYYYMM
+    \b
+        Examples:
+    \b
+            2019-10      # October 2019
+            1990-01      # January 1990
+            1990-1       # January 1990
+            199001       # January 1990
+            `date +%Y%m` # this month
+
+    DAY
+
+        The start of the day
+
+    \b
+        Formats:
+    \b
+            YYYY-MM-DD
+            YYYY-M-D
+            YYYYMMDD
+    \b
+        Examples:
+    \b
+            1990-01-01     # 1st January 1990
+            1990-1-1       # 1st January 1990
+            19900101       # 1st January 1990
+            `date +%Y%m%d` # today
+
+    HOUR
+
+        The start of the hour.
+
+    \b
+        Formats:
+    \b
+            YYYY-MM-DD HH
+            YYYY-MM-DDTHH
+            YYYY-M-DTH
+            YYYYMMDDTHH
+            YYYYMMDDHH
+    \b
+        Examples:
+    \b
+            1990-01-01 01    # 1st January 1990, 1am
+            1990-01-01T01    # 1st January 1990, 1am
+            1990-1-1T17      # 1st January 1990, 17:00
+            19900101T23      # 1st January 1990, 23:00
+            1990010123       # 1st January 1990, 23:00
+            `date +%Y%m%d%H` # this hour
+
+    MINUTE
+
+        The start of a minute.
+
+    \b
+        Formats:
+    \b
+            YYYY-MM-DD HH:MM
+            YYYY-MM-DDTHH:MM
+            YYYY-M-DTH:M
+            YYYYMMDDTHHMM
+            YYYYMMDDHHMM
+    \b
+        Examples:
+    \b
+            1990-01-01 10:10   # 1st January 1990, 10:10am
+            1990-01-01T10:10   # 1st January 1990, 10:10am
+            1990-1-1T7:2       # 1st January 1990, 07:02
+            19900101T2359      # 1st January 1990, 23:59
+            199001012359       # 1st January 1990, 23:59
+            `date +%Y%m%d%H%M` # this minute
+
+    SECOND
+
+        A precise time. RFC 5545 calendars are specified to the second.
+        This is the most precise format to specify times.
+
+    \b
+        Formats:
+    \b
+            YYYY-MM-DD HH:MM:SS
+            YYYY-MM-DDTHH:MM:SS
+            YYYY-M-DTH:M:S
+            YYYYMMDDTHHMMSS
+            YYYYMMDDHHMMSS
+    \b
+        Examples:
+    \b
+            1990-01-01 10:10:00  # 1st January 1990, 10:10am
+            1990-01-01T10:10:00  # 1st January 1990, 10:10am
+            1990-1-1T7:2:30      # 1st January 1990, 07:02:30
+            19901231T235959      # 31st December 1990, 23:59:59
+            19900101235959       # 1st January 1990, 23:59:59
+            `date +%Y%m%d%H%M%S` # now
+    \b
+    Relative Time
+    -------------
+
+    The END argument can be a time range.
+    The + at the beginning is optional but makes for a better reading.
+
+    \b
+    Examples:
+    \b
+    Add 10 days to START: +10d
+    Add 24 hours to START: +1d or +24h
+    Add 3 hours to START: +3h
+    Add 30 minutes to START: +30m
+    Add 1000 seconds to START: +1000s
+    \b
+    You can also combine the ranges:
+    Add 1 day and 12 hours to START: +1d12h
+    Add 3 hours and 15 minutes to START: +3h15m
+
+    """  # noqa: D301
+    output.add_components(calendar.between(start, end))
 
 
 __all__ = ["main"]

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/ics_query/parse.py

@@ -2,9 +2,12 @@
 
 from __future__ import annotations
 
+import datetime
 import re
+from typing import Union
 
-DateArgument = tuple[int]
+Date = tuple[int]
+DateAndDelta = Union[Date, datetime.timedelta]
 
 
 class InvalidTimeFormat(ValueError):
@@ -21,14 +24,22 @@ REGEX_TIME = re.compile(
     r"$"
 )
 
+REGEX_TIMEDELTA = re.compile(
+    r"^\+?(?:(?P<days>\d+)d)?"
+    r"(?:(?P<hours>\d+)h)?"
+    r"(?:(?P<minutes>\d+)m)?"
+    r"(?:(?P<seconds>\d+)s)?"
+    r"$"
+)
+
 
-def to_time(dt: str) -> DateArgument:
+def to_time(dt: str) -> Date:
     """Parse the time and date."""
     parsed_dt = REGEX_TIME.match(dt)
     if parsed_dt is None:
         raise InvalidTimeFormat(dt)
 
-    def group(group_name: str) -> tuple[int]:
+    def group(group_name: str) -> Date:
         """Return a group's value."""
         result = parsed_dt.group(group_name)
         while result and result[0] not in "0123456789":
@@ -47,4 +58,15 @@ def to_time(dt: str) -> DateArgument:
     )
 
 
-__all__ = ["to_time", "DateArgument"]
+def to_time_and_delta(dt: str) -> DateAndDelta:
+    """Parse to a absolute time or timedelta."""
+    parsed_td = REGEX_TIMEDELTA.match(dt)
+    if parsed_td is None:
+        return to_time(dt)
+    kw = {k: int(v) for k, v in parsed_td.groupdict().items() if v is not None}
+    if not kw:
+        raise InvalidTimeFormat(dt)
+    return datetime.timedelta(**kw)
+
+
+__all__ = ["to_time", "Date", "to_time_and_delta", "DateAndDelta"]

ics_query-0.2.0a0/ics_query/tests/runs/between 20240823 4d recurring-work-events.ics -.run

@@ -0,0 +1,24 @@
+BEGIN:VEVENT
+SUMMARY:Work
+DTSTART;TZID=Europe/Berlin:20240823T090000
+DTEND;TZID=Europe/Berlin:20240823T170000
+DTSTAMP:20240823T082915Z
+UID:6b85b60c-eb1a-4338-9ece-33541b95bf17
+SEQUENCE:1
+CREATED:20240823T082829Z
+LAST-MODIFIED:20240823T082915Z
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Work
+DTSTART;TZID=Europe/Berlin:20240826T090000
+DTEND;TZID=Europe/Berlin:20240826T170000
+DTSTAMP:20240823T082915Z
+UID:6b85b60c-eb1a-4338-9ece-33541b95bf17
+SEQUENCE:1
+CREATED:20240823T082829Z
+LAST-MODIFIED:20240823T082915Z
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+END:VEVENT

ics_query-0.2.0a0/ics_query/tests/runs/calendars/empty-calendar.ics

@@ -0,0 +1,7 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//SabreDAV//SabreDAV//EN
+CALSCALE:GREGORIAN
+X-WR-CALNAME:empty-calendar
+X-APPLE-CALENDAR-COLOR:#e78074
+END:VCALENDAR

ics_query-0.2.0a0/ics_query/tests/runs/calendars/recurring-work-events.ics

@@ -0,0 +1,223 @@
+BEGIN:VCALENDAR
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-TZINFO:Europe/Berlin[2024a]
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+005328
+TZNAME:Europe/Berlin(STD)
+DTSTART:18930401T000000
+RDATE:18930401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19160430T230000
+RDATE:19160430T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19161001T010000
+RDATE:19161001T010000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19400401T020000
+RDATE:19400401T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19421102T030000
+RDATE:19421102T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19430329T020000
+RDATE:19430329T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETTO:+030000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19450524T020000
+RDATE:19450524T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19431004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1MO;UNTIL=19441002T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+030000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19450924T030000
+RDATE:19450924T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19451118T030000
+RDATE:19451118T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19460414T020000
+RDATE:19460414T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19470406T030000
+RDATE:19470406T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETTO:+030000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19470511T030000
+RDATE:19470511T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19461007T030000
+RDATE:19461007T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+030000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19470629T030000
+RDATE:19470629T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19480418T020000
+RDATE:19480418T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19490410T020000
+RDATE:19490410T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19800406T020000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:Europe/Berlin(DST)
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:Europe/Berlin(STD)
+DTSTART:19961027T030000
+RDATE:19961027T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:+020000
+TZOFFSETFROM:+010000
+TZNAME:(DST)
+DTSTART:19970330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:+010000
+TZOFFSETFROM:+020000
+TZNAME:(STD)
+DTSTART:19971026T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20240823T082735Z
+LAST-MODIFIED:20240823T082802Z
+DTSTAMP:20240823T082802Z
+UID:22d43072-b75a-43da-bed0-a5da8a7a6853
+SUMMARY:Weekly Tuesday Morning Meeting
+RRULE:FREQ=WEEKLY
+DTSTART;TZID=Europe/Berlin:20240820T090000
+DTEND;TZID=Europe/Berlin:20240820T100000
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20240823T082829Z
+LAST-MODIFIED:20240823T082915Z
+DTSTAMP:20240823T082915Z
+UID:6b85b60c-eb1a-4338-9ece-33541b95bf17
+SUMMARY:Work
+RRULE:FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR
+DTSTART;TZID=Europe/Berlin:20240819T090000
+DTEND;TZID=Europe/Berlin:20240819T170000
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+SEQUENCE:1
+END:VEVENT
+END:VCALENDAR

ics_query-0.2.0a0/ics_query/tests/runs/first recurring-work-events.ics -.run

@@ -0,0 +1,12 @@
+BEGIN:VEVENT
+SUMMARY:Work
+DTSTART;TZID=Europe/Berlin:20240819T090000
+DTEND;TZID=Europe/Berlin:20240819T170000
+DTSTAMP:20240823T082915Z
+UID:6b85b60c-eb1a-4338-9ece-33541b95bf17
+SEQUENCE:1
+CREATED:20240823T082829Z
+LAST-MODIFIED:20240823T082915Z
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+END:VEVENT

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/ics_query/tests/test_parse_date.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from ics_query.parse import InvalidTimeFormat, to_time
+from ics_query.parse import InvalidTimeFormat, to_time, to_time_and_delta
 
 
 @pytest.mark.parametrize(
@@ -43,9 +43,10 @@ from ics_query.parse import InvalidTimeFormat, to_time
         ("20141010183012", (2014, 10, 10, 18, 30, 12)),
     ],
 )
-def test_parse_to_date_argument(string_argument, expected_result):
+@pytest.mark.parametrize("parser", [to_time_and_delta, to_time])
+def test_parse_to_date_argument(string_argument, expected_result, parser):
     """Check that we can properly parse what is accepted."""
-    result = to_time(string_argument)
+    result = parser(string_argument)
     assert result == expected_result
 
 
@@ -53,11 +54,13 @@ def test_parse_to_date_argument(string_argument, expected_result):
     "dt",
     [
         "",
+        "  ",
         "132",
         "12345",
     ],
 )
-def test_invalid_time_format(dt: str):
+@pytest.mark.parametrize("parser", [to_time_and_delta, to_time])
+def test_invalid_time_format(dt: str, parser):
     """Check invalid time formats."""
     with pytest.raises(InvalidTimeFormat):
-        to_time(dt)
+        parser(dt)

ics_query-0.2.0a0/ics_query/tests/test_parse_timedelta.py

@@ -0,0 +1,25 @@
+"""This tests parsing input times and dates."""
+
+from datetime import timedelta
+
+import pytest
+
+from ics_query.parse import to_time_and_delta
+
+
+@pytest.mark.parametrize(
+    ("string_argument", "expected_result"),
+    [
+        ("10d", timedelta(days=10)),
+        ("10d10h", timedelta(days=10, hours=10)),
+        ("1d2h12m33s", timedelta(days=1, hours=2, minutes=12, seconds=33)),
+        ("3600s", timedelta(seconds=3600)),
+        ("10m", timedelta(minutes=10)),
+        ("23h", timedelta(hours=23)),
+    ],
+)
+@pytest.mark.parametrize("plus", ["", "+"])
+def test_parse_to_date_argument(string_argument, expected_result, plus):
+    """Check that we can properly parse what is accepted."""
+    result = to_time_and_delta(plus + string_argument)
+    assert result == expected_result

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/pyproject.toml

@@ -15,7 +15,7 @@ maintainers = [
 ]
 description = "Find out what happens in ICS calendar files - query and filter RFC 5545 compatible .ics files for events, journals, TODOs and more."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 # see https://pypi.python.org/pypi?%3Aaction=list_classifiers
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -31,7 +31,7 @@ classifiers = [
 
 dependencies = [
     "icalendar",
-    "recurring-ical-events",
+    "recurring-ical-events>=3.2.0,<4",
     "click",
     "icalendar",
 ]

{ics_query-0.1.1a0 → ics_query-0.2.0a0}/tox.ini

@@ -4,10 +4,12 @@
 # and then run "tox" from this directory.
 
 [tox]
+skipsdist = True
 envlist = py39, py310, py311, py312, ruff
 
 [testenv]
-deps = pytest
+deps =
+    -e {tox_root}[test]
 setenv = TMPDIR={envtmpdir}
 commands =
     pytest --basetemp="{envtmpdir}" {posargs}