File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change 7
7
import datetime as dt
8
8
import tempfile
9
9
import time
10
- from typing import Any , Dict
10
+ from typing import Any , Dict , List , Tuple
11
11
12
12
import pytz
13
13
import structlog
@@ -59,14 +59,22 @@ def get_image() -> FileResponse:
59
59
days = cfg .NUM_CAL_DAYS_TO_QUERY , seconds = - 1
60
60
)
61
61
62
- events = calModule .get_events (
62
+ events : List [ Tuple [ dt . date , List [ Dict [ str , Any ]]]] = calModule .get_events (
63
63
cfg .ICS_URL ,
64
64
calStartDatetime ,
65
65
calEndDatetime ,
66
66
cfg .DISPLAY_TZ ,
67
67
cfg .NUM_CAL_DAYS_TO_QUERY ,
68
68
)
69
69
70
+ # Remove today's past events
71
+ for idx , (event_date , event_list ) in enumerate (events ):
72
+ if event_date == currTime .date ():
73
+ event_list [:] = [e for e in event_list if e ["endDatetime" ] >= currTime ]
74
+ if not event_list :
75
+ events .pop (idx )
76
+ break
77
+
70
78
end_time = time .time ()
71
79
logger .info (
72
80
f"Completed data retrieval in { round (end_time - start_time , 3 )} seconds."
@@ -85,7 +93,7 @@ def get_image() -> FileResponse:
85
93
current_weather ,
86
94
hourly_forecast ,
87
95
daily_forecast ,
88
- events [: cfg . NUM_CAL_DAYS_TO_QUERY ] ,
96
+ events ,
89
97
tf .name ,
90
98
)
91
99
You can’t perform that action at this time.
0 commit comments