Update app.py

app.py

@@ -1169,7 +1169,7 @@ def start_telethon_worker():
         if data_changed: await asyncio.to_thread(save_data)
 
     # ===== 🌟 重写：多目标目录更新 =====
-    async def update_channel_dirs():
+        async def update_channel_dirs():
         current_time = int(time.time())
         data_changed = False
         for uid, u_data in DATA.get("users", {}).items():
@@ -1218,85 +1218,108 @@ def start_telethon_worker():
                             if msg_id_str in tags_map:
                                 del tags_map[msg_id_str]
                                 new_tags_found = True
+                except Exception as e:
+                    print(f"❌ [目录] 扫描异常 scan={scan_id}: {e}")
+                    continue
+
+                task['last_run'] = current_time
+
+                # ===== 🔧 修复核心：标签变化时重建缓存 =====
+                if new_tags_found or is_first_run:
+                    task['tags_map'] = tags_map
+                    task['scanned_msgs'] = scanned_msgs
+                    data_changed = True
+                    all_tags = set()
+                    for t_list in tags_map.values(): all_tags.update(t_list)
+                    active_tags = [t for t in all_tags if t not in blacklist]
+                    task['tags_cache'] = active_tags
+
+                    # 构建目录文本
+                    directory_map = {}
+                    for tag in active_tags:
+                        clean_str = tag[1:]
+                        if not clean_str: continue
+                        fc = clean_str[0]
+                        key = "#"
+                        if fc.isalpha() and fc.isascii(): key = fc.upper()
+                        elif fc.isdigit(): key = "0-9"
+                        elif '\u4e00' <= fc <= '\u9fff':
+                            try:
+                                py = lazy_pinyin(fc)
+                                if py and len(py[0]) > 0: key = py[0][0].upper()
+                            except NameError: key = "中文"
+                        if key not in directory_map: directory_map[key] = []
+                        directory_map[key].append(tag)
+
+                    dir_lines = []
+                    keys = sorted(directory_map.keys())
+                    if "0-9" in keys: keys.remove("0-9"); keys.insert(0, "0-9")
+                    for key in keys:
+                        tags_line = " ".join([html.escape(t) for t in sorted(directory_map[key])])
+                        dir_lines.append(f"{key}: {tags_line}")
+
+                    # 🔧 关键修复：只用一层 blockquote，不嵌套
+                    dir_body = "\n".join(dir_lines)
+                    task['_dir_body_cache'] = dir_body
+                    task['_dir_count_cache'] = len(active_tags)
+                    print(f"📂 [目录] 重建缓存: {len(active_tags)} 个标签")
+
+                # ===== 🔧 修复核心2：每轮都检查目标是否需要推送 =====
+                dir_body = task.get('_dir_body_cache', '')
+                tag_count = task.get('_dir_count_cache', 0)
+                if not dir_body and not tag_count:
+                    continue
+
+                beijing_tz = timezone(timedelta(hours=8))
+                now_str = datetime.now(beijing_tz).strftime("%m-%d %H:%M")
+                task_name = task.get('task_name', '标签目录')
+                safe_title = f"{html.escape(task_name)} ({tag_count})"
+                dir_text = f"<blockquote expandable>{dir_body}</blockquote>\n⏳ <code>最后更新: {now_str} (北京时间)</code>"
+
+                # 用标签数量+内容做指纹，不含时间戳
+                content_fingerprint = f"{tag_count}|{dir_body}"
+                last_html_per_target = task.setdefault('last_html_per_target', {})
 
-                    task['last_run'] = current_time
-                    if new_tags_found or is_first_run:
-                        task['tags_map'] = tags_map
-                        task['scanned_msgs'] = scanned_msgs
-                        data_changed = True
-                        all_tags = set()
-                        for t_list in tags_map.values(): all_tags.update(t_list)
-                        active_tags = [t for t in all_tags if t not in blacklist]
-                        task['tags_cache'] = active_tags
-                        directory_map = {}
-                        for tag in active_tags:
-                            clean_str = tag[1:]
-                            if not clean_str: continue
-                            fc = clean_str[0]
-                            key = "#"
-                            if fc.isalpha() and fc.isascii(): key = fc.upper()
-                            elif fc.isdigit(): key = "0-9"
-                            elif '\u4e00' <= fc <= '\u9fff':
-                                try:
-                                    py = lazy_pinyin(fc)
-                                    if py and len(py[0])>0: key = py[0][0].upper()
-                                except NameError: key = "中文"
-                            if key not in directory_map: directory_map[key] = []
-                            directory_map[key].append(tag)
-
-                        # ===== 🔧 修复：不再嵌套 blockquote =====
-                        dir_lines = []
-                        keys = sorted(directory_map.keys())
-                        if "0-9" in keys: keys.remove("0-9"); keys.insert(0, "0-9")
-                        for key in keys:
-                            tags_line = " ".join([html.escape(t) for t in sorted(directory_map[key])])
-                            dir_lines.append(f"{key}: {tags_line}")
+                for tgt in targets:
+                    tgt_ch = int(tgt['channel_id'])
+                    tgt_msg = int(tgt['msg_id'])
+                    tgt_key = f"{tgt_ch}_{tgt_msg}"
+
+                    if last_html_per_target.get(tgt_key) == content_fingerprint:
+                        continue
+
+                    print(f"📝 [目录] 正在推送到 {tgt_ch}/{tgt_msg}...")
+                    try:
+                        original_msg = await TL_CLIENT.get_messages(tgt_ch, ids=tgt_msg)
+                        if not original_msg:
+                            print(f"⚠️ [目录] 消息 {tgt_ch}/{tgt_msg} 不存在")
+                            continue
+
+                        if original_msg.raw_text:
+                            raw_html = tl_html.unparse(original_msg.raw_text, original_msg.entities)
+                            base_html = raw_html.split("➖➖➖➖➖➖")[0].rstrip() if "➖➖➖➖➖➖" in raw_html else raw_html.rstrip()
+                        else:
+                            base_html = ""
 
-                        beijing_tz = timezone(timedelta(hours=8))
-                        now_str = datetime.now(beijing_tz).strftime("%m-%d %H:%M")
+                        new_message_text = f"{base_html}{SEPARATOR_MARK}<b>{safe_title}</b>\n{dir_text}"
 
-                        # 只用一层 blockquote expandable，不再外套 blockquote
-                        dir_body = "\n".join(dir_lines)
-                        dir_text = f"<blockquote expandable>{dir_body}</blockquote>\n⏳ <code>最后更新: {now_str} (北京时间)</code>"
+                        if len(new_message_text) > 4000:
+                            new_message_text = new_message_text[:3900] + "\n</blockquote>\n⚠️ 目录过长已截断"
 
-                        task_name = task.get('task_name', '标签目录')
-                        safe_title_with_count = f"{html.escape(task_name)} ({len(active_tags)})"
+                        print(f"📏 [目录] 消息长度: {len(new_message_text)} 字符")
 
-                        last_html_per_target = task.setdefault('last_html_per_target', {})
-                        for tgt in targets:
-                            tgt_ch = int(tgt['channel_id'])
-                            tgt_msg = int(tgt['msg_id'])
-                            tgt_key = f"{tgt_ch}_{tgt_msg}"
+                        if original_msg.photo or original_msg.video or original_msg.document:
+                            bot.edit_message_caption(caption=new_message_text, chat_id=tgt_ch, message_id=tgt_msg, parse_mode="HTML")
+                        else:
+                            bot.edit_message_text(text=new_message_text, chat_id=tgt_ch, message_id=tgt_msg, parse_mode="HTML")
 
-                            # 用不含时间戳的内容做比对，避免每次都重复编辑
-                            content_hash = f"{len(active_tags)}|{dir_body}"
-                            if last_html_per_target.get(tgt_key) == content_hash:
-                                continue
+                        last_html_per_target[tgt_key] = content_fingerprint
+                        data_changed = True
+                        print(f"✅ [目录] 成功更新 {tgt_ch}/{tgt_msg}，标签数: {tag_count}")
+                    except Exception as e:
+                        print(f"❌ [目录] 推送失败 {tgt_ch}/{tgt_msg}: {e}")
+                    await asyncio.sleep(2)
 
-                            try:
-                                original_msg = await TL_CLIENT.get_messages(tgt_ch, ids=tgt_msg)
-                                if not original_msg: 
-                                    print(f"⚠️ [目录] 无法获取消息 {tgt_ch}/{tgt_msg}")
-                                    continue
-                                if original_msg.raw_text:
-                                    raw_html = tl_html.unparse(original_msg.raw_text, original_msg.entities)
-                                    base_html = raw_html.split("➖➖➖➖➖➖")[0].rstrip() if "➖➖➖➖➖➖" in raw_html else raw_html.rstrip()
-                                else: base_html = ""
-                                new_message_text = f"{base_html}{SEPARATOR_MARK}<b>{safe_title_with_count}</b>\n{dir_text}"
-                                if len(new_message_text) > 4000: new_message_text = new_message_text[:3900] + "\n</blockquote>\n⚠️ 目录过长已截断"
-
-                                if original_msg.photo or original_msg.video or original_msg.document:
-                                    bot.edit_message_caption(caption=new_message_text, chat_id=tgt_ch, message_id=tgt_msg, parse_mode="HTML")
-                                else:
-                                    bot.edit_message_text(text=new_message_text, chat_id=tgt_ch, message_id=tgt_msg, parse_mode="HTML")
-                                last_html_per_target[tgt_key] = content_hash
-                                data_changed = True
-                                print(f"✅ [目录] 已更新 {tgt_ch}/{tgt_msg}，标签数: {len(active_tags)}")
-                            except Exception as e:
-                                print(f"❌ [目录] 更新失败 {tgt_ch}/{tgt_msg}: {e}")
-                            await asyncio.sleep(2)
-                except Exception as e:
-                    print(f"❌ [目录] 扫描异常 scan={scan_id}: {e}")
         if data_changed: await asyncio.to_thread(save_data)
 
     TL_CLIENT.start()