调试

video_rewriting/video_processor.py

@@ -122,11 +122,11 @@ 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)
+                            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)
                         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, zm)
 
                         if not os.path.isfile(new_video_path):
                             Feishu.bot(mark, '机器自动改造消息通知', f'{task_mark}任务用户{url}下的视频{v_id},视频改造失败，请关注', name)
@@ -279,7 +279,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):
+    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):
         """
         处理视频片尾
         """
@@ -333,7 +333,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)
+            new_video_path = FFmpeg.single_video(video_path, video_path_url, zm)
         else:
             new_video_path = video_path
         return new_video_path