missionpanel 1.1.6__tar.gz → 1.2.0__tar.gz

{missionpanel-1.1.6 → missionpanel-1.2.0}/PKG-INFO

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

{missionpanel-1.1.6 → missionpanel-1.2.0}/missionpanel/example/__init__.py

@@ -1,2 +1,2 @@
 from .rsshub import RSSHubSubmitter, RSSHubRootSubmitter, RSSHubSubitemSubmitter
-from .ttrss import TTRSSClient, TTRSSSubmitter, TTRSSHubSubmitter, TTRRSSHubRootSubmitter, TTRRSSHubSubitemSubmitter
+from .ttrss import TTRSSClient, TTRSSSubmitter, TTRSSHubSubmitter, TTRSSHubRootSubmitter, TTRSSHubSubitemSubmitter

{missionpanel-1.1.6 → missionpanel-1.2.0}/missionpanel/example/ttrss.py

@@ -80,14 +80,15 @@ class TTRSSSubmitter(AsyncSubmitter, metaclass=abc.ABCMeta):
     async def derive_matcher(self, mission_content) -> List[str]:
         return [mission_content['url']]
 
-    async def create_missions(self, url: str, username: str, password: str, cat_id: int, **httpx_client_options):
+    async def create_missions(self, url: str, username: str, password: str, cat_id: int, semaphore=asyncio.Semaphore(3), **httpx_client_options):
         async with TTRSSClient(url, username, password, **httpx_client_options) as client:
             feeds = await client.api({
                 "op": "getFeeds",
                 "cat_id": cat_id,
                 "limit": None
             })
-            for feed in feeds:
+
+            async def feed_task(feed):
                 content = await client.api({
                     "op": "getHeadlines",
                     "feed_id": feed['id'],
@@ -102,6 +103,12 @@ class TTRSSSubmitter(AsyncSubmitter, metaclass=abc.ABCMeta):
                     if len(tags) > 0:
                         await self.add_tags(matchers, tags)
 
+            async def semaphore_task(feed):
+                async with semaphore:
+                    await feed_task(feed)
+
+            await asyncio.gather(*[semaphore_task(feed) for feed in feeds])
+
 
 class TTRSSHubSubmitter(TTRSSSubmitter):
     logger = logging.getLogger("TTRSSHubSubmitter")
@@ -130,7 +137,7 @@ class TTRSSHubSubmitter(TTRSSSubmitter):
             self.logger.warning(f'parse content failed, error: {e}')
 
 
-class TTRRSSHubRootSubmitter(TTRSSHubSubmitter):
+class TTRSSHubRootSubmitter(TTRSSHubSubmitter):
 
     async def parse_xml(self, xml: str, feed: dict, content: dict) -> AsyncGenerator[dict, Any]:
         root = ElementTree.XML(xml)
@@ -141,7 +148,7 @@ class TTRRSSHubRootSubmitter(TTRSSHubSubmitter):
         }
 
 
-class TTRRSSHubSubitemSubmitter(TTRSSHubSubmitter):
+class TTRSSHubSubitemSubmitter(TTRSSHubSubmitter):
 
     async def parse_xml(self, xml: str, feed: dict, content: dict) -> AsyncGenerator[dict, Any]:
         root = ElementTree.XML(xml)

{missionpanel-1.1.6 → missionpanel-1.2.0}/missionpanel.egg-info/PKG-INFO

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

{missionpanel-1.1.6 → missionpanel-1.2.0}/setup.py

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