fixed nested config

publish_meetups/feeds/twitter_feed.py

@@ -52,9 +52,7 @@ class TwitterFeed(Feed):
             )
             logged_in = True
 
-        config.set_field(self.__config_name__, {
+        config.set_field(f"feed.{self.__config_name__}.cookies", dict(self.client.http.client.cookies), update_dict=True)
-            'cookies': dict(self.client.http.client.cookies)
-        }, update_dict=True)
 
     def post(self, message: str):
 

publish_meetups/routines/__init__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 import requests
 from ics import Calendar, Event
 
-from ..utils import config, error, prompt, ICS_FILE
+from ..utils import config, error, prompt, ICS_FILE, date
 from ..feeds import *
 
 
@@ -26,15 +26,13 @@ class Routine:
 
     @staticmethod
     def init_feed(feed: Type[Feed]) -> Feed:
-        feed_config = config.get_field(feed.__config_name__, {})
+        feed_config = config.get_field(f"feed.{feed.__config_name__}", {})
 
         try:
-            feed_instance = feed(**feed_config)
+            return feed(**feed_config)
         except (TypeError, error.InvalidCredential) as e:
-            print(feed_config)
+            config.set_field(f"feed.{feed.__config_name__}", {feed.prompt_auth()}, update_dict=True)
-            raise e
+            feed_config = config.get_field(f"feed.{feed.__config_name__}", {})
-            config.set_field(feed.__name__, feed.prompt_auth(), update_dict=True)
-            feed_config = config.get_field(feed.__config_name__, {})
 
         try:
             return feed(**feed_config)
@@ -69,8 +67,19 @@ class Routine:
 
     @staticmethod
     def get_event_string(event: Event) -> str:
-        return f""
+        event_config = config.get_field("messages", {}).get(event.name, {})
+        if not len(event_config):
+            return ""
+
+        message = event_config.get("message", "")
+
+        data = date.event_formatting_values(event, "de")
+
+        for key, value in data.items():
+            message = message.replace(f"{{{key}}}", value)
         
+        return message.strip()
 
     def run(self):
         pass
+

publish_meetups/routines/development.py

@@ -2,18 +2,15 @@ from . import Routine
 from ..feeds import Feed, TwitterFeed
 from ..utils import date
 
+from datetime import datetime
 from ics import Calendar
 
 
 class Development(Routine):
+    def test_feeds(self):
+        for feed in self.iter_feeds():
+            feed_instance = self.init_feed(feed)
+            feed_instance.post(f"Hello World!!! ({datetime.now()})")
+
     def run(self):
-        calendar = self.get_ics()
+        self.test_feeds()
-
-        for event in calendar.events:
-            print(event.name, date.event_formatting_values(event, "de"))
-            break
-
-            event_description = f"""
-            Wir treffen uns {event.begin.humanize(locale="de")} zum {event.name}."""
-            print(event_description.strip())
-            print()

publish_meetups/utils/config.py

@@ -7,16 +7,26 @@ from . import PROGRAM_DATA_DIR, PROGRAM_NAME
 
 logger = logging.getLogger("config")
 _config: dict = {
+    "ics_url": "",
+
+    "locale": "en",
+    "date_format": "%Y-%m-%d %H:%M:%S",
+    "time_format": "%H:%M",
+    "time_format_full_hour": "%H",
+
+    "weekday_translations": {},
+    "months_translations": {},
+
     "active_feeds": [
         "mastodon",
         "twitter",
     ],
-    "weekday_translations": {},
+
-    "months_translations": {},
+    "feed": {
-    "ics_url": "",
+        "mastodon": {},
-    "mastodon": {},
+        "twitter": {},
-    "twitter": {},
+        "lemmy": {},
-    "lemmy": {},
+    },
 }
 
 
@@ -41,16 +51,33 @@ def write():
 
 def get_field(__name: str, default=None):
     global _config
-    return _config.get(__name, default)
+    
+    _parts = __name.split(".")
+
+    _field_container = _config
+    for _part in _parts[:-1]:
+        _field_container = _field_container.get(_part, {})
+
+    return _field_container.get(_parts[-1], default)
 
 
 def set_field(__name: str, __value, update_dict=False):
     global _config
 
+    _parts = __name.split(".")
+
+    _field_container = _config
+    for _part in _parts[:-1]:
+        if _part not in _field_container:
+            _field_container[_part] = {}
+
+        _field_container = _field_container[_part]
+
+
     if update_dict and isinstance(__value, dict) and isinstance(_config.get(__name), dict):
-        _config[__name].update(__value)
+        _field_container[_parts[-1]].update(__value)
     else:
-        _config[__name] = __value
+        _field_container[_parts[-1]] = __value
 
     write()