kali/DailyMotion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加select导入以支持查询操作

Browse Source
This commit is contained in:
晓丰 2025-06-29 11:36:36 +08:00
parent 65eada4a6e
commit b511dbc962
1 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DB.py
View File

@ -802,13 +802,11 @@ class DBSA:
# 生成所有视频唯一键 (v_xid, v_name) # 生成所有视频唯一键 (v_xid, v_name)
all_vid_keys = list({(row["v_xid"], row["v_name"]) for row in vid_rows}) all_vid_keys = list({(row["v_xid"], row["v_name"]) for row in vid_rows})
if all_vid_keys: # 仅当有键时才查询
conn = _engine.connect() conn = _engine.connect()
try: try:
# 查询数据库中已存在的视频记录 # 使用SQLAlchemy 1.4+的select语法
sel_vid = select([ sel_vid = select(video.c.v_xid, video.c.v_name).where(
video.c.v_xid,
video.c.v_name
]).where(
tuple_(video.c.v_xid, video.c.v_name).in_(all_vid_keys) tuple_(video.c.v_xid, video.c.v_name).in_(all_vid_keys)
) )
result = conn.execute(sel_vid) result = conn.execute(sel_vid)
@ -834,22 +832,24 @@ class DBSA:
# ========== 操作记录表去重 ========== # ========== 操作记录表去重 ==========
final_op_rows = [] final_op_rows = []
if op_rows: if op_rows:
try:
# 生成所有操作记录索引键 # 生成所有操作记录索引键
op_check_keys = [ op_check_keys = [
(row["rn"], row["name_title"], row["keyword"], row["v_xid"], row["createtime"]) (row["rn"], row["name_title"], row["keyword"], row["v_xid"], row["createtime"])
for row in op_rows for row in op_rows
] ]
if op_check_keys: # 仅当有键时才查询
try:
# 查询数据库已存在的操作记录 # 查询数据库已存在的操作记录
conn = _engine.connect() conn = _engine.connect()
stmt = select([ # 使用SQLAlchemy 1.4+的select语法
stmt = select(
video_op.c.rn, video_op.c.rn,
video_op.c.name_title, video_op.c.name_title,
video_op.c.keyword, video_op.c.keyword,
video_op.c.v_xid, video_op.c.v_xid,
video_op.c.createtime video_op.c.createtime
]).where( ).where(
tuple_( tuple_(
video_op.c.rn, video_op.c.rn,
video_op.c.name_title, video_op.c.name_title,
@ -883,6 +883,8 @@ class DBSA:
if index_key not in existing_db_op_keys and index_key not in existing_op_keys_batch: if index_key not in existing_db_op_keys and index_key not in existing_op_keys_batch:
final_op_rows.append(row) final_op_rows.append(row)
existing_op_keys_batch.add(index_key) existing_op_keys_batch.add(index_key)
else:
final_op_rows = op_rows[:] # 如果没有键，直接使用所有行
# ========== 作者表处理 ========== # ========== 作者表处理 ==========
authors_map = {} authors_map = {}