Merge pull request #165 from Quan666/v2.3.0

v2.3.0
Quan666 · Aug 2, 2021 · dc4d7aa · dc4d7aa
2 parents 4a272d8 + 9bf0b90
commit dc4d7aa
Show file tree

Hide file tree

Showing 19 changed files with 1,324 additions and 819 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
 ENVIRONMENT=prod
-VERSION='v2.2.9'
+VERSION='v2.3.0'
diff --git a/src/plugins/ELF_RSS2/RSS/qbittorrent_download.py b/src/plugins/ELF_RSS2/RSS/qbittorrent_download.py
@@ -128,7 +128,7 @@ async def get_torrent_info_from_hash(url: str, proxy=None) -> dict:
                 hash_str = get_torrent_b16_hash(res.content)
             except Exception as e:
                 await send_msg(f"下载种子失败,可能需要代理:{e}")
-                return None
+                return {}
 
     while not info:
         for tmp_torrent in qb.torrents():
@@ -146,7 +146,7 @@ async def get_torrent_info_from_hash(url: str, proxy=None) -> dict:
 async def start_down(url: str, group_ids: list, name: str, proxy=None) -> str:
     qb = await get_qb_client()
     if not qb:
-        return
+        return ""
     # 获取种子 hash
     info = await get_torrent_info_from_hash(url=url, proxy=proxy)
     await rss_trigger(