diff options
| -rw-r--r-- | Aggrofile | 8 | ||||
| -rw-r--r-- | app/ConcatPlugin.py | 28 | ||||
| -rw-r--r-- | app/utils.py | 5 |
3 files changed, 23 insertions, 18 deletions
@@ -11,6 +11,9 @@ "schedule_expr": "schedule.every(10).seconds", "feed_url": "https://feeds.feedburner.com/mariusschulz" }, + "concat": { + "plugin": "ConcatPlugin" + }, "title_filter": { "plugin": "FilterPlugin", "filter_expr": "'TypeScript' in item.title" @@ -24,9 +27,12 @@ }, "graph": { "juusomikkonen_blog_rss": [ - "title_filter" + "concat" ], "mariusschulz_blog_atom": [ + "concat" + ], + "concat": [ "title_filter" ], "title_filter": [ diff --git a/app/ConcatPlugin.py b/app/ConcatPlugin.py index 14307ac..28e3773 100644 --- a/app/ConcatPlugin.py +++ b/app/ConcatPlugin.py @@ -6,8 +6,6 @@ from app.PluginInterface import PluginInterface from app.DatabaseManager import database_manager from app.utils import dict_to_item, item_to_dict -# TODO - class Plugin(PluginInterface): def __init__(self, id: str, params: dict[str, Any]) -> None: @@ -19,23 +17,23 @@ class Plugin(PluginInterface): if source_id is None: raise Exception(f"[ConcatPlugin#{self.id}] can not be scheduled") - Q = Query() - q_result = database_manager.plugin_states.search(Q.plugin_id == self.id) - if len(q_result) > 1: - raise Exception( - f"[ConcatPlugin#{self.id}] invalid database state, found more than 1 plugin state: {len(q_result)}" - ) + plugin_state_q = Query().plugin_id == self.id + _d: Any = database_manager.plugin_states.get(plugin_state_q) # type: ignore + data: dict[str, Any] = ( + _d if _d is not None else {"plugin_id": self.id, "state": {}} + ) + state = data["state"] - d: Any = q_result[0] if len(q_result) == 1 else {} - data: dict[str, list[dict[str, str]]] = d + items_as_dicts = list(map(item_to_dict, items)) + state[source_id] = items_as_dicts - if source_id in data: - items_as_dicts = list(map(item_to_dict, items)) - d[source_id] = items_as_dicts + database_manager.plugin_states.upsert( # type: ignore + {"plugin_id": self.id, "state": state}, plugin_state_q + ) aggregated_item_dicts: list[dict[str, str]] = [] - for data_source_id in data: - item_dicts = data[data_source_id] + for data_source_id in state: + item_dicts = state[data_source_id] aggregated_item_dicts += item_dicts ret = list(map(dict_to_item, aggregated_item_dicts)) diff --git a/app/utils.py b/app/utils.py index d513ae9..824d370 100644 --- a/app/utils.py +++ b/app/utils.py @@ -1,4 +1,5 @@ from app.Item import Item +from dataclasses import asdict def get_param(key: str, params: dict[str, str]) -> str: @@ -9,8 +10,8 @@ def get_param(key: str, params: dict[str, str]) -> str: def item_to_dict(item: Item) -> dict[str, str]: - raise NotImplemented() + return asdict(item) def dict_to_item(d: dict[str, str]) -> Item: - raise NotImplemented() + return Item(**d) |