|
@@ -83,10 +83,10 @@ class VideoProcessor:
|
|
|
crop_total = task["crop_total"]
|
|
|
gg_duration_total = task["gg_duration_total"]
|
|
|
video_path_url = cls.create_folders(mark, str(task_mark))
|
|
|
- zm = Material.get_pzsrt_data("summary", "500Oe0", video_share)
|
|
|
- if not zm:
|
|
|
- Feishu.bot(mark, '机器自动改造消息通知', f'{task_mark}任务下片中标示填写错误,请关注!!!!', name)
|
|
|
- return
|
|
|
+ # zm = Material.get_pzsrt_data("summary", "500Oe0", video_share)
|
|
|
+ # if not zm:
|
|
|
+ # Feishu.bot(mark, '机器自动改造消息通知', f'{task_mark}任务下片中标示填写错误,请关注!!!!', name)
|
|
|
+ # return
|
|
|
if ',' in channel_urls:
|
|
|
channel_url_list = channel_urls.split(',')
|
|
|
else:
|
|
@@ -122,10 +122,12 @@ class VideoProcessor:
|
|
|
continue
|
|
|
if new_video_path:
|
|
|
if video_ending and video_ending != 'None':
|
|
|
- new_video_path = cls.handle_video_ending(new_video_path, video_ending, old_title, pw_random_id, video_path_url, mark, task_mark, url, name, video_share, zm)
|
|
|
+ new_video_path = cls.handle_video_ending(new_video_path, video_ending, old_title, pw_random_id, video_path_url, mark, task_mark, url, name, video_share)
|
|
|
else:
|
|
|
if video_share and video_share != 'None':
|
|
|
- new_video_path = FFmpeg.single_video(new_video_path, video_path_url, zm)
|
|
|
+ # new_video_path = FFmpeg.single_video(new_video_path, video_path_url, zm)
|
|
|
+ new_video_path = FFmpeg.single_video(new_video_path, video_path_url)
|
|
|
+
|
|
|
if not os.path.isfile(new_video_path):
|
|
|
Feishu.bot(mark, '机器自动改造消息通知', f'{task_mark}任务用户{url}下的视频{v_id},视频改造失败,请关注', name)
|
|
|
cls.remove_files(video_path_url)
|
|
@@ -276,7 +278,7 @@ class VideoProcessor:
|
|
|
return new_video_path
|
|
|
|
|
|
@classmethod
|
|
|
- def handle_video_ending(cls, new_video_path, video_ending, old_title, pw_random_id, video_path_url, mark, task_mark, url, name, video_share, zm):
|
|
|
+ def handle_video_ending(cls, new_video_path, video_ending, old_title, pw_random_id, video_path_url, mark, task_mark, url, name, video_share):
|
|
|
"""
|
|
|
处理视频片尾
|
|
|
"""
|
|
@@ -330,7 +332,7 @@ class VideoProcessor:
|
|
|
Common.logger("log").info(f"{name}的{task_mark}下的视频{url},视频与片尾拼接成功")
|
|
|
time.sleep(1)
|
|
|
if video_share and video_share != 'None':
|
|
|
- new_video_path = FFmpeg.single_video(video_path, video_path_url, zm)
|
|
|
+ new_video_path = FFmpeg.single_video(video_path, video_path_url)
|
|
|
else:
|
|
|
new_video_path = video_path
|
|
|
return new_video_path
|