m.giller/E-Paper-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

Fixed timezone bug

Browse source
This commit is contained in:
Maximilian Giller 2019-04-02 10:48:15 +02:00
parent 45dd474bf3
commit a65bfddeeb
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Calendar/CalendarInterface.py
View file

@ -20,20 +20,22 @@ class CalendarInterface (DataSourceInterface):
def get_upcoming_events (self, timespan = None):
if timespan is None:
timespan = timedelta(31)
return self.__get_events_in_range__(datetime.now(), timespan)
return self.__get_events_in_range__(datetime.now(timezone.utc), timespan)
def get_today_events (self):
return self.get_day_events(datetime.now())
return self.get_day_events(datetime.today())
def get_day_events (self, date):
day_start = datetime(date.year, date.month, date.day)
if type(date) is not type(date):
raise TypeError("get_day_events only takes date-objects as parameters, not \"%s\"" % str(type(date)))
day_start = datetime(date.year, date.month, date.day, 0, 0, 0, 0, timezone.utc)
return self.__get_events_in_range__(day_start, timedelta(1))
def get_month_events (self, month = -1):
if month < 0:
month = datetime.now().month
month_start = datetime(datetime.now().year, month, 1)
month_start = datetime(datetime.now().year, month, 1, 0, 0, 0, 0, timezone.utc)
month_days = calendar.monthrange(month_start.year, month_start.month)[1]
return self.__get_events_in_range__(month_start, timedelta(month_days))
@ -54,7 +56,7 @@ class CalendarInterface (DataSourceInterface):
return []
if start.tzinfo is None:
start = start.replace(tzinfo=timezone.utc)
raise TypeError("start datetime needs to be timezone-aware")
events_in_range = []
for event in self.events:

6
Calendar/IcalEvents.py
View file

@ -43,9 +43,9 @@ class IcalEvents(CalendarInterface):
for event in ical.events:
cal_event = CalendarEvent()
cal_event.fetch_datetime = datetime.now()
cal_event.begin_datetime = event.begin.datetime.astimezone(None)
cal_event.end_datetime = event.end.datetime.astimezone(None)
cal_event.fetch_datetime = datetime.now(timezone.utc)
cal_event.begin_datetime = event.begin.datetime
cal_event.end_datetime = event.end.datetime
cal_event.duration = event.duration
cal_event.title = event.name
cal_event.description = event.description