iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup + fixed typo

Browse Source
This commit is contained in:
Ace 2019-12-16 02:51:35 +01:00 committed by GitHub
parent 3cdd0bda62
commit 6f0bbceb62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/inkycal_calendar.py
View File

@ -121,15 +121,15 @@ def main():
"""Create some reference points for the current month""" """Create some reference points for the current month"""
days_current_month = calendar.monthrange(now.year, now.month)[1] days_current_month = calendar.monthrange(now.year, now.month)[1]
month_start = now.replace(days =-now.day+1) month_start = now.floor('month')
month_end = now.replace(days=+(days_current_month-now.day)) month_end = now.ceil('month')
if show_events == True: if show_events == True:
"""Filter events which begin before the end of this month""" """Filter events which begin before the end of this month"""
upcoming_events = fetch_events() upcoming_events = fetch_events()
calendar_events = [events for events in upcoming_events if calendar_events = [events for events in upcoming_events if
events.begin < month_end and events.begin.month == now.month] month_start <= events.end <= month_end ]
"""Find days with events in the current month""" """Find days with events in the current month"""
days_with_events = [] days_with_events = []
@ -164,11 +164,10 @@ def main():
'hh:mm'), event.name) for event in calendar_events if event.begin.day 'hh:mm'), event.name) for event in calendar_events if event.begin.day
== now.day and now < event.end] == now.day and now < event.end]
event_list += ['{0} {1} {2} : {3}'.format(tomorrow_in_your_language, event_list += ['{0} {1} {2} : {3}'.format(tomorrow_in_your_language,
at_in_your_language, event.begin.format('HH:mm' if hours == 24 else at_in_your_language, event.begin.format('HH:mm' if hours == 24 else
'hh:mm'), event.name) for event in calendar_events if event.begin.day 'hh:mm'), event.name) for event in calendar_events if event.begin.day
== now.replace(day=1).day] == now.replace(days=1).day]
after_two_days = now.replace(days=2).floor('day') after_two_days = now.replace(days=2).floor('day')
@ -186,7 +185,7 @@ def main():
fill_height = 0.7) fill_height = 0.7)
else: else:
write_text(main_area_width, int(events_height/max_event_lines), write_text(main_area_width, int(events_height/max_event_lines),
'No upcoming events', event_lines[0], alignment='left', 'No upcoming events.', event_lines[0], alignment='left',
fill_height = 0.7) fill_height = 0.7)
"""Set print_events_to True to print all events in this month""" """Set print_events_to True to print all events in this month"""