Update api.py

api.py

@@ -15,6 +15,7 @@ import time
 from bilibili_api import sync, video_uploader, Credential#bili上传部分
 import asyncio #保证后台任务的先后
 import json #对bili_meta_data进行dumps ->str和loads—>dict
+import bilibili_api
 
 
 sessdata = os.getenv('sessdata')
@@ -105,32 +106,36 @@ async def execute_py_file(file_name: str,background_tasks: BackgroundTasks):
 #保证既要提交队列后返回给用户,又要先完成前面的video生成步骤再执行后面的submit函数,还有兼顾allow_submit的值
 @app.get("/execute_all_task")
 async def execute_all_task(background_tasks: BackgroundTasks, bili_meta_data,file_list: List[str] = Query(["1removeMask", "2magiDialogCut", "3mergeDialogToVideo"]),
-                            cover_image: UploadFile = File(...), mp4_out_file: str = 'mp4_out/output.mp4',
-                           allow_submit: bool = False, cover_path: str = '/cover'
+                             mp4_out_file: str = 'mp4_out/output.mp4',
+                           allow_submit: bool = False, cover_url: str = ''
                            ):
+    #cover_url因为本地上传有协程问题,所以采用cover_url然后转换为Picture类型即可->bilibili_api.utls.picture.Picture.from_url(str)->str
+    
     print("获取到的用户bili_meta_data是:", bili_meta_data)
     #这里需要先转换bili_meta_data从str变成dict才能继续
     bili_meta_data = json.loads(bili_meta_data)
     print("获取到的file_list是",file_list)
     print("获取到的allow_submit是",allow_submit)
     
-    background_tasks.add_task(process_tasks_and_upload, file_list, bili_meta_data, cover_image, cover_path,allow_submit,background_tasks)
+    background_tasks.add_task(process_tasks_and_upload, file_list, bili_meta_data, cover_url,allow_submit,background_tasks)
     return {"message": "提交成功"}
 
-async def process_tasks_and_upload(file_list, bili_meta_data, cover_image, cover_path,allow_submit,background_tasks):
+async def process_tasks_and_upload(file_list, bili_meta_data,  cover_url,allow_submit,background_tasks):
     
     tasks = []
     for file_name in file_list:
         tasks.append(file_executer(file_name))
 
     if allow_submit:
-        cover_img = cover_image.file.read()
-        cover_img_data = Image.open(io.BytesIO(cover_img)).convert("L").convert("RGB")
-        cover_path_to_image = os.path.join(cover_path, "cover.jpg")
-        cover_img_data.save(cover_path_to_image)
-        print("cover_path_to_image是",cover_path_to_image)
-        # background_tasks.add_task(upload_video, bili_meta_data, cover_path_to_image)
-        tasks.append(await upload_video(bili_meta_data, cover_path_to_image))
+        # cover_img = cover_image.file.read()
+        # cover_img_data = Image.open(io.BytesIO(cover_img)).convert("L").convert("RGB")
+        # cover_path_to_image = os.path.join(cover_path, "cover.jpg")
+        # cover_img_data.save(cover_path_to_image)
+        # print("cover_path_to_image是",cover_path_to_image)
+        # # background_tasks.add_task(upload_video, bili_meta_data, cover_path_to_image)
+        #因为采用cover_url上传,所以不需要读取内容然后保存本地->这样也会引起协程问题
+        print("开始对cover_url是",cover_path_to_image,"的提交进程进行加入后台任务")
+        tasks.append(await upload_video(bili_meta_data, cover_url))
 
 
 
@@ -158,16 +163,18 @@ def returnRandomSubscribeUrl(background_tasks: BackgroundTasks)->str:
 
 
 
-async def upload_video(meta:dict,cover_path_to_image:str):
+async def upload_video(meta:dict,cover_url:str):
     credential = Credential(sessdata=sessdata,
                             bili_jct=bili_jct,
                             buvid3=buvid3)
+
+    cover = bilibili_api.utils.picture.Picture.from_url(cover_url)
     
     
     page = video_uploader.VideoUploaderPage(path='mp4_out/output_video.mp4', title=meta['title'], description=meta['desc'])
-    print("上传前的cover_path_to_image是",cover_path_to_image)
+    print("上传前的cover_url是",cover_url)
     
-    uploader = video_uploader.VideoUploader([page], meta, credential, cover=cover_path_to_image)
+    uploader = video_uploader.VideoUploader([page], meta, credential, cover=cover)
 
     @uploader.on("__ALL__")
     async def ev(data):