zhangyong 8 mesi fa
parent
commit
9c305e3008
1 ha cambiato i file con 9 aggiunte e 15 eliminazioni
  1. 9 15
      video_rewriting/video_processor.py

+ 9 - 15
video_rewriting/video_processor.py

@@ -602,25 +602,19 @@ class VideoProcessor:
             if status == 200:
                 oss_object_key = oss_object_key.get("oss_object_key")
                 time.sleep(1)
+                jpg_path = None
                 if channel_id == "快手历史":
                     jpg = None
+                elif channel_id == "视频号历史":
+                    jpg_path = Oss.download_sph_ls( cover, video_path_url, v_id )
                 elif channel_id == '单点视频':
-                    if video['source'] == "快手":
-                        jpg = None
+                    if video['source'] != "快手":
+                        jpg_path = PQ.download_video_jpg( cover, video_path_url, v_id )  # 下载视频封面
+                if jpg_path and os.path.isfile( jpg_path ):
+                    oss_jpg_key = Oss.stitching_fm_upload_oss( jpg_path, oss_id )  # 封面上传OSS
+                    jpg = oss_jpg_key.get( "oss_object_key" )
                 else:
-                    if channel_id == "视频号历史":
-                        jpg_path = Oss.download_sph_ls(cover, video_path_url, v_id)
-                    else:
-                        jpg_path = PQ.download_video_jpg(cover, video_path_url, v_id)  # 下载视频封面
-                    if os.path.isfile(jpg_path):
-                        oss_jpg_key = Oss.stitching_fm_upload_oss(jpg_path, oss_id)  # 封面发送OSS
-                        status = oss_jpg_key.get("status")
-                        if status == 200:
-                            jpg = oss_jpg_key.get("oss_object_key")
-                        else:
-                            jpg = None
-                    else:
-                        jpg = None
+                    jpg = None
                 code = PQ.insert_piaoquantv(oss_object_key, new_title, jpg, piaoquan_id)
                 Common.logger(mark).info(f"{name}的{task_mark}下的视频ID{v_id}发送成功")
                 sqlCollect.insert_task(task_mark, v_id, mark, channel_id)  # 插入数据库