opentechcalendartools 0.1.0__tar.gz → 0.1.1__tar.gz

{opentechcalendartools-0.1.0 → opentechcalendartools-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentechcalendartools
-Version: 0.1.0
+Version: 0.1.1
 Home-page: https://github.com/TeacakeTech/opentechcalendar-tools
 Author: Teacake Tech
 Author-email: hello@teacaketech.scot

{opentechcalendartools-0.1.0 → opentechcalendartools-0.1.1}/opentechcalendartools/worker.py

@@ -2,6 +2,7 @@ import datetime
 import os
 import sqlite3
 import tempfile
+import zoneinfo
 
 import icalendar
 import requests
@@ -43,31 +44,63 @@ class Worker:
         os.close(new_filename_dets[0])
         return new_filename_dets[1]
 
-    def _import_group_type_ical(
-        self, group, ical_filename, group_country=None, group_place=None
-    ):
+    def _import_group_type_ical(self, group, ical_filename):
         os.makedirs(os.path.join(self._data_dir, "event", group["id"]), exist_ok=True)
         with open(ical_filename) as fp:
             calendar = icalendar.Calendar.from_ical(fp.read())
             for event in calendar.events:
-                start = event.get("DTSTART")
-                end = event.get("DTEND")
-                if end.dt.timestamp() > datetime.datetime.now().timestamp():
+                timezone_name = group["field_timezone"] or "UTC"
+                start_datetime = event.get("DTSTART").dt
+                end_datetime = event.get("DTEND").dt
+                if isinstance(start_datetime, datetime.datetime):
+                    pass
+                elif isinstance(start_datetime, datetime.date):
+                    start_datetime = datetime.datetime(
+                        start_datetime.year,
+                        start_datetime.month,
+                        start_datetime.day,
+                        0,
+                        0,
+                        0,
+                        tzinfo=zoneinfo.ZoneInfo(timezone_name),
+                    )
+                else:
+                    raise Exception(
+                        "Start not in the format we expect {}".format(start_datetime)
+                    )
+                if isinstance(end_datetime, datetime.datetime):
+                    pass
+                elif isinstance(end_datetime, datetime.date):
+                    end_datetime = datetime.datetime(
+                        end_datetime.year,
+                        end_datetime.month,
+                        end_datetime.day,
+                        23,
+                        59,
+                        59,
+                        tzinfo=zoneinfo.ZoneInfo(timezone_name),
+                    )
+                else:
+                    raise Exception(
+                        "End not in the format we expect {}".format(end_datetime)
+                    )
+                if end_datetime.timestamp() > datetime.datetime.now().timestamp():
                     # Create event data with various fields
                     event_data = {
                         "title": str(event.get("SUMMARY")),
                         "group": group["id"],
-                        "timezone": group["field_timezone"] or "UTC",
-                        "start_at": str(start.dt),
-                        "end_at": str(end.dt),
+                        "timezone": timezone_name,
+                        "start_at": str(start_datetime),
+                        "end_at": str(end_datetime),
                         "url": str(event.get("URL")),
                         "cancelled": (event.get("STATUS") == "CANCELLED"),
                         "imported": True,
                         "community_participation": {
-                            "at_event": None,
-                            "at_event_audience_text": None,
-                            "at_event_audience_audio": None,
+                            "at_event": "unknown",
+                            "at_event_audience_text": "unknown",
+                            "at_event_audience_audio": "unknown",
                         },
+                        "in_person": "unknown",
                     }
                     if group["field_country"]:
                         event_data["country"] = group["field_country"]

{opentechcalendartools-0.1.0 → opentechcalendartools-0.1.1}/opentechcalendartools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentechcalendartools
-Version: 0.1.0
+Version: 0.1.1
 Home-page: https://github.com/TeacakeTech/opentechcalendar-tools
 Author: Teacake Tech
 Author-email: hello@teacaketech.scot

{opentechcalendartools-0.1.0 → opentechcalendartools-0.1.1}/setup.py

@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
     name="opentechcalendartools",
-    version="0.1.0",
+    version="0.1.1",
     description="",
     url="https://github.com/TeacakeTech/opentechcalendar-tools",
     project_urls={