missionpanel 1.1.0__tar.gz → 1.1.3__tar.gz

{missionpanel-1.1.0 → missionpanel-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: missionpanel
-Version: 1.1.0
+Version: 1.1.3
 Summary: A mission panel
 Home-page: https://github.com/yindaheng98/missionpanel
 Author: yindaheng98

{missionpanel-1.1.0 → missionpanel-1.1.3}/missionpanel/example/ttrss.py

@@ -2,7 +2,7 @@ import abc
 import asyncio
 import json
 import logging
-from typing import Any, AsyncGenerator, Dict, List
+from typing import Any, AsyncGenerator, Dict, List, Union
 import httpx
 from xml.etree import ElementTree
 from missionpanel.submitter import AsyncSubmitter
@@ -107,13 +107,19 @@ class TTRSSHubSubmitter(TTRSSSubmitter):
     logger = logging.getLogger("TTRSSHubSubmitter")
 
     @abc.abstractmethod
-    async def parse_xml(self, xml: str) -> AsyncGenerator[Any, None]:
+    async def parse_xml(self, xml: str, feed: dict, content: dict) -> AsyncGenerator[Any, None]:
         pass
 
+    async def preprocess(self, feed: dict, content: dict) -> Union[Dict, None]:
+        return feed
+
     async def parse_content_nocatch(self, feed: dict, content: dict, **httpx_client_options) -> AsyncGenerator[Any, None]:
+        feed = await self.preprocess(feed, content)
+        if feed is None:
+            return
         async with httpx.AsyncClient(**httpx_client_options) as client:
             response = await client.get(feed['feed_url'])
-            async for mission_content in self.parse_xml(response.text):
+            async for mission_content in self.parse_xml(response.text, feed, content):
                 yield mission_content
 
     async def parse_content(self, feed: dict, content: dict, **httpx_client_options) -> AsyncGenerator[Any, None]:
@@ -126,7 +132,7 @@ class TTRSSHubSubmitter(TTRSSSubmitter):
 
 class TTRRSSHubRootSubmitter(TTRSSHubSubmitter):
 
-    async def parse_xml(self, xml: str) -> AsyncGenerator[str, None]:
+    async def parse_xml(self, xml: str, feed: dict, content: dict) -> AsyncGenerator[str, None]:
         root = ElementTree.XML(xml)
         yield {
             'url': root.find('channel/link').text,
@@ -136,7 +142,7 @@ class TTRRSSHubRootSubmitter(TTRSSHubSubmitter):
 
 class TTRRSSHubSubitemSubmitter(TTRSSHubSubmitter):
 
-    async def parse_xml(self, xml: str) -> AsyncGenerator[str, None]:
+    async def parse_xml(self, xml: str, feed: dict, content: dict) -> AsyncGenerator[str, None]:
         root = ElementTree.XML(xml)
         for item in root.find('channel').iter('item'):
             yield {'url': item.find('link').text}

{missionpanel-1.1.0 → missionpanel-1.1.3}/missionpanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: missionpanel
-Version: 1.1.0
+Version: 1.1.3
 Summary: A mission panel
 Home-page: https://github.com/yindaheng98/missionpanel
 Author: yindaheng98

{missionpanel-1.1.0 → missionpanel-1.1.3}/setup.py

@@ -12,7 +12,7 @@ package_dir = {
 
 setup(
     name='missionpanel',
-    version='1.1.0',
+    version='1.1.3',
     author='yindaheng98',
     author_email='yindaheng98@gmail.com',
     url='https://github.com/yindaheng98/missionpanel',