From 4d588f3db6d1b8fdde45a1d9c911f24da6f16972 Mon Sep 17 00:00:00 2001 From: Franklin-F Date: Mon, 16 Jun 2025 21:16:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9report.py?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=BC=98=E5=8C=96=E5=90=8E=E7=BB=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E5=8F=AF=E8=BF=BD=E8=B8=AA=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report.py | 56 ++++++++++++++++++++++++------------------------- report_video.py | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/report.py b/report.py index 0df039f..2c796e9 100644 --- a/report.py +++ b/report.py @@ -16,47 +16,47 @@ last_main_run = 0 last_subsequent_run = 0 MAIN_INTERVAL = 60 * 5 # 每 5 分钟执行一次 -SUBSEQUENT_INTERVAL = 60 * 60 # 每 60 分钟执行一次 +SUBSEQUENT_INTERVAL = 60 * 2 # 每 60 分钟执行一次 while True: now = int(time.time()) # 处理主流程 - if now - last_main_run >= MAIN_INTERVAL: - last_main_run = now - lis = db.get_report_video() - if len(lis) > 0: - for li in lis: - logger.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://123.58.197.91:5000/image/{info}", - report_ts, subsequent_status - ) - db.flush() - except Exception as e: - logger.logger.error(f"ID:{li['id']}, e:{e}") - db.update_fight_record_status(li['id'], 0, 3, str(e)) - time.sleep(60) # 出错延迟 + # if now - last_main_run >= MAIN_INTERVAL: + # last_main_run = now + # lis = db.get_report_video() + # if len(lis) > 0: + # for li in lis: + # logger.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://123.58.197.91:5000/image/{info}", + # report_ts, subsequent_status + # ) + # db.flush() + # except Exception as e: + # logger.logger.error(f"ID:{li['id']}, e:{e}") + # db.update_fight_record_status(li['id'], 0, 3, str(e)) + # time.sleep(60) # 出错延迟 if now - last_subsequent_run >= SUBSEQUENT_INTERVAL: last_subsequent_run = now subsequent_list = db.get_subsequent_report_video() if len(subsequent_list) > 0: - for li in subsequent_list: + for li in subsequent_list: rs_id = li['id'] r_id = li['report_id'] logger.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://123.58.197.91: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)) + # try: + subsequent_status, info = d.report_follow_up(r_id) + db.update_subsequent_status_by_id( + rs_id, subsequent_status, f"http://123.58.197.91: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) \ No newline at end of file diff --git a/report_video.py b/report_video.py index a33cd0f..5a1b067 100644 --- a/report_video.py +++ b/report_video.py @@ -104,7 +104,7 @@ class DailymotionClient: proxy = None else: proxy={'server': 'http://127.0.0.1:7890'} - + logger.info(f"Launching DailymotionClient with headless={self.headless}, proxy={proxy}") self._pw = sync_playwright().start() self.browser: Browser = self._pw.chromium.launch( headless=self.headless,