By default, past calendar events will disappear from the list.

Added option to show all past events from today, `CALENDAR_INCLUDE_PAST_EVENTS_FOR_TODAY=1`

Issue #31

Author: mendhak

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2022-04-21
+* By default, past calendar events will disappear from the list. 
+* Added option to show all past events from today, `CALENDAR_INCLUDE_PAST_EVENTS_FOR_TODAY=1`
+
 ## 2022-04-13
 * Add new layouts for the user to choose from. Set the value `export SCREEN_LAYOUT=1` to 2, 3, 4...
 * Layouts contributed by @feh123 and @jmason 

env.sh.sample

@@ -53,4 +53,7 @@ export CALENDAR_TTL=3600
 
 
 # Which layout to use. 1, 2, 3...
-export SCREEN_LAYOUT=1
+export SCREEN_LAYOUT=1
+
+# Include all calendar events from today, even if they are past.  
+# CALENDAR_INCLUDE_PAST_EVENTS_FOR_TODAY=1

screen-calendar-get.py

@@ -27,13 +27,15 @@ def get_outlook_events(max_event_results):
 
     if is_stale(os.getcwd() + "/" + outlook_calendar_pickle, ttl):
         logging.debug("Pickle is stale, calling the Outlook Calendar API")
-        today_midnight = datetime.datetime.combine(datetime.datetime.utcnow(), datetime.datetime.min.time()).isoformat()
+        today_start_time = datetime.datetime.utcnow().isoformat()
+        if os.getenv("CALENDAR_INCLUDE_PAST_EVENTS_FOR_TODAY", "0") == "1":
+            today_start_time = datetime.datetime.combine(datetime.datetime.utcnow(), datetime.datetime.min.time()).isoformat()
         oneyearlater_iso = (datetime.datetime.now().astimezone()
                             + datetime.timedelta(days=365)).astimezone().isoformat()
         access_token = outlook_util.get_access_token()
         events_data = outlook_util.get_outlook_calendar_events(
                                                                 outlook_calendar_id,
-                                                                today_midnight,
+                                                                today_start_time,
                                                                 oneyearlater_iso,
                                                                 access_token)
         logging.debug(events_data)
@@ -103,11 +105,13 @@ def get_google_events(max_event_results):
     if is_stale(os.getcwd() + "/" + google_calendar_pickle, ttl):
         logging.debug("Pickle is stale, calling the Calendar API")
 
-        today_midnight = datetime.datetime.combine(datetime.datetime.utcnow(), datetime.datetime.min.time())
+        today_start_time = datetime.datetime.utcnow()
+        if os.getenv("CALENDAR_INCLUDE_PAST_EVENTS_FOR_TODAY", "0") == "1":
+            today_start_time = datetime.datetime.combine(datetime.datetime.utcnow(), datetime.datetime.min.time())
         # Call the Calendar API
         events_result = service.events().list(
             calendarId=google_calendar_id,
-            timeMin=today_midnight.isoformat() + 'Z',
+            timeMin=today_start_time.isoformat() + 'Z',
             maxResults=max_event_results,
             singleEvents=True,
             orderBy='startTime').execute()