|
@@ -383,6 +383,15 @@ class ConsumptionRecommend(object):
|
|
return
|
|
return
|
|
|
|
|
|
logger.info(f"[处理] 数据合并开始拼接")
|
|
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添加成功")
|
|
video_path = FFmpeg.h_b_video(video_path, pw_path, file_path)
|
|
video_path = FFmpeg.h_b_video(video_path, pw_path, file_path)
|
|
video_path = FFmpeg.single_video(video_path, file_path, data["video_share"])
|
|
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:
|
|
if not os.path.exists(video_path) or os.path.getsize(video_path) == 0:
|
|
@@ -438,7 +447,7 @@ class ConsumptionRecommend(object):
|
|
file_path = os.path.join(CACHE_DIR, uid)
|
|
file_path = os.path.join(CACHE_DIR, uid)
|
|
logger.info(f"[处理] 开始获取redis数据")
|
|
logger.info(f"[处理] 开始获取redis数据")
|
|
fs_data = os.getenv("FS_DATA")
|
|
fs_data = os.getenv("FS_DATA")
|
|
- # fs_data = '邓锋,DEpi6V,task:carry_data_redis_df'
|
|
|
|
|
|
+ # fs_data = '周仙琴,2WIcBU,task:carry_data_redis_zxq'
|
|
fs_data_list = fs_data.split(',')
|
|
fs_data_list = fs_data.split(',')
|
|
redis_name = fs_data_list[2]
|
|
redis_name = fs_data_list[2]
|
|
data = RedisHelper().get_client().rpop(name=redis_name)
|
|
data = RedisHelper().get_client().rpop(name=redis_name)
|