zhangyong 1 月之前
父节点
当前提交
98ced392f3
共有 1 个文件被更改,包括 10 次插入7 次删除
  1. 10 7
      workers/consumption_work.py

+ 10 - 7
workers/consumption_work.py

@@ -385,13 +385,16 @@ class ConsumptionRecommend(object):
                     logger.info(f"[处理] 数据合并开始拼接")
                     trailer_share_bgm = data['trailer_share_bgm']
                     # trailer_share_bgm = '48594759'
-                    if trailer_share_bgm:
-                        logger.info(f"[处理] 获取bgm")
-                        rg_bgm_list = PQ.get_pq_oss([trailer_share_bgm])
-                        rg_bgm_url = DownLoad.download_pq_video(file_path, rg_bgm_list)
-                        bgm_mp3_path = FFmpeg.get_pw_video_mp3(file_path, rg_bgm_url[0])
-                        pw_path = FFmpeg.video_add_bgm(pw_path, bgm_mp3_path, file_path)
-                        logger.info(f"[处理] 片尾bgm添加成功")
+                    if trailer_share_bgm or trailer_share_bgm != "None":
+                        try:
+                            logger.info(f"[处理] 获取bgm")
+                            rg_bgm_list = PQ.get_pq_oss([trailer_share_bgm])
+                            rg_bgm_url = DownLoad.download_pq_video(file_path, rg_bgm_list)
+                            bgm_mp3_path = FFmpeg.get_pw_video_mp3(file_path, rg_bgm_url[0])
+                            pw_path = FFmpeg.video_add_bgm(pw_path, bgm_mp3_path, file_path)
+                            logger.info(f"[处理] 片尾bgm添加成功")
+                        except Exception as e:
+                            logger.error(f"[处理] 片尾bgm添加失败")
                     video_path = FFmpeg.h_b_video(video_path, pw_path, file_path)
                     video_path = FFmpeg.single_video(video_path, file_path, data["video_share"])
                     if not os.path.exists(video_path) or os.path.getsize(video_path) == 0: