添加上传视频代理验证

service/upload_video.py

@@ -17,6 +17,7 @@ from loguru import logger
 from tqdm import tqdm
 
 from service.doudian_request import doudian_request
+from utils.common import check_proxy
 
 HEADERS = {
     "Content-Type": "application/json",
@@ -165,7 +166,12 @@ class Upload:
         self.access_key_id = None
         self.file_size = None
         self.file_name = None
-        self.proxies = task.get("proxies")
+        addr = task.get("proxies")["addr"]
+        port = task.get("proxies")["port"]
+        username = task.get("proxies")["username"]
+        password = task.get("proxies")["password"]
+        proxy_url = f"socks5h://{username}:{password}@{addr}:{port}"
+        self.proxies = check_proxy(proxy_url)
         self.cookies = task.get('cookie')
         self.headers = task.get('headers')
 
@@ -661,21 +667,25 @@ def upload_video_with_multithreading(task):
 
 def prepare_video_file(task):
     """准备视频文件"""
-    if not os.path.exists(VIDEO_PATH):
-        os.makedirs(VIDEO_PATH)
+    if not task.get("file_path"):
+        if not os.path.exists(VIDEO_PATH):
+            os.makedirs(VIDEO_PATH)
 
-    file_name = f"{task['file_name']}"
-    file_path = os.path.join(VIDEO_PATH, file_name)
+        file_name = f"{task['file_name']}"
+        file_path = os.path.join(VIDEO_PATH, file_name)
 
-    if not os.path.exists(file_path):
-        logger.info(f"文件 {file_name} 不存在，开始下载")
-        download_video(task['video_url'], file_path, headers=task['headers'])
+        if not os.path.exists(file_path):
+            logger.info(f"文件 {file_name} 不存在，开始下载")
+            download_video(task['video_url'], file_path, headers=task['headers'])
+        else:
+            logger.info(f"文件 {file_name} 已存在，跳过下载")
+            if is_video_corrupted(file_path):
+                logger.error("视频文件已损坏，正在重新下载")
+                download_video(task['video_url'], file_path, headers=task['headers'])
     else:
-        logger.info(f"文件 {file_name} 已存在，跳过下载")
+        file_path = task.get("file_path")
         if is_video_corrupted(file_path):
-            logger.error("视频文件已损坏，正在重新下载")
-            download_video(task['video_url'], file_path, headers=task['headers'])
-
+            raise Exception("视频文件已损坏")
     video_duration = get_video_duration(file_path)
     if video_duration > 60:
         logger.error("视频时长大于60秒，上传失败")