fix indexer async

app/modules/indexer/spider/torrentleech.py

@@ -3,7 +3,7 @@ from urllib.parse import quote
 
 from app.core.config import settings
 from app.log import logger
-from app.utils.http import RequestUtils
+from app.utils.http import RequestUtils, AsyncRequestUtils
 from app.utils.string import StringUtils
 
 
@@ -23,8 +23,37 @@ class TorrentLeech:
             self._proxy = settings.PROXY
             self._timeout = indexer.get('timeout') or 15
 
-    def search(self, keyword: str, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
+    def __parse_result(self, results: List[dict]) -> List[dict]:
+        """
+        解析搜索结果
+        """
+        torrents = []
+        if not results:
+            return torrents
 
+        for result in results:
+            torrent = {
+                'title': result.get('name'),
+                'enclosure': self._downloadurl % (self._indexer.get('domain'),
+                                                  result.get('fid'),
+                                                  result.get('filename')),
+                'pubdate': StringUtils.format_timestamp(result.get('addedTimestamp')),
+                'size': result.get('size'),
+                'seeders': result.get('seeders'),
+                'peers': result.get('leechers'),
+                'grabs': result.get('completed'),
+                'downloadvolumefactor': result.get('download_multiplier'),
+                'uploadvolumefactor': 1,
+                'page_url': self._pageurl % (self._indexer.get('domain'), result.get('fid')),
+                'imdbid': result.get('imdbID')
+            }
+            torrents.append(torrent)
+        return torrents
+
+    def search(self, keyword: str, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
+        """
+        搜索种子
+        """
         if StringUtils.is_chinese(keyword):
             # 不支持中文
             return True, []
@@ -33,6 +62,7 @@ class TorrentLeech:
             url = self._searchurl % (self._indexer.get('domain'), quote(keyword))
         else:
             url = self._browseurl % (self._indexer.get('domain'), int(page) + 1)
+
         res = RequestUtils(
             headers={
                 "Content-Type": "application/json; charset=utf-8",
@@ -42,24 +72,9 @@ class TorrentLeech:
             proxies=self._proxy,
             timeout=self._timeout
         ).get_res(url)
-        torrents = []
         if res and res.status_code == 200:
             results = res.json().get('torrentList') or []
-            for result in results:
-                torrent = {
-                    'title': result.get('name'),
-                    'enclosure': self._downloadurl % (self._indexer.get('domain'), result.get('fid'), result.get('filename')),
-                    'pubdate': StringUtils.format_timestamp(result.get('addedTimestamp')),
-                    'size': result.get('size'),
-                    'seeders': result.get('seeders'),
-                    'peers': result.get('leechers'),
-                    'grabs': result.get('completed'),
-                    'downloadvolumefactor': result.get('download_multiplier'),
-                    'uploadvolumefactor': 1,
-                    'page_url': self._pageurl % (self._indexer.get('domain'), result.get('fid')),
-                    'imdbid': result.get('imdbID')
-                }
-                torrents.append(torrent)
+            return False, self.__parse_result(results)
         elif res is not None:
             logger.warn(f"{self._indexer.get('name')} 搜索失败，错误码：{res.status_code}")
             return True, []
@@ -67,4 +82,34 @@ class TorrentLeech:
             logger.warn(f"{self._indexer.get('name')} 搜索失败，无法连接 {self._indexer.get('domain')}")
             return True, []
 
-        return False, torrents
+    async def async_search(self, keyword: str, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
+        """
+        异步搜索种子
+        """
+        if StringUtils.is_chinese(keyword):
+            # 不支持中文
+            return True, []
+
+        if keyword:
+            url = self._searchurl % (self._indexer.get('domain'), quote(keyword))
+        else:
+            url = self._browseurl % (self._indexer.get('domain'), int(page) + 1)
+
+        res = await AsyncRequestUtils(
+            headers={
+                "Content-Type": "application/json; charset=utf-8",
+                "User-Agent": f"{self._indexer.get('ua')}",
+            },
+            cookies=self._indexer.get('cookie'),
+            proxies=self._proxy,
+            timeout=self._timeout
+        ).get_res(url)
+        if res and res.status_code == 200:
+            results = res.json().get('torrentList') or []
+            return False, self.__parse_result(results)
+        elif res is not None:
+            logger.warn(f"{self._indexer.get('name')} 搜索失败，错误码：{res.status_code}")
+            return True, []
+        else:
+            logger.warn(f"{self._indexer.get('name')} 搜索失败，无法连接 {self._indexer.get('domain')}")
+            return True, []