Merge pull request #90 from shinonomeow/shino_aio

fix dmhy rss link download error

Author: shinonomeow

backend/src/module/api/rss.py

@@ -31,9 +31,11 @@ async def get_rss():
 @router.post(
     path="/add", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
+# 此为聚合用
 async def add_rss(rss: RSSItem):
     manager = RSSManager()
     res = await manager.add_rss(rss.url, rss.name, rss.aggregate, rss.parser)
+    await RSSEngine().refresh_rss(rss)
     if res:
         result = ResponseModel(
             status=True,

backend/src/module/downloader/client/qbittorrent/qbittorrent.py

@@ -221,25 +221,23 @@ async def add(self, torrent_url, save_path, category) -> str | None:
         logger.debug(
             f"[QbDownloader] Starting to get torrent content from {torrent_url}"
         )
-        async with RequestContent() as req:
-            logger.debug(f"[QbDownloader] Calling get_content for {torrent_url}")
-            if torrent_file := await req.get_content(torrent_url):
-                logger.debug(
-                    f"[QbDownloader] Got torrent content, getting hash for {torrent_url}"
-                )
-                torrent_hashes = await req.get_torrent_hash(torrent_url)
-                # 优先使用v2 hash，如果没有则使用v1 hash
-                torrent_link = torrent_hashes.get("v2", torrent_hashes.get("v1", ""))
-                logger.debug(f"[QbDownloader] Got torrent hashes: {torrent_hashes}")
-                logger.debug(f"[QbDownloader] Using hash: {torrent_link}")
-                file = {"torrents": torrent_file}
-            else:
-                logger.warning(
-                    f"[QbDownloader] Failed to get torrent content from {torrent_url}"
-                )
-        logger.debug(
-            "[QbDownloader] Finished getting torrent content, proceeding to add torrent"
-        )
+        if not torrent_url.startswith("magnet:"):
+            async with RequestContent() as req:
+                logger.debug(f"[QbDownloader] Calling get_content for {torrent_url}")
+                if torrent_file := await req.get_content(torrent_url):
+                    logger.debug(
+                        f"[QbDownloader] Got torrent content, getting hash for {torrent_url}"
+                    )
+                    torrent_hashes = await req.get_torrent_hash(torrent_url)
+                    # 优先使用v2 hash，如果没有则使用v1 hash
+                    torrent_link = torrent_hashes.get("v2", torrent_hashes.get("v1", ""))
+                    logger.debug(f"[QbDownloader] Got torrent hashes: {torrent_hashes}")
+                    logger.debug(f"[QbDownloader] Using hash: {torrent_link}")
+                    file = {"torrents": torrent_file}
+                else:
+                    logger.warning(
+                        f"[QbDownloader] Failed to get torrent content from {torrent_url}"
+                    )
         try:
             resp = await self._client.post(
                 url=QB_API_URL["add"],

backend/src/module/rss/analyser.py

@@ -122,11 +122,17 @@ async def test():
         end = time.time()
         return res
 
-    test_bangumi = Bangumi(official_title="败犬女主太多了！", season=1)
+    test_bangumi = Bangumi(official_title="败犬女主太多了！", season=1,exclude_filter="720|\d+-\d|BIG5|繁日双语|先行版|繁體|繁体|Bilibili|繁日内嵌|简体内嵌|繁中",)
     test_torrent = Torrent(
-        name="败犬女主太多了！ S01E01",
+        url = "1",
+        name="[BangumiRefresher] Add torrent [MingY] 不良少女 / Bad Girl [01][1080p][简繁日内封]（坏女孩 / 壞女孩）",
         homepage="https://mikanani.me/Home/Episode/33fbab8f53fe4bad12f07afa5abdb7c4afa5956c",
     )
+    print("hello")
     rss_item = RSSItem(url="https://mikanani.me/RSS/Bangumi/100000", parser="mikan")
+    ans = RSSAnalyser().filer_torrent(
+        torrent=test_torrent, bangumi=test_bangumi
+    )  # Should return True
+    print(ans)
 
-    res = asyncio.run(test())
+    # res = asyncio.run(test())