Merge branch 'jxxghp:v2' into v2

Author: Seed680

app/api/endpoints/search.py

@@ -20,7 +20,7 @@ async def search_latest(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     查询搜索结果
     """
-    torrents = await SearchChain().async_last_search_results()
+    torrents = await SearchChain().async_last_search_results() or []
     return [torrent.to_dict() for torrent in torrents]
 
 

app/chain/search.py

@@ -86,13 +86,13 @@ def search_by_title(self, title: str, page: Optional[int] = 0,
             self.save_cache(contexts, self.__result_temp_file)
         return contexts
 
-    def last_search_results(self) -> List[Context]:
+    def last_search_results(self) -> Optional[List[Context]]:
         """
         获取上次搜索结果
         """
         return self.load_cache(self.__result_temp_file)
 
-    async def async_last_search_results(self) -> List[Context]:
+    async def async_last_search_results(self) -> Optional[List[Context]]:
         """
         异步获取上次搜索结果
         """

app/helper/plugin.py

@@ -91,6 +91,8 @@ def access_token(self) -> Optional[str]:
                         "refresh_time": int(time.time()),
                         **tokens
                     })
+                else:
+                    return None
             access_token = tokens.get("access_token")
             if access_token:
                 self.session.headers.update({"Authorization": f"Bearer {access_token}"})
@@ -211,6 +213,8 @@ def _request_api(self, method: str, endpoint: str,
 
         # 错误日志标志
         no_error_log = kwargs.pop("no_error_log", False)
+        # 重试次数
+        retry_times = kwargs.pop("retry_limit", 5)
 
         try:
             resp = self.session.request(
@@ -225,6 +229,8 @@ def _request_api(self, method: str, endpoint: str,
             logger.warn(f"【115】{method} 请求 {endpoint} 失败！")
             return None
 
+        kwargs["retry_limit"] = retry_times
+
         # 处理速率限制
         if resp.status_code == 429:
             reset_time = 5 + int(resp.headers.get("X-RateLimit-Reset", 60))
@@ -243,7 +249,6 @@ def _request_api(self, method: str, endpoint: str,
             error_msg = ret_data.get("message")
             if not no_error_log:
                 logger.warn(f"【115】{method} 请求 {endpoint} 出错：{error_msg}")
-            retry_times = kwargs.get("retry_limit", 5)
             if "已达到当前访问上限" in error_msg:
                 if retry_times <= 0:
                     logger.error(f"【115】{method} 请求 {endpoint} 达到访问上限，重试次数用尽！")

app/modules/filemanager/storages/u115.py

@@ -425,7 +425,7 @@ def __get_targetitem(_path: Path) -> FileItem:
                     # 复制文件到新目录
                     target_fileitem = target_oper.get_folder(target_file.parent)
                     if target_fileitem:
-                        if source_oper.move(fileitem, Path(target_fileitem.path), target_file.name):
+                        if source_oper.copy(fileitem, Path(target_fileitem.path), target_file.name):
                             return target_oper.get_item(target_file), ""
                         else:
                             return None, f"【{target_storage}】{fileitem.path} 复制文件失败"

app/modules/filemanager/transhandler.py

@@ -747,6 +747,9 @@ def match_web(self, name: str, mtype: MediaType) -> Optional[dict]:
         logger.info("正在从TheDbMovie网站查询：%s ..." % name)
         tmdb_url = self._build_tmdb_search_url(name)
         res = RequestUtils(timeout=5, ua=settings.NORMAL_USER_AGENT, proxies=settings.PROXY).get_res(url=tmdb_url)
+        if res is None:
+            logger.error("无法连接TheDbMovie")
+            return None
 
         # 响应验证
         response_result = self._validate_response(res)
@@ -1857,6 +1860,9 @@ async def async_match_web(self, name: str, mtype: MediaType) -> Optional[dict]:
         tmdb_url = self._build_tmdb_search_url(name)
         res = await AsyncRequestUtils(timeout=5, ua=settings.NORMAL_USER_AGENT, proxies=settings.PROXY).get_res(
             url=tmdb_url)
+        if res is None:
+            logger.error("无法连接TheDbMovie")
+            return None
 
         # 响应验证
         response_result = self._validate_response(res)

app/modules/themoviedb/tmdbapi.py

@@ -154,7 +154,7 @@ def webhook_parser(
         """
         source = args.get("source")
         if source:
-            server: TrimeMedia = self.get_instance(source)
+            server: Optional[TrimeMedia] = self.get_instance(source)
             if not server:
                 return None
             result = server.get_webhook_message(body)
@@ -247,7 +247,7 @@ def media_statistic(
         媒体数量统计
         """
         if server:
-            server_obj: TrimeMedia = self.get_instance(server)
+            server_obj: Optional[TrimeMedia] = self.get_instance(server)
             if not server_obj:
                 return None
             servers = [server_obj]
@@ -268,7 +268,7 @@ def mediaserver_librarys(
         """
         媒体库列表
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if server_obj:
             return server_obj.get_librarys(hidden=hidden)
         return None
@@ -290,7 +290,7 @@ def mediaserver_items(
 
         :return: 返回一个生成器对象，用于逐步获取媒体服务器中的项目
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if server_obj:
             return server_obj.get_items(library_id, start_index, limit)
         return None
@@ -301,7 +301,7 @@ def mediaserver_iteminfo(
         """
         媒体库项目详情
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if server_obj:
             return server_obj.get_iteminfo(item_id)
         return None
@@ -312,7 +312,9 @@ def mediaserver_tv_episodes(
         """
         获取剧集信息
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        if not isinstance(item_id, str):
+            return None
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if not server_obj:
             return None
         _, seasoninfo = server_obj.get_tv_episodes(item_id=item_id)
@@ -329,18 +331,20 @@ def mediaserver_playing(
         """
         获取媒体服务器正在播放信息
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if not server_obj:
             return []
-        return server_obj.get_resume(num=count)
+        return server_obj.get_resume(num=count) or []
 
     def mediaserver_play_url(
         self, server: str, item_id: Union[str, int]
     ) -> Optional[str]:
         """
         获取媒体库播放地址
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        if not isinstance(item_id, str):
+            return None
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if not server_obj:
             return None
         return server_obj.get_play_url(item_id)
@@ -354,10 +358,10 @@ def mediaserver_latest(
         """
         获取媒体服务器最新入库条目
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if not server_obj:
             return []
-        return server_obj.get_latest(num=count)
+        return server_obj.get_latest(num=count) or []
 
     def mediaserver_latest_images(
         self,
@@ -374,7 +378,7 @@ def mediaserver_latest_images(
         :param remote: True为外网链接, False为内网链接
         :return: 图片链接列表
         """
-        server_obj: TrimeMedia = self.get_instance(server)
+        server_obj: Optional[TrimeMedia] = self.get_instance(server)
         if not server_obj:
             return []
-        return server_obj.get_latest_backdrops(num=count, remote=remote)
+        return server_obj.get_latest_backdrops(num=count, remote=remote) or []