1 files changed, 13 insertions, 5 deletions
diff --git a/app/ConcatPlugin.py b/app/ConcatPlugin.py
index 28e3773..43d7db2 100644
--- a/app/ConcatPlugin.py
+++ b/app/ConcatPlugin.py
@@ -1,17 +1,24 @@
 from typing import Any
+import time
 
 from tinydb import Query
 from app.Item import Item
-from app.PluginInterface import PluginInterface
+from app.PluginInterface import Params, PluginInterface
 from app.DatabaseManager import database_manager
-from app.utils import dict_to_item, item_to_dict
+from app.utils import ItemDict, dict_to_item, item_to_dict
 
 
 class Plugin(PluginInterface):
-    def __init__(self, id: str, params: dict[str, Any]) -> None:
+    def __init__(self, id: str, params: Params) -> None:
         super().__init__(id, params)
         print(f"[ConcatPlugin#{self.id}] initialized")
 
+    def item_sort_key(self, item: Item) -> time.struct_time:
+        if item.pub_date is None:
+            return time.localtime()
+
+        return item.pub_date
+
     def process(self, source_id: str | None, items: list[Item]) -> list[Item]:
         print(f"[ConcatPlugin#{self.id}] process called, n={len(items)}")
         if source_id is None:
@@ -31,12 +38,13 @@ class Plugin(PluginInterface):
             {"plugin_id": self.id, "state": state}, plugin_state_q
         )
 
-        aggregated_item_dicts: list[dict[str, str]] = []
+        aggregated_item_dicts: list[ItemDict] = []
         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))
+        ret_items = list(map(dict_to_item, aggregated_item_dicts))
+        ret = sorted(ret_items, key=self.item_sort_key)
 
         print(f"[ConcatPlugin#{self.id}] process returning items, n={len(ret)}")
         return ret