opentechcalendartools 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

opentechcalendartools/cli.py

@@ -1,6 +1,8 @@
 import argparse
 import os
 
+import requests_cache
+
 from .worker import Worker
 
 
@@ -28,13 +30,20 @@ def main():
 
     args = parser.parse_args()
 
+    requests_session = None
+    requests_cache_directory = os.getenv(
+        "OPEN_TECH_CALENDAR_TOOLS_REQUEST_CACHE_DIRECTORY",
+    )
+    if requests_cache_directory:
+        requests_session = requests_cache.install_cache(requests_cache_directory)
+
+    worker = Worker(sqlite_database_filename, requests_session=requests_session)
+
     if args.subparser_name == "listgroupstoimport":
         # List groups to import
-        worker = Worker(sqlite_database_filename)
         for group_id in worker.get_group_ids_to_import():
             print(group_id)
 
     elif args.subparser_name == "importgroup":
         # Import Group
-        worker = Worker(sqlite_database_filename)
         worker.import_group(args.group_id)

opentechcalendartools/worker.py

@@ -2,6 +2,7 @@ import datetime
 import os
 import sqlite3
 import tempfile
+import zoneinfo
 
 import icalendar
 import requests
@@ -10,9 +11,14 @@ import yaml
 
 class Worker:
 
-    def __init__(self, sqlite_database_filename):
+    WORKER_USER_AGENT = (
+        "Open Tech Calendar Tools https://opentechcalendar.co.uk/contact"
+    )
+
+    def __init__(self, sqlite_database_filename, requests_session=None):
         self._sqlite_database_filename = sqlite_database_filename
         self._data_dir = os.getcwd()
+        self._requests_session = requests_session or requests.Session()
 
     def get_group_ids_to_import(self) -> list:
         with sqlite3.connect(self._sqlite_database_filename) as connection:
@@ -34,7 +40,10 @@ class Worker:
                 )
 
     def _download_file_to_temp(self, url) -> str:
-        r = requests.get(url)
+        r = self._requests_session.get(
+            url,
+            headers={"User-Agent": Worker.WORKER_USER_AGENT},
+        )
         r.raise_for_status()
         new_filename_dets = tempfile.mkstemp(
             suffix="opentechcalendartools_",
@@ -43,31 +52,82 @@ 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 _should_import_event(
+        self, group: dict, title: str, description: str, end: datetime.datetime
+    ) -> bool:
+        if end.timestamp() < datetime.datetime.now().timestamp():
+            return False
+
+        if group["field_import_exclude"] and (
+            group["field_import_exclude"] in title
+            or group["field_import_exclude"] in description
+        ):
+            return False
+
+        return True
+
+    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 self._should_import_event(
+                    group,
+                    str(event.get("SUMMARY")),
+                    str(event.get("DESCRIPTION")),
+                    end_datetime,
+                ):
                     # 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.dist-info → opentechcalendartools-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentechcalendartools
-Version: 0.1.0
+Version: 0.2.0
 Home-page: https://github.com/TeacakeTech/opentechcalendar-tools
 Author: Teacake Tech
 Author-email: hello@teacaketech.scot
@@ -11,6 +11,7 @@ Requires-Python: >=3.12
 License-File: LICENSE
 Requires-Dist: datatig
 Requires-Dist: requests
+Requires-Dist: requests-cache
 Requires-Dist: icalendar
 Requires-Dist: pyyaml
 Provides-Extra: dev

opentechcalendartools-0.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+opentechcalendartools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+opentechcalendartools/__main__.py,sha256=k62u01s2PYzYpErY7unEc49JsxnOohcSOG_Gu9pFuYA,98
+opentechcalendartools/cli.py,sha256=s35zGpAwqOVOsIAplNuGIGjXmc0GtBPJUbmhkuwHfz0,1458
+opentechcalendartools/worker.py,sha256=Y8Pey6wvT1GGsBXT2uUOdlwz1HszTQ6AJsKOGfoXDLs,8358
+opentechcalendartools-0.2.0.dist-info/licenses/LICENSE,sha256=t3-svmFJHEV_slEWg4lRY-LK523IOA56WXz62uOzGFI,1499
+opentechcalendartools-0.2.0.dist-info/METADATA,sha256=S4URJ-wicKwsuh7oABCm7Ysi1VTzG0X5C5RCdGZUhQE,911
+opentechcalendartools-0.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+opentechcalendartools-0.2.0.dist-info/top_level.txt,sha256=cXAUphHY7mCrtEnq3V6i_QyeWcbBEM75SJYjrUtDZ8E,22
+opentechcalendartools-0.2.0.dist-info/RECORD,,

{opentechcalendartools-0.1.0.dist-info → opentechcalendartools-0.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

opentechcalendartools-0.1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-opentechcalendartools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opentechcalendartools/__main__.py,sha256=k62u01s2PYzYpErY7unEc49JsxnOohcSOG_Gu9pFuYA,98
-opentechcalendartools/cli.py,sha256=fR5XhuniYb15hOGzYmCHc2ORRxbhiB9KOEUZNtkiIx8,1201
-opentechcalendartools/worker.py,sha256=hxn_gYiswPE9jwj0WEfE2wKuIeHdpr_bbB-KA9wQ5JM,6019
-opentechcalendartools-0.1.0.dist-info/licenses/LICENSE,sha256=t3-svmFJHEV_slEWg4lRY-LK523IOA56WXz62uOzGFI,1499
-opentechcalendartools-0.1.0.dist-info/METADATA,sha256=cXQwxc4QiEuS3Wq68jeUBpDT6pjFBasVuEHgh6QCcC4,881
-opentechcalendartools-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opentechcalendartools-0.1.0.dist-info/top_level.txt,sha256=cXAUphHY7mCrtEnq3V6i_QyeWcbBEM75SJYjrUtDZ8E,22
-opentechcalendartools-0.1.0.dist-info/RECORD,,