opentechcalendartools 0.1.1__tar.gz → 0.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentechcalendartools
-Version: 0.1.1
+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.1.1 → opentechcalendartools-0.2.0}/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-0.1.1 → opentechcalendartools-0.2.0}/opentechcalendartools/worker.py

@@ -11,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:
@@ -35,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_",
@@ -44,6 +52,20 @@ class Worker:
         os.close(new_filename_dets[0])
         return new_filename_dets[1]
 
+    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:
@@ -84,7 +106,12 @@ class Worker:
                     raise Exception(
                         "End not in the format we expect {}".format(end_datetime)
                     )
-                if end_datetime.timestamp() > datetime.datetime.now().timestamp():
+                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")),

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentechcalendartools
-Version: 0.1.1
+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.1.1 → opentechcalendartools-0.2.0}/opentechcalendartools.egg-info/requires.txt

@@ -1,5 +1,6 @@
 datatig
 requests
+requests-cache
 icalendar
 pyyaml
 

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

@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
     name="opentechcalendartools",
-    version="0.1.1",
+    version="0.2.0",
     description="",
     url="https://github.com/TeacakeTech/opentechcalendar-tools",
     project_urls={
@@ -16,6 +16,7 @@ setuptools.setup(
     install_requires=[
         "datatig",
         "requests",
+        "requests-cache",
         "icalendar",
         "pyyaml",
     ],