Show event location

Author: stefanthoss

src/ics_cal/ics.py

@@ -46,4 +46,6 @@ def get_events(self, ics_url, calStartDatetime, calEndDatetime, displayTZ, numDa
             else:
                 calDict.setdefault(event["startDatetime"].date(), []).append(event)
 
-        return calDict
+        return sorted(
+            calDict.items(), key=lambda x: x[0]
+        )

src/ics_cal/icshelper.py

@@ -39,8 +39,11 @@ def retrieve_events(self, ics_url, startDatetime, endDatetime, localTZ):
             ) and event.begin < arrow.Arrow.fromdatetime(endDatetime):
                 # extracting and converting events data into a new list
                 new_event = {"summary": event.name}
-                new_event["allday"] = event.all_day
 
+                if event.location:
+                    new_event["location"] = event.location
+
+                new_event["allday"] = event.all_day
                 if new_event["allday"]:
                     # All-day events are always midnight UTC to midnight UTC, therefore timezone needs to be set
                     new_event["startDatetime"] = dt.datetime.fromisoformat(
@@ -61,9 +64,7 @@ def retrieve_events(self, ics_url, startDatetime, endDatetime, localTZ):
                 new_event["isMultiday"] = (
                     new_event["endDatetime"] - new_event["startDatetime"]
                 ) > dt.timedelta(days=1)
+
                 event_list.append(new_event)
 
-        # We need to sort eventList because the event will be sorted in "calendar order" instead of hours order
-        # TODO: improve because of double cycle for now is not much cost
-        event_list = sorted(event_list, key=lambda k: k["startDatetime"])
         return event_list

src/main.py

@@ -66,9 +66,6 @@ def get_image() -> FileResponse:
         cfg.DISPLAY_TZ,
         cfg.NUM_CAL_DAYS_TO_QUERY,
     )
-    events_sorted = sorted(
-        events.items(), key=lambda x: x[0]
-    )  # sort by date so we can later take the first N days
 
     end_time = time.time()
     logger.info(f"Completed data retrieval in {round(end_time - start_time, 3)} seconds.")
@@ -84,7 +81,7 @@ def get_image() -> FileResponse:
             current_weather,
             hourly_forecast,
             daily_forecast,
-            events_sorted[: cfg.NUM_DAYS_IN_TEMPLATE],
+            events[: cfg.NUM_DAYS_IN_TEMPLATE],
             tf.name,
         )
 

src/render/css/styles.css

@@ -21,10 +21,6 @@ h1, h2, h3, p, span {
     text-overflow: ellipsis;
 }
 
-.event-time {
-    color: gray
-}
-
 .big-day {
     font-family: "TiltWarp-Regular", sans-serif;
     font-size: 18rem;
@@ -42,6 +38,10 @@ h1, h2, h3, p, span {
     text-overflow: ellipsis;
 }
 
+.event-time, .event-location {
+    color: gray
+}
+
 .weather-forecast {
     font-family: "Lexend-Regular", sans-serif;
     font-size: 2rem;

src/render/render.py

@@ -107,6 +107,12 @@ def process_inputs(
                         + "</span> "
                         + event["summary"]
                     )
+                    if "location" in event:
+                        cal_events_text += (
+                            '<span class="event-location"> at '
+                            + event["location"]
+                            + "</span>"
+                        )
                 cal_events_text += "</div>\n"
             if d == current_date:
                 cal_events_days.append("Today")