Update pages/monitor_playback.py

pages/monitor_playback.py

@@ -23,7 +23,7 @@ load_dotenv()
 
 PUSHOVER_TOKEN = os.getenv("PUSHOVER_TOKEN", "")
 PUSHOVER_USER = os.getenv("PUSHOVER_USER", "")
-# 修改：使用 NTFY 配置
+# 使用 NTFY 配置
 NTFY_TOPIC = os.getenv("ntfy_code", "gzhdhdtz")
 
 CINEMA_ID = os.getenv("CINEMA_ID", "44001291")
@@ -48,7 +48,6 @@ class DailyStats:
     """每日运行数据统计"""
     def __init__(self):
         self.reset()
-        # 用于保存前一天的数据以便发送报告
         self.yesterday_stats = {
             'zero_sessions': 0,
             'triggers': 0,
@@ -103,21 +102,17 @@ def extract_hall_number_raw(hall_name):
     return match.group(1) if match else str(hall_name)
 
 def format_hall_name(hall_name):
-    """
-    格式化影厅名称：
-    【和成天下1号厅】 -> 1号厅
-    """
+    """格式化影厅名称：【和成天下1号厅】 -> 1号厅"""
     match = re.search(r'(\d+)号', str(hall_name))
     if match:
         return f"{match.group(1)}号厅"
     return str(hall_name)
 
 
-# --- 3. 通知系统 (Pushover + NTFY) ---
+# --- 3. 通知系统 ---
 class NotificationManager:
     def __init__(self):
         self.ntfy_queue = queue.Queue()
-        # 启动 NTFY 发送线程
         self.worker_thread = threading.Thread(target=self._ntfy_worker, daemon=True)
         self.worker_thread.start()
 
@@ -139,10 +134,8 @@ class NotificationManager:
             daily_stats.notify_fails += 1
 
     def _ntfy_worker(self):
-        """NTFY 后台发送线程"""
         while True:
             try:
-                # 获取任务: (title, message, priority)
                 item = self.ntfy_queue.get()
                 if item is None: break
 
@@ -150,14 +143,10 @@ class NotificationManager:
 
                 if NTFY_TOPIC:
                     url = f"https://ntfy.sh/{NTFY_TOPIC}"
-                    
-                    # 转换优先级: Pushover(0/1) -> NTFY headers
                     headers = {
                         "Title": title.encode('utf-8'),
                         "Priority": "high" if priority >= 1 else "default",
-                        # "Tags": "warning" if priority >= 1 else "white_check_mark"
                     }
-                    
                     try:
                         requests.post(url, data=message.encode('utf-8'), headers=headers, timeout=10)
                     except Exception as e:
@@ -171,13 +160,9 @@ class NotificationManager:
                 time.sleep(5)
 
     def send_alert(self, title, message, priority=0):
-        """统一发送接口：内容一致"""
+        """统一发送接口"""
         daily_stats.triggers += 1
-        
-        # 1. Pushover
         self.send_pushover(title, message, priority)
-        
-        # 2. NTFY (入队)
         self.ntfy_queue.put((title, message, priority))
 
     def send_daily_report(self, today_date):
@@ -195,9 +180,7 @@ class NotificationManager:
             f"（包括排片数据API和获取TMS数据API）"
         )
         
-        # Pushover
         self.send_pushover(title, msg, priority=0)
-        # NTFY
         self.ntfy_queue.put((title, msg, 0))
 
 
@@ -401,7 +384,7 @@ class PlaybackMonitor:
         return check_points
 
     def _run_loop(self):
-        self.log("🚀 智能防空转监控已启动 (NTFY版)")
+        self.log("🚀 智能防空转监控已启动 (09:00唤醒修复版)")
         
         while True:
             try:
@@ -418,7 +401,6 @@ class PlaybackMonitor:
                     if now.time() >= dt_time(9, 0):
                         need_refresh = True
                         
-                        # 日期变更结算
                         daily_stats.snapshot_as_yesterday(self.current_business_date)
                         self.cleared_sessions.clear()
                         self.processed_checks.clear()
@@ -431,7 +413,6 @@ class PlaybackMonitor:
                         self.current_business_date = biz_date
                         self.log(f"✅ 排片已更新，共 {len(schedule)} 场。")
                         
-                        # 发送每日报告
                         try:
                             d_obj = datetime.strptime(biz_date, "%Y-%m-%d")
                             date_cn = f"{d_obj.year}年{d_obj.month}月{d_obj.day}日"
@@ -464,20 +445,39 @@ class PlaybackMonitor:
                 
                 if next_target:
                     target_time = next_target['time']
+                    
+                    # === 核心修复：09:00 拦截器 ===
+                    # 如果当前时间早于 09:00，且下一场电影晚于 09:00，
+                    # 必须在 09:00 醒来处理新的一天初始化，不能一觉睡过头。
+                    nine_am_today = datetime.combine(now.date(), dt_time(9, 0))
+                    
+                    force_wake_for_daily_reset = False
+                    if now < nine_am_today and target_time > nine_am_today:
+                        target_time = nine_am_today
+                        force_wake_for_daily_reset = True
+                        
                     sleep_seconds = max(0, (target_time - now).total_seconds())
                     
                     self.status_text = f"💤 休眠中 (等待: {target_time.strftime('%H:%M')})"
                     self.next_wakeup_str = target_time.strftime('%H:%M:%S')
                     
-                    raw_hall = next_target['data']['hallName']
-                    clean_hall = format_hall_name(raw_hall)
-                    self.active_monitors = [f"下个任务: {clean_hall} {next_target['data']['showStartTime']} (第{next_target['check_index']+1}次检查)"]
+                    if force_wake_for_daily_reset:
+                        self.active_monitors = ["等待 09:00 日报刷新..."]
+                    else:
+                        raw_hall = next_target['data']['hallName']
+                        clean_hall = format_hall_name(raw_hall)
+                        self.active_monitors = [f"下个任务: {clean_hall} {next_target['data']['showStartTime']} (第{next_target['check_index']+1}次检查)"]
                     
                     self.log(f"💤 智能休眠 {int(sleep_seconds)}秒，将在 {self.next_wakeup_str} 唤醒...")
                     
                     time.sleep(sleep_seconds)
                     
-                    # --- 唤醒 ---
+                    # 如果是被强制唤醒来做日报刷新的，直接跳过后续的检查逻辑，
+                    # continue 会回到循环头部，触发 if now >= 9:00 的初始化逻辑。
+                    if force_wake_for_daily_reset:
+                        continue
+                    
+                    # --- 正常唤醒检查 ---
                     self.status_text = "🔥 正在执行检查..."
                     self.log("⏰ 唤醒！正在同步最新票务数据...")
                     
@@ -577,7 +577,6 @@ class PlaybackMonitor:
                     self.processed_checks.add(dedup_key)
                     continue
 
-                # 格式化
                 hall_name_clean = format_hall_name(hall_name_raw)
                 status_desc = f"{hall_name_clean} {ticket_start_str} (第{check_idx+1}/3次)"
                 
@@ -596,7 +595,6 @@ class PlaybackMonitor:
                         status_desc += " ⚠️ [空转! TMS未撤]"
                         self.log(f"🚨 发现空转: {hall_name_clean}《{movie_name}》")
                         
-                        # --- 文案定制 (完全一致) ---
                         title = f"💸 发现{hall_name_clean}空场空转！"
                         msg = (
                             f"{hall_name_clean} {ticket_start_str}《{movie_name}》\n"