fix scrape

app/api/endpoints/aliyun.py

@@ -190,7 +190,7 @@ def image_aliyun(fileid: str, _: schemas.TokenPayload = Depends(verify_uri_token
     """
     if not fileid:
         return schemas.Response(success=False)
-    url = AliyunHelper().download_url(fileid)
+    url = AliyunHelper().download(fileid)
     if url:
         # 重定向
         return Response(status_code=302, headers={"Location": url})

app/chain/__init__.py

@@ -522,7 +522,7 @@ class ChainBase(metaclass=ABCMeta):
         self.run_module("scrape_metadata", path=path, mediainfo=mediainfo, metainfo=metainfo,
                         transfer_type=transfer_type, force_nfo=force_nfo, force_img=force_img)
 
-    def metadata_img(self, mediainfo: MediaInfo, season: int = None) -> dict:
+    def metadata_img(self, mediainfo: MediaInfo, season: int = None) -> Optional[dict]:
         """
         获取图片名称和url
         :param mediainfo: 媒体信息

app/chain/media.py

@@ -464,7 +464,7 @@ class MediaChain(ChainBase, metaclass=Singleton):
                 for file in files:
                     self.manual_scrape(storage=storage, fileitem=file,
                                        meta=meta, mediainfo=mediainfo,
-                                       init_folder=False)
+                                       init_folder=True if file.type == "dir" else False)
                 # 生成目录的nfo和图片
                 if init_folder:
                     # 识别文件夹名称

app/helper/aliyun.py

@@ -571,6 +571,16 @@ class AliyunHelper:
             return None
         # 获取上传参数
         result = res.json()
+        if result.get("'exist'"):
+            logger.info(f"文件{result.get('file_name')}已存在，无需上传")
+            return schemas.FileItem(
+                drive_id=result.get("drive_id"),
+                fileid=result.get("file_id"),
+                parent_fileid=result.get("parent_file_id"),
+                type="file",
+                name=result.get("file_name"),
+                path=f"{file_path.parent}/{result.get('file_name')}"
+            )
         file_id = result.get("file_id")
         upload_id = result.get("upload_id")
         part_info_list = result.get("part_info_list")

app/modules/douban/__init__.py

@@ -775,13 +775,13 @@ class DoubanModule(_ModuleBase):
             return None
         return self.scraper.get_metadata_nfo(mediainfo=mediainfo, season=season)
 
-    def metadata_img(self, mediainfo: MediaInfo, **kwargs) -> dict:
+    def metadata_img(self, mediainfo: MediaInfo, **kwargs) -> Optional[dict]:
         """
         获取图片名称和url
         :param mediainfo: 媒体信息
         """
         if settings.SCRAP_SOURCE != "douban":
-            return {}
+            return None
         return self.scraper.get_metadata_img(mediainfo=mediainfo)
 
     def obtain_images(self, mediainfo: MediaInfo) -> Optional[MediaInfo]:

app/modules/themoviedb/__init__.py

@@ -349,14 +349,14 @@ class TheMovieDbModule(_ModuleBase):
             return None
         return self.scraper.get_metadata_nfo(meta=meta, mediainfo=mediainfo, season=season, episode=episode)
 
-    def metadata_img(self, mediainfo: MediaInfo, season: int = None) -> dict:
+    def metadata_img(self, mediainfo: MediaInfo, season: int = None) -> Optional[dict]:
         """
         获取图片名称和url
         :param mediainfo: 媒体信息
         :param season: 季号
         """
         if settings.SCRAP_SOURCE != "themoviedb":
-            return {}
+            return None
         return self.scraper.get_metadata_img(mediainfo=mediainfo, season=season)
 
     def tmdb_discover(self, mtype: MediaType, sort_by: str, with_genres: str, with_original_language: str,