diff --git a/report.py b/report.py index 83aeb5b..693afa1 100644 --- a/report.py +++ b/report.py @@ -73,46 +73,47 @@ last_subsequent_run = 0 MAIN_INTERVAL = 60 * 5 # 每 5 分钟执行一次 SUBSEQUENT_INTERVAL = 60 * 60 # 每 60 分钟执行一次 - -while True: - now = int(time.time()) - - # 处理主流程 - if now - last_main_run >= MAIN_INTERVAL: - last_main_run = now - lis = db.item_report() - if len(lis) > 0: - for _, li in lis: - print(li) - logger.info(f"name:{li['name_title']},link:{li['link']} ") - try: - 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: - 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) +d.test() +# +# while True: +# now = int(time.time()) +# +# # 处理主流程 +# if now - last_main_run >= MAIN_INTERVAL: +# last_main_run = now +# lis = db.item_report() +# if len(lis) > 0: +# for _, li in lis: +# print(li) +# logger.info(f"name:{li['name_title']},link:{li['link']} ") +# try: +# 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: +# 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) diff --git a/report_video.py b/report_video.py index e747b9a..83e7e7b 100644 --- a/report_video.py +++ b/report_video.py @@ -351,5 +351,5 @@ class DailymotionClient: if __name__ == "__main__": 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")