Update api.py

api.py

@@ -157,26 +157,27 @@ def returnRandomSubscribeUrl(background_tasks: BackgroundTasks)->str:
 
 
 async def upload_video(meta:dict):
-    credential = Credential(sessdata=sessdata,
-                            bili_jct=bili_jct,
-                            buvid3=buvid3)
-
-    # 读取本地cover/0.jpg文件为字节数据作为cover
-    with open("cover/0.jpg", "rb") as f:
-        cover_data = f.read()
-    cover = bilibili_api.utils.picture.Picture.from_content(cover_data,"jpg")#直接读取本地图片content
-    
-    
-    
-    page = video_uploader.VideoUploaderPage(path='mp4_out/output_video.mp4', title=meta['title'], description=meta['desc'])
+    #假设最多重新上传5次,上传cover超时那么选取随机图片重新作为cover上传
+    max_attempts = 5
+    attempts = 0
+    while attempts < max_attempts:
+    try:
+        await upload_with_random_cover(meta);
+    except Exception as e:
+        print("上传video遇到错误,可能是cover不符合超时,下面将调用upload_with_random_cover函数")
+        print(f"Attempt 第{attempts+1}次重新上传: 本次错误原因是Error : {e}")
+        #重新上传会执行try的部分,所以except部分不用写upload again
+        attempts += 1
+    else:
+        print("No errors occurred")
+        break
+        
     
-    uploader = video_uploader.VideoUploader([page], meta, credential, cover=cover)
-
-    @uploader.on("__ALL__")
-    async def ev(data):
-        print(data)
 
-    await uploader.start()
+        
+        
+        
+        
 
 
 
@@ -204,8 +205,13 @@ def zero_pad(s, length):
 
 #如果默认的cover不能过审,那么随机选取无水印的manga1下面的随便一个作为cover重新上传
 @app.get("/upload_again")
-async def upload_again(bili_meta_data):
+async def upload_again(bili_meta_data:str):
     bili_meta_data = json.loads(bili_meta_data)
+    await upload_with_random_cover(bili_meta_data)
+
+
+#这个函数单独拆开,因为手动和自动重新上传都需要调用
+async def upload_with_random_cover(bili_meta_data:dict):
     meta = bili_meta_data
     credential = Credential(sessdata=sessdata,
                             bili_jct=bili_jct,
@@ -225,7 +231,7 @@ async def upload_again(bili_meta_data):
     image_files.sort(
         key=lambda x: zero_pad(''.join(filter(str.isdigit, os.path.splitext(os.path.basename(x))[0])), 3))
 
-    # 获取随机一张图片图片存入cover/0.jpg作为cover图片
+    # 获取随机一张图片图片存入cover/0.jpg作为cover图片,至于保存为cover/0.jpg而不是直接用是因为能在出错的时候看效果,通过/cover.jpg接口
     random_image = Image.open(random.choice(image_files))
     # 定义要保存的文件路径
     save_path = os.path.join("cover", "0.jpg")