From 25087cbe79c8c4992551477d55d9db8bbea2202e Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期三, 30 七月 2025 22:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.114.84:7070/r/AutoMediaPublisher
---
auto_media_publisher/generators/video_generator_mashup.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/auto_media_publisher/generators/video_generator_mashup.py b/auto_media_publisher/generators/video_generator_mashup.py
index 5a571a2..b807f8d 100644
--- a/auto_media_publisher/generators/video_generator_mashup.py
+++ b/auto_media_publisher/generators/video_generator_mashup.py
@@ -14,7 +14,7 @@
import re
from auto_media_publisher.utils.logger import get_logger
-from auto_media_publisher.config.conf_video_mashup import VIDEO_DIR,FINAL_VIDEO_DIR,VIDEO_LOGO_PATH,VIDEO_SEGMENT_COUNT,VIDEO_SEGMENT_DURATION,VIDEO_RESOLUTION_DEFAULT_WIDTH,VIDEO_RESOLUTION_DEFAULT_HEIGHT,VIDEO_FONT_PATH,VIDEO_FONT_SIZE,VIDEO_FONT_COLOR
+from auto_media_publisher.config.conf_video_mashup import VIDEO_DIR,FINAL_MEDIA_DIR,VIDEO_LOGO_PATH,VIDEO_SEGMENT_COUNT,VIDEO_SEGMENT_DURATION,VIDEO_RESOLUTION_DEFAULT_WIDTH,VIDEO_RESOLUTION_DEFAULT_HEIGHT,VIDEO_FONT_PATH,VIDEO_FONT_SIZE,VIDEO_FONT_COLOR
from auto_media_publisher.generators.media_generator_base import MediaGenerator
@@ -362,7 +362,7 @@
鐢熸垚涓�涓煭瑙嗛mp4;
鐢熸垚涓�涓猵ng灏侀潰;
鐢熸垚涓�涓棰戠殑閰嶇疆json鏂囦欢;
- 涓変釜鏂囦欢閮� 淇濆瓨鍒� video_final / user_id / 涓嬮潰
+ 涓変釜鏂囦欢閮� 淇濆瓨鍒� media_final / user_id / 涓嬮潰
""" # from 2025-07-19 08:00:00 to 2025-07-19 08:00
try:
@@ -371,10 +371,10 @@
scheduled_time_pub = tmp_datetime.strftime("%Y-%m-%d %H:%M")
self.logger.info(f"VideoGeneratorMashup 姝ｅ湪鐢熸垚 media锛歿self.user_id},{self.scheduled_time} .mp4")
- os.makedirs(os.path.join(FINAL_VIDEO_DIR,self.user_id),exist_ok=True)
- output_mp4_path =f"{FINAL_VIDEO_DIR}/{self.user_id}/{scheduled_time_str}.mp4"
- output_png_path =f"{FINAL_VIDEO_DIR}/{self.user_id}/{scheduled_time_str}.png"
- output_json_path = f"{FINAL_VIDEO_DIR}/{self.user_id}/{scheduled_time_str}.json"
+ os.makedirs(os.path.join(FINAL_MEDIA_DIR,self.user_id),exist_ok=True)
+ output_mp4_path =f"{FINAL_MEDIA_DIR}/{self.user_id}/{scheduled_time_str}.mp4"
+ output_png_path =f"{FINAL_MEDIA_DIR}/{self.user_id}/{scheduled_time_str}.png"
+ output_json_path = f"{FINAL_MEDIA_DIR}/{self.user_id}/{scheduled_time_str}.json"
# 閽堝涓嶅悓鐨勫钩鍙帮紝濡傛灉閰嶇疆浜嗙浉鍚岀殑鍙戝竷鏃堕棿锛岄粯璁ゆ槸浣跨敤鍚屼竴涓棰戙��
# 濡傛灉鏌愪釜鐢ㄦ埛鍦ㄤ笉鍚岀殑骞冲彴涓婏紝闇�瑕佸睍绀轰笉鍚岀殑鍐呭锛岃 浜轰负 鍦� 璁剧疆鏈�缁堝彂甯冩椂闂存槸涓嶅悓鐨勬椂闂淬��
@@ -407,9 +407,9 @@
"user": self.user_id,
"title": "",
"description": text_line,
- "path_video": output_mp4_path,
+ "path_media": output_mp4_path,
"tags": ["鎰熸仼鐩搁亣","鍐嶆潵涓�涓�","澶ソ鐪嬩簡"],
- "publish_datetime": scheduled_time_pub,
+ "scheduled_time": scheduled_time_pub,
"location": "",
"category": "",
"path_cover": output_png_path,
--
Gitblit v1.9.1