|
@@ -9,6 +9,7 @@ import concurrent.futures
|
|
from common import Material, Feishu, Common, Oss
|
|
from common import Material, Feishu, Common, Oss
|
|
from common.ffmpeg import FFmpeg
|
|
from common.ffmpeg import FFmpeg
|
|
from data_channel.douyin import DY
|
|
from data_channel.douyin import DY
|
|
|
|
+from data_channel.kuaishou import KS
|
|
from data_channel.piaoquan import PQ
|
|
from data_channel.piaoquan import PQ
|
|
from common.sql_help import sqlCollect
|
|
from common.sql_help import sqlCollect
|
|
from data_channel.shipinhao import SPH
|
|
from data_channel.shipinhao import SPH
|
|
@@ -107,8 +108,8 @@ class getVideo:
|
|
data_list = PQ.get_pq_url(task_mark, url, number, mark)
|
|
data_list = PQ.get_pq_url(task_mark, url, number, mark)
|
|
elif channel_id == "视频号":
|
|
elif channel_id == "视频号":
|
|
data_list = SPH.get_sph_url(task_mark, url, number, mark)
|
|
data_list = SPH.get_sph_url(task_mark, url, number, mark)
|
|
- # elif channel_id == "快手":
|
|
|
|
- # pass
|
|
|
|
|
|
+ elif channel_id == "快手":
|
|
|
|
+ data_list = KS.get_ks_url(task_mark, url, number, mark, feishu_id, cookie_sheet, channel_id, name)
|
|
if len(data_list) == 0:
|
|
if len(data_list) == 0:
|
|
Common.logger("log").info(f"{task_mark}下的视频ID{url} 已经改造过了")
|
|
Common.logger("log").info(f"{task_mark}下的视频ID{url} 已经改造过了")
|
|
Feishu.bot(mark, '机器自动改造消息通知', f'{task_mark}任务下的用户ID{url},没有已经改造的视频了', name)
|
|
Feishu.bot(mark, '机器自动改造消息通知', f'{task_mark}任务下的用户ID{url},没有已经改造的视频了', name)
|
|
@@ -194,12 +195,24 @@ class getVideo:
|
|
sqlCollect.insert_task(task_mark, v_id, mark, channel_id) # 插入数据库
|
|
sqlCollect.insert_task(task_mark, v_id, mark, channel_id) # 插入数据库
|
|
current_time = datetime.now()
|
|
current_time = datetime.now()
|
|
formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
|
|
formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
|
|
- values = [[name, task_mark, v_id, piaoquan_id, new_title, str(code), formatted_time]]
|
|
|
|
|
|
+ values = [[name, task_mark, channel_id, url, v_id, piaoquan_id, new_title, str(code), formatted_time]]
|
|
# 使用锁保护表格插入操作
|
|
# 使用锁保护表格插入操作
|
|
with lock:
|
|
with lock:
|
|
- Feishu.insert_columns("ILb4sa0LahddRktnRipcu2vQnLb", "a74fc4", "ROWS", 1, 2)
|
|
|
|
|
|
+ if name == "王雪珂":
|
|
|
|
+ sheet = "a74fc4"
|
|
|
|
+ elif name == "王雪珂-1":
|
|
|
|
+ sheet = "61kvW7"
|
|
|
|
+ elif name == "鲁涛":
|
|
|
|
+ sheet = "FhewlS"
|
|
|
|
+ elif name == "范军":
|
|
|
|
+ sheet = "B6dCfS"
|
|
|
|
+ elif name == "余海涛":
|
|
|
|
+ sheet = "mfBrNT"
|
|
|
|
+ elif name == "罗情":
|
|
|
|
+ sheet = "2J3PwN"
|
|
|
|
+ Feishu.insert_columns("ILb4sa0LahddRktnRipcu2vQnLb", sheet, "ROWS", 1, 2)
|
|
time.sleep(0.5)
|
|
time.sleep(0.5)
|
|
- Feishu.update_values("ILb4sa0LahddRktnRipcu2vQnLb", "a74fc4", "A2:Z2", values)
|
|
|
|
|
|
+ Feishu.update_values("ILb4sa0LahddRktnRipcu2vQnLb", sheet, "A2:Z2", values)
|
|
cls.remove_files(video_path_url)
|
|
cls.remove_files(video_path_url)
|
|
else:
|
|
else:
|
|
cls.remove_files(video_path_url)
|
|
cls.remove_files(video_path_url)
|
|
@@ -209,7 +222,7 @@ class getVideo:
|
|
cls.remove_files(video_path_url)
|
|
cls.remove_files(video_path_url)
|
|
Common.logger("warning").warning(f"{name}的{task_mark}任务处理失败:{e}\n")
|
|
Common.logger("warning").warning(f"{name}的{task_mark}任务处理失败:{e}\n")
|
|
|
|
|
|
- batch_size = 2
|
|
|
|
|
|
+ batch_size = 1
|
|
with concurrent.futures.ThreadPoolExecutor(max_workers=batch_size) as executor:
|
|
with concurrent.futures.ThreadPoolExecutor(max_workers=batch_size) as executor:
|
|
index = 0
|
|
index = 0
|
|
while index < len(task_data):
|
|
while index < len(task_data):
|