|
@@ -73,12 +73,12 @@ class VideoStitching():
|
|
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
- def get_url_list(cls, i, account):
|
|
|
|
|
|
+ def get_url_list(cls, audio_id, account):
|
|
url_list = f"""SELECT a.video_id,a.account_id,a.oss_object_key FROM video_url a WHERE NOT EXISTS (
|
|
url_list = f"""SELECT a.video_id,a.account_id,a.oss_object_key FROM video_url a WHERE NOT EXISTS (
|
|
SELECT video_id
|
|
SELECT video_id
|
|
FROM video_audio b
|
|
FROM video_audio b
|
|
- WHERE a.video_id = b.video_id AND b.audio = "{i}"
|
|
|
|
- ) AND a.account_id = '{account}' ;"""
|
|
|
|
|
|
+ WHERE a.video_id = b.video_id AND b.audio = "{audio_id}"
|
|
|
|
+ ) AND a.account_id = {account} ;"""
|
|
url_list = MysqlHelper.get_values(url_list, "prod")
|
|
url_list = MysqlHelper.get_values(url_list, "prod")
|
|
return url_list
|
|
return url_list
|
|
|
|
|
|
@@ -269,14 +269,16 @@ class VideoStitching():
|
|
@classmethod
|
|
@classmethod
|
|
def video_stitching(cls, cookie):
|
|
def video_stitching(cls, cookie):
|
|
count = 0
|
|
count = 0
|
|
- # 获取音频
|
|
|
|
- audio_id = Material.get_audio()
|
|
|
|
|
|
+
|
|
while True:
|
|
while True:
|
|
|
|
+ # 获取音频
|
|
|
|
+ audioid = Material.get_audio()
|
|
# 获取已入库的用户id
|
|
# 获取已入库的用户id
|
|
account_id = cls.get_account_id()
|
|
account_id = cls.get_account_id()
|
|
- audio_id = random.choice(audio_id)
|
|
|
|
- for j in account_id:
|
|
|
|
- account = j[0].replace('(', '').replace(')', '').replace(',', '')
|
|
|
|
|
|
+ audio_id = random.choice(audioid)
|
|
|
|
+ for i in range(len(account_id)):
|
|
|
|
+ account = random.choice(account_id)
|
|
|
|
+ account = str(account).replace('(', '').replace(')', '').replace(',', '')
|
|
Common.logger().info(f"获取用户ID:{account}")
|
|
Common.logger().info(f"获取用户ID:{account}")
|
|
# 获取 未使用的视频链接
|
|
# 获取 未使用的视频链接
|
|
url_list = cls.get_url_list(audio_id, account)
|
|
url_list = cls.get_url_list(audio_id, account)
|
|
@@ -314,6 +316,7 @@ class VideoStitching():
|
|
Common.logger().info(f"文件不存在{output_path}")
|
|
Common.logger().info(f"文件不存在{output_path}")
|
|
piaoquantv = cls.insert_piaoquantv(oss_object_key)
|
|
piaoquantv = cls.insert_piaoquantv(oss_object_key)
|
|
if piaoquantv:
|
|
if piaoquantv:
|
|
|
|
+ time.sleep(360)
|
|
count += 1
|
|
count += 1
|
|
Common.logger().info(f"视频添加到对应用户成功")
|
|
Common.logger().info(f"视频添加到对应用户成功")
|
|
if count >= 20:
|
|
if count >= 20:
|
|
@@ -321,7 +324,7 @@ class VideoStitching():
|
|
except Exception as e:
|
|
except Exception as e:
|
|
Common.logger().warning(f"新拼接视频发送oss失败:{e}\n")
|
|
Common.logger().warning(f"新拼接视频发送oss失败:{e}\n")
|
|
continue
|
|
continue
|
|
- if count >= 13:
|
|
|
|
|
|
+ if count >= 6:
|
|
break
|
|
break
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|