edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: edward:04d81d5fc02c98b54418d610d7c6be6ba72d919d
Branches Tags
edward:main
edward:launch-page
edward:navbar
..
compare: edward:12092ccb07f191f6af7017e02694e4d0c8266589
Branches Tags
edward:main
edward:launch-page
edward:navbar

2 commits
04d81d5fc0 ... 12092ccb07

Author SHA1 Message Date
Edward Betts 12092ccb07 Merge branch 'main' of git.4angle.com:edward/agenda 2023-12-26 19:29:19 +00:00
Edward Betts b599d10eb6 Fix for wrong event times during DST 
Closes: #87
 2023-12-26 19:29:07 +00:00
2 changed files with 9 additions and 9 deletions
Show stats Expand all files Collapse all files

5
agenda/__init__.py
View file

@ -10,8 +10,3 @@ uk_tz = pytz.timezone("Europe/London")
def uk_time(d: date, t: time) -> datetime: def uk_time(d: date, t: time) -> datetime:
"""Combine time and date for UK timezone.""" """Combine time and date for UK timezone."""
return uk_tz.localize(datetime.combine(d, t)) return uk_tz.localize(datetime.combine(d, t))
def uk_midnight(d: date) -> datetime:
"""Midnight UK time."""
return uk_time(d, datetime.min.time())

13
agenda/data.py
View file

@ -32,7 +32,7 @@ from . import (
thespacedevs, thespacedevs,
travel, travel,
uk_holiday, uk_holiday,
uk_midnight, uk_tz,
waste_schedule, waste_schedule,
) )
from .types import Event, Holiday from .types import Event, Holiday
@ -125,6 +125,11 @@ def get_holidays(country: str, start_date: date, end_date: date) -> list[Holiday
return found return found
def midnight(d: date) -> datetime:
"""Convert from date to midnight on that day."""
return datetime.combine(d, datetime.min.time())
def dates_from_rrule( def dates_from_rrule(
rrule: str, start: date, end: date rrule: str, start: date, end: date
) -> typing.Sequence[datetime | date]: ) -> typing.Sequence[datetime | date]:
@ -132,9 +137,9 @@ def dates_from_rrule(
all_day = not any(param in rrule for param in ["BYHOUR", "BYMINUTE", "BYSECOND"]) all_day = not any(param in rrule for param in ["BYHOUR", "BYMINUTE", "BYSECOND"])
return [ return [
i.date() if all_day else i i.date() if all_day else uk_tz.localize(i)
for i in dateutil.rrule.rrulestr(rrule, dtstart=uk_midnight(start)).between( for i in dateutil.rrule.rrulestr(rrule, dtstart=midnight(start)).between(
uk_midnight(start), uk_midnight(end) midnight(start), midnight(end)
) )
] ]