diff --git a/.gitignore b/.gitignore index ba0ad62..e608d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ wheels/ # Credentials file credentials.json +token.json diff --git a/caltui.py b/caltui.py index e833272..6d84d4c 100644 --- a/caltui.py +++ b/caltui.py @@ -17,9 +17,11 @@ class Catlendar(App): """Create child widgets for the app.""" next_ten = get_next_ten() yield Header() - yield ListView( - *[ListItem(Label(x)) for x in next_ten] - ) + for key, item in next_ten.items(): + yield Label(key) + yield ListView( + *[ListItem(Label(x)) for x in item] + ) yield Footer() def action_toggle_dark(self) -> None: diff --git a/main.py b/main.py index abd234d..870279f 100644 --- a/main.py +++ b/main.py @@ -58,20 +58,24 @@ def get_next_ten(): return # Prints the start and name of the next 10 eventsa - next_ten = [] + next_ten = {} for event in events: is_datetime = event["start"].get("dateTime") is not None if is_datetime: event_start = datetime.datetime.fromisoformat(event["start"].get("dateTime", event["start"].get("date"))) event_end = datetime.datetime.fromisoformat(event["end"].get("dateTime", event["end"].get("date"))) + event_date = event_start.strftime("%Y-%m-%d") formatted_start_time = event_start.strftime("%Y-%m-%d %H:%M") formatted_end_time = event_end.strftime("%H:%M") formatted_event_time = f"{formatted_start_time} to {formatted_end_time}" else: formatted_event_time = event["start"].get("date") - next_ten.append(f"{formatted_event_time}: {event['summary']}") - print(formatted_event_time, event["summary"]) + event_date = f"{formatted_event_time}" + if event_date not in next_ten: + next_ten[event_date] = [] + next_ten[event_date].append(f"{formatted_event_time}: {event['summary']}") + print(next_ten) return next_ten except HttpError as error: