feat: refactor report.py to add a test function and comment out the main loop; update report_video.py to comment out a test ticket processing call

This commit is contained in:
晓丰 2025-07-03 20:46:51 +08:00
parent 3ce782220f
commit 3fc898a0f1
2 changed files with 45 additions and 44 deletions

View File

@ -73,46 +73,47 @@ last_subsequent_run = 0
MAIN_INTERVAL = 60 * 5 # 每 5 分钟执行一次 MAIN_INTERVAL = 60 * 5 # 每 5 分钟执行一次
SUBSEQUENT_INTERVAL = 60 * 60 # 每 60 分钟执行一次 SUBSEQUENT_INTERVAL = 60 * 60 # 每 60 分钟执行一次
d.test()
while True: #
now = int(time.time()) # while True:
# now = int(time.time())
# 处理主流程 #
if now - last_main_run >= MAIN_INTERVAL: # # 处理主流程
last_main_run = now # if now - last_main_run >= MAIN_INTERVAL:
lis = db.item_report() # last_main_run = now
if len(lis) > 0: # lis = db.item_report()
for _, li in lis: # if len(lis) > 0:
print(li) # for _, li in lis:
logger.info(f"name:{li['name_title']},link:{li['link']} ") # print(li)
try: # logger.info(f"name:{li['name_title']},link:{li['link']} ")
info, report_id, status, report_ts = d.process_ticket(li['name_title'], li['link'])
subsequent_status = k.get(status, 1)
db.update_fight_record_status(
li['id'], report_id, 2, f"http://{ip}:5000/image/{info}",
report_ts, subsequent_status, MACHINE_ID
)
db.flush()
except Exception as e:
logger.error(f"ID:{li['id']}, e:{e}")
db.update_fight_record_status(li['id'], 0, 3, str(e), mid=MACHINE_ID)
time.sleep(60) # 出错延迟
if now - last_subsequent_run >= SUBSEQUENT_INTERVAL and IsSubsequent:
last_subsequent_run = now
subsequent_list = db.get_subsequent_report_video(MACHINE_ID)
if len(subsequent_list) > 0:
for li in subsequent_list:
rs_id = li['id']
r_id = li['report_id']
logger.info(f"subsequent id:{rs_id},report_id:{r_id} ")
# try: # try:
subsequent_status, info = d.report_follow_up(r_id) # info, report_id, status, report_ts = d.process_ticket(li['name_title'], li['link'])
db.update_subsequent_status_by_id( # subsequent_status = k.get(status, 1)
rs_id, subsequent_status, f"http://{ip}:5000/image/{info}" # db.update_fight_record_status(
) # li['id'], report_id, 2, f"http://{ip}:5000/image/{info}",
# report_ts, subsequent_status, MACHINE_ID
# )
# db.flush()
# except Exception as e: # except Exception as e:
# logger.logger.error(f"ID:{rs_id}, e:{e}") # logger.error(f"ID:{li['id']}, e:{e}")
# db.update_subsequent_status_by_id(rs_id, 1, str(e)) # db.update_fight_record_status(li['id'], 0, 3, str(e), mid=MACHINE_ID)
time.sleep(5) # 避免频繁请求 # time.sleep(60) # 出错延迟
time.sleep(5) #
# if now - last_subsequent_run >= SUBSEQUENT_INTERVAL and IsSubsequent:
# last_subsequent_run = now
# subsequent_list = db.get_subsequent_report_video(MACHINE_ID)
# if len(subsequent_list) > 0:
# for li in subsequent_list:
# rs_id = li['id']
# r_id = li['report_id']
# logger.info(f"subsequent id:{rs_id},report_id:{r_id} ")
# # try:
# subsequent_status, info = d.report_follow_up(r_id)
# db.update_subsequent_status_by_id(
# rs_id, subsequent_status, f"http://{ip}:5000/image/{info}"
# )
# # except Exception as e:
# # logger.logger.error(f"ID:{rs_id}, e:{e}")
# # db.update_subsequent_status_by_id(rs_id, 1, str(e))
# time.sleep(5) # 避免频繁请求
# time.sleep(5)

View File

@ -351,5 +351,5 @@ class DailymotionClient:
if __name__ == "__main__": if __name__ == "__main__":
dm = DailymotionClient("zhongpankeji@qq.com", "1q2w3eZp123@#") dm = DailymotionClient("zhongpankeji@qq.com", "1q2w3eZp123@#")
dm.process_ticket("恋爱学园","https://www.dailymotion.com/video/x9lfr24") # dm.process_ticket("恋爱学园","https://www.dailymotion.com/video/x9lfr24")
# dm.report_follow_up("2990081") # dm.report_follow_up("2990081")