added import safeguard to refresh_events; heeded a deprecation warning

publishconf.py

@@ -27,4 +27,5 @@ DELETE_OUTPUT_DIRECTORY = True
 
 # get event list from calendar(s)
 sys.path.append(os.curdir + "/utils")
-import refresh_events
+from refresh_events import refresh_events as r_events
+r_events()

utils/refresh_events.py

@@ -153,27 +153,29 @@ def handleAttachments(events: list) -> list:
 #    print(event) #DEBUG
   return events
 
-# create vobject calendar
-vcal = vobject.newFromBehavior("vcalendar")
 
-# establish connection to caldav server 
+def refresh_events():
-with caldav.DAVClient(url=server_url, username=cal_user, password=cal_pass) as dav_client:
+  # create vobject calendar
+  vcal = vobject.newFromBehavior("vcalendar")
+
+  # establish connection to caldav server 
+  with caldav.DAVClient(url=server_url, username=cal_user, password=cal_pass) as dav_client:
     # establish connection to calendar
     dav_cal = dav_client.calendar(url=cal_url)
 
     # put all events from caldav calendar into vobject calendar
     for e in dav_cal.events():
-    for ev in e.instance.contents["vevent"]:
+      for ev in e.vobject_instance.contents["vevent"]:
         vcal.add(ev)
     
-# we only want events belonging to a specific category 
+  # we only want events belonging to a specific category 
-events = [e for e in vcal.getChildren() if "categories" in e.contents.keys() and cal_category in map(lambda x: x.value[0], e.contents["categories"])]
+  events = [e for e in vcal.getChildren() if "categories" in e.contents.keys() and cal_category in map(lambda x: x.value[0], e.contents["categories"])]
 
-# extract event data 
+  # extract event data 
-events = extractEventData(events)
+  events = extractEventData(events)
 
-# fix dates and datetimes
+  # fix dates and datetimes
-for e in events:
+  for e in events:
     for k in e.keys():
       if k in cal_prop_datetimes:
         # fix a CalDAV/vobject/icalendar (?) bug where a dtend value which is a date only (no time) automatically moves one day into the future 
@@ -182,17 +184,17 @@ for e in events:
         # fix all datetimes so they can be compared and sorted 
         e[k] = fixDatetime(e[k])
 
-# keep only future events  
+  # keep only future events  
-events = [e for e in events if e["dtstart"] >= now]
+  events = [e for e in events if e["dtstart"] >= now]
 
-# sort attached links into page links and image links
+  # sort attached links into page links and image links
-events = handleAttachments(events)
+  events = handleAttachments(events)
 
-# sort by start date
+  # sort by start date
-events.sort(key=lambda e: e["dtstart"])
+  events.sort(key=lambda e: e["dtstart"])
 
-# add start date to metadata, also start time and/or end date
+  # add start date to metadata, also start time and/or end date
-for e in events:
+  for e in events:
     # start date
     e["startdate"] = e["dtstart"].astimezone()
     # start time (if not the default time)
@@ -202,14 +204,14 @@ for e in events:
     if e["dtstart"].date() < e["dtend"].date():
       e["enddate"] = e["dtend"].astimezone()
 
-# read default metadata if present
+  # read default metadata if present
-default_metadata = None
+  default_metadata = None
-if os.path.isfile(result_file + ".metadata"):
+  if os.path.isfile(result_file + ".metadata"):
     with open(result_file + ".metadata", "r") as f:
       default_metadata = yaml.safe_load(f)
 
-# write data as YAML
+  # write data as YAML
-with open(result_file, 'w') as f:
+  with open(result_file, 'w') as f:
     f.write("---\n")
     if default_metadata:
       yaml.dump(default_metadata, f)
@@ -217,3 +219,6 @@ with open(result_file, 'w') as f:
     # write current datetime to file
     yaml.dump({"written_at": now}, f)
     f.write("---\n")
+
+if __name__ == "__main__":
+  refresh_events()