|
|
@@ -164,10 +164,12 @@ class getVideo:
|
|
|
continue
|
|
|
for attempt in range(3):
|
|
|
pw_mp3_path = FFmpeg.get_video_mp3(pw_url, video_path_url, pw_random_id)
|
|
|
+ Common.logger("log").info(f"{task_mark}下的视频{url},获取mp3成功")
|
|
|
pw_path = FFmpeg.pw_video(jpg_path, video_path_url, pw_url, pw_srt, pw_random_id, pw_mp3_path) # 生成片尾视频
|
|
|
if os.path.isfile(pw_path):
|
|
|
- Common.logger("log").info(f"{task_mark}下的视频{url},生成片尾视频成功")
|
|
|
+ Common.logger("log").info(f"{task_mark}下的视频{url},生成片尾视频失败")
|
|
|
break
|
|
|
+ Common.logger("log").info(f"{task_mark}下的视频{url},生成片尾视频成功")
|
|
|
time.sleep(1)
|
|
|
if not os.path.isfile(pw_path):
|
|
|
Feishu.bot(mark, '机器自动改造消息通知', f'{task_mark}任务用户{url}下的视频{v_id},生成片尾视频失败，请关注',
|
|
|
@@ -175,7 +177,9 @@ class getVideo:
|
|
|
cls.remove_files(video_path_url)
|
|
|
continue
|
|
|
pw_video_list = [new_video_path, pw_path]
|
|
|
+ Common.logger("log").info(f"{task_mark}下的视频{url},视频与片尾开始拼接")
|
|
|
video_path = FFmpeg.concatenate_videos(pw_video_list, video_path_url) # 视频与片尾拼接到一起
|
|
|
+ Common.logger("log").info(f"{task_mark}下的视频{url},视频与片尾拼接成功")
|
|
|
time.sleep(1)
|
|
|
if video_share and video_share != 'None':
|
|
|
new_video_path = FFmpeg.single_video(video_path, video_share_mark, video_path_url, zm)
|
|
|
@@ -186,6 +190,7 @@ class getVideo:
|
|
|
new_video_path = FFmpeg.single_video(new_video_path, video_share_mark, video_path_url, zm)
|
|
|
time.sleep(1)
|
|
|
oss_id = cls.random_id()
|
|
|
+ Common.logger("log").info(f"{task_mark}下的视频{url},开始发送oss")
|
|
|
oss_object_key = Oss.stitching_sync_upload_oss(new_video_path, oss_id) # 视频发送OSS
|
|
|
status = oss_object_key.get("status")
|
|
|
if status == 200:
|
