missionpanel 1.1.7__tar.gz → 1.2.1__tar.gz

{missionpanel-1.1.7 → missionpanel-1.2.1}/PKG-INFO

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

{missionpanel-1.1.7 → missionpanel-1.2.1}/missionpanel/example/ttrss.py

@@ -80,27 +80,39 @@ 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:
-                content = await client.api({
-                    "op": "getHeadlines",
-                    "feed_id": feed['id'],
-                    "limit": 1,
-                    "view_mode": "all_articles",
-                    "order_by": "feed_dates"
-                })
-                async for mission_content in self.parse_content(feed, content, **httpx_client_options):
+
+            mission_content_queue = asyncio.Queue(len(feeds))
+
+            async def feed_task(feed):
+                async with semaphore:
+                    content = await client.api({
+                        "op": "getHeadlines",
+                        "feed_id": feed['id'],
+                        "limit": 1,
+                        "view_mode": "all_articles",
+                        "order_by": "feed_dates"
+                    })
+                    async for mission_content in self.parse_content(feed, content, **httpx_client_options):
+                        await mission_content_queue.put(mission_content)
+
+            async def mission_task():
+                for _ in range(len(feeds)):
+                    mission_content = await mission_content_queue.get()
                     matchers = await self.derive_matcher(mission_content)
                     await self.create_mission(mission_content, matchers)
                     tags = await self.derive_tags(mission_content)
                     if len(tags) > 0:
                         await self.add_tags(matchers, tags)
+                    mission_content_queue.task_done()
+
+            await asyncio.gather(mission_task(), *[feed_task(feed) for feed in feeds])
 
 
 class TTRSSHubSubmitter(TTRSSSubmitter):

{missionpanel-1.1.7 → missionpanel-1.2.1}/missionpanel.egg-info/PKG-INFO

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

{missionpanel-1.1.7 → missionpanel-1.2.1}/setup.py

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