fix: prevent duplicate Audiences unread messages

app/modules/indexer/parser/nexus_audiences.py

@@ -5,6 +5,7 @@ from urllib.parse import urljoin
 
 from lxml import etree
 
+from app.log import logger
 from app.modules.indexer.parser import SiteSchema
 from app.modules.indexer.parser.nexus_php import NexusPhpSiteUserInfo
 from app.utils.string import StringUtils
@@ -12,6 +13,7 @@ from app.utils.string import StringUtils
 
 class NexusAudiencesSiteUserInfo(NexusPhpSiteUserInfo):
     schema = SiteSchema.NexusAudiences
+    __UNKNOWN_UNREAD_COUNT = 99999
 
     def __init__(self, *args, **kwargs):
         """
@@ -21,6 +23,7 @@ class NexusAudiencesSiteUserInfo(NexusPhpSiteUserInfo):
         self._user_mail_unread_page = self.__build_unread_mailbox_page(box=1)
         self._sys_mail_unread_page = None
         self.__next_mail_page = 1
+        self.__seen_unread_message_links = set()
 
     def _parse_message_unread(self, html_text):
         """
@@ -44,6 +47,8 @@ class NexusAudiencesSiteUserInfo(NexusPhpSiteUserInfo):
                 if unread is not None:
                     self.message_unread = unread
                     return
+            if message_tools:
+                return
         finally:
             if html is not None:
                 del html
@@ -63,14 +68,113 @@ class NexusAudiencesSiteUserInfo(NexusPhpSiteUserInfo):
                 '//tr[.//img[contains(concat(" ", normalize-space(@class), " "), " unreadpm ") '
                 'or @alt="Unread" or @title="未读"]]/td/a[contains(@href, "viewmessage")]/@href'
             )
-            msg_links.extend(message_links)
+            new_message_links = self.__filter_new_message_links(message_links)
-            next_page = self.__build_next_unread_mailbox_page(bool(message_links))
+            if message_links and not new_message_links:
+                logger.warn(f"{self._site_name} 未读消息页只发现重复消息链接，停止后续翻页")
+            msg_links.extend(new_message_links)
+            next_page = self.__build_next_unread_mailbox_page(
+                self.__should_fetch_next_unread_page(new_message_links)
+            )
         finally:
             if html is not None:
                 del html
 
         return next_page
 
+    def _pase_unread_msgs(self):
+        """
+        解析 Audiences 未读消息，避免异常分页重复通知和空详情通知。
+        """
+        self.__reset_unread_message_parse_state()
+        unread_msg_links = []
+        if self.message_unread > 0 or self.message_read_force:
+            next_page = self.__parse_unread_message_list_page(
+                link=self._user_mail_unread_page,
+                unread_msg_links=unread_msg_links
+            )
+            while next_page:
+                next_page = self.__parse_unread_message_list_page(
+                    link=next_page,
+                    unread_msg_links=unread_msg_links
+                )
+        if self.message_unread == self.__UNKNOWN_UNREAD_COUNT:
+            self.message_unread = len(unread_msg_links)
+        elif unread_msg_links and not self.message_unread:
+            self.message_unread = len(unread_msg_links)
+        for msg_link in unread_msg_links:
+            logger.debug(f"{self._site_name} 信息链接 {msg_link}")
+            head, date, content = self._parse_message_content(
+                self._get_page_content(
+                    urljoin(self._base_url, msg_link),
+                    params=self._mail_content_params,
+                    headers=self._mail_content_headers
+                )
+            )
+            logger.debug(f"{self._site_name} 标题 {head} 时间 {date} 内容 {content}")
+            if self.__is_empty_message_content(head, date, content):
+                logger.warn(f"{self._site_name} 信息链接 {msg_link} 解析结果为空，跳过消息通知")
+                continue
+            self.message_unread_contents.append((head, date, content))
+
+    def __parse_unread_message_list_page(self, link: str, unread_msg_links: list):
+        """
+        读取并解析一页 Audiences 未读消息列表。
+        """
+        if not link:
+            return None
+        return self._parse_message_unread_links(
+            self._get_page_content(
+                url=urljoin(self._base_url, link),
+                params=self._mail_unread_params,
+                headers=self._mail_unread_headers
+            ),
+            unread_msg_links
+        )
+
+    def __reset_unread_message_parse_state(self):
+        """
+        重置 Audiences 未读消息分页状态，避免复用解析器时沿用上次页码和去重集合。
+        """
+        self.__next_mail_page = 1
+        self.__seen_unread_message_links.clear()
+
+    def __filter_new_message_links(self, message_links: list) -> list:
+        """
+        过滤 Audiences 异常分页重复返回的消息详情链接。
+        """
+        new_message_links = []
+        for message_link in message_links:
+            message_link_key = urljoin(self._base_url, message_link)
+            if message_link_key in self.__seen_unread_message_links:
+                continue
+            self.__seen_unread_message_links.add(message_link_key)
+            new_message_links.append(message_link)
+        return new_message_links
+
+    def __should_fetch_next_unread_page(self, new_message_links: list) -> bool:
+        """
+        判断是否还需要继续请求 Audiences 下一页未读消息列表。
+        """
+        if not new_message_links:
+            return False
+        return not self.__has_reached_expected_unread_count()
+
+    def __has_reached_expected_unread_count(self) -> bool:
+        """
+        已达到 Audiences 顶部栏给出的未读数时停止翻页。
+        """
+        return not self.message_read_force \
+            and self.message_unread > 0 \
+            and self.message_unread != self.__UNKNOWN_UNREAD_COUNT \
+            and len(self.__seen_unread_message_links) >= self.message_unread
+
+    @staticmethod
+    def __is_empty_message_content(head, date, content) -> bool:
+        """
+        判断消息详情是否完全为空，避免把解析失败页包装成 None 通知。
+        """
+        return not any(str(item).strip() for item in (head, date, content) if item is not None)
+
     @classmethod
     def __build_unread_mailbox_page(cls, box: int) -> str:
         """
@@ -208,26 +312,29 @@ class NexusAudiencesSiteUserInfo(NexusPhpSiteUserInfo):
         """
         从 Audiences 收件箱入口提取未读数。
         """
-        inbox_texts = [
+        for inbox_text in [
             message_link.get("title"),
             message_link.get("aria-label"),
-            *message_link.xpath(
+        ]:
-                './/*[contains(@class, "site-userbar__compact-tool-badge--unread") '
+            unread = self.__extract_inbox_unread_pair(inbox_text)
-                'or contains(@class, "site-userbar__compact-tool-badge")]/text()'
-            )
-        ]
-
-        for inbox_text in inbox_texts:
-            unread = self.__extract_inbox_unread(inbox_text)
             if unread is not None:
                 return unread
 
+        for inbox_text in message_link.xpath(
+                './/*[contains(@class, "site-userbar__compact-tool-badge--unread")]/text()'):
+            unread = self.__extract_inbox_unread_badge(inbox_text)
+            if unread is not None:
+                return unread
+
+        if self.__has_inbox_unread_marker(message_link):
+            return self.__UNKNOWN_UNREAD_COUNT
+
         return None
 
     @staticmethod
-    def __extract_inbox_unread(text: str):
+    def __extract_inbox_unread_pair(text: str):
         """
-        Audiences 收件箱角标格式为 总数/未读数，例如 1749/172。
+        从 Audiences 总数/未读数格式中提取未读数，例如 1749/172。
         """
         if not text:
             return None
@@ -240,11 +347,35 @@ class NexusAudiencesSiteUserInfo(NexusPhpSiteUserInfo):
         if inbox_count:
             return StringUtils.str_int(inbox_count.group(2))
 
-        single_count = re.search(r"收件箱\s*(\d[\d,]*)", text)
+        return None
+
+    @staticmethod
+    def __extract_inbox_unread_badge(text: str):
+        """
+        从明确的未读角标中提取未读数，避免把普通收件箱总数误作未读。
+        """
+        unread = NexusAudiencesSiteUserInfo.__extract_inbox_unread_pair(text)
+        if unread is not None:
+            return unread
+
+        if not text:
+            return None
+        text = re.sub(r"\s+", " ", text.replace("\xa0", " ")).strip()
+        single_count = re.fullmatch(r"(\d[\d,]*)", text)
         if single_count:
             return StringUtils.str_int(single_count.group(1))
         return None
 
+    @staticmethod
+    def __has_inbox_unread_marker(message_link) -> bool:
+        """
+        判断收件箱入口是否只有未读状态但没有可靠数量。
+        """
+        link_class = message_link.get("class") or ""
+        if "site-userbar__compact-tool--has-unread" in link_class:
+            return True
+        return bool(message_link.xpath('.//*[contains(@class, "site-userbar__compact-tool-badge--unread")]'))
+
     def _parse_seeding_pages(self):
         if not self._torrent_seeding_page:
             return

tests/test_nexus_audiences_parser.py

@@ -83,6 +83,92 @@ def test_audiences_inbox_total_unread_badge_uses_unread_part():
     assert parser.message_unread == 172
 
 
+def test_audiences_inbox_total_only_is_not_unread_count():
+    parser = NexusAudiencesSiteUserInfo(
+        site_name="Audiences",
+        url="https://audiences.me/",
+        site_cookie="",
+        apikey=None,
+        token=None,
+    )
+    html_text = """
+    <html>
+      <body>
+        <div class="site-userbar__compact-actions">
+          <a class="site-userbar__compact-tool"
+             href="messages.php"
+             title="收件箱 1749"
+             aria-label="收件箱 1749">
+            <strong>收件箱</strong>
+            <span class="site-userbar__compact-tool-badge">1749</span>
+          </a>
+        </div>
+      </body>
+    </html>
+    """
+
+    parser._parse_message_unread(html_text)
+
+    assert parser.message_unread == 0
+
+
+def test_audiences_unread_badge_plain_count_is_unread_count():
+    parser = NexusAudiencesSiteUserInfo(
+        site_name="Audiences",
+        url="https://audiences.me/",
+        site_cookie="",
+        apikey=None,
+        token=None,
+    )
+    html_text = """
+    <html>
+      <body>
+        <div class="site-userbar__compact-actions">
+          <a class="site-userbar__compact-tool site-userbar__compact-tool--has-unread"
+             href="messages.php"
+             title="收件箱 1749"
+             aria-label="收件箱 1749">
+            <strong>收件箱</strong>
+            <span class="site-userbar__compact-tool-badge site-userbar__compact-tool-badge--unread">172</span>
+          </a>
+        </div>
+      </body>
+    </html>
+    """
+
+    parser._parse_message_unread(html_text)
+
+    assert parser.message_unread == 172
+
+
+def test_audiences_unread_marker_without_count_uses_unknown_count():
+    parser = NexusAudiencesSiteUserInfo(
+        site_name="Audiences",
+        url="https://audiences.me/",
+        site_cookie="",
+        apikey=None,
+        token=None,
+    )
+    html_text = """
+    <html>
+      <body>
+        <div class="site-userbar__compact-actions">
+          <a class="site-userbar__compact-tool site-userbar__compact-tool--has-unread"
+             href="messages.php"
+             title="收件箱"
+             aria-label="收件箱">
+            <strong>收件箱</strong>
+          </a>
+        </div>
+      </body>
+    </html>
+    """
+
+    parser._parse_message_unread(html_text)
+
+    assert parser.message_unread == 99999
+
+
 def test_audiences_table_unread_links_ignore_content_rows():
     parser = NexusAudiencesSiteUserInfo(
         site_name="Audiences",
@@ -226,16 +312,212 @@ def test_audiences_unread_links_increment_page_until_empty():
       </body>
     </html>
     """
+    next_html_text = html_text.replace("4318225", "4318226").replace("种子被删除", "系统通知")
     msg_links = []
 
     next_page = parser._parse_message_unread_links(html_text, msg_links)
-    next_next_page = parser._parse_message_unread_links(html_text, msg_links)
+    next_next_page = parser._parse_message_unread_links(next_html_text, msg_links)
     stop_page = parser._parse_message_unread_links("<html><body><table></table></body></html>", msg_links)
 
     assert msg_links == [
         "messages.php?action=viewmessage&id=4318225",
-        "messages.php?action=viewmessage&id=4318225",
+        "messages.php?action=viewmessage&id=4318226",
     ]
     assert next_page == "messages.php?action=viewmailbox&box=1&unread=yes&page=1"
     assert next_next_page == "messages.php?action=viewmailbox&box=1&unread=yes&page=2"
     assert stop_page is None
+
+
+def test_audiences_unread_messages_stop_when_pages_repeat():
+    """
+    Audiences 异常分页重复返回同一批消息时，应停止翻页并只通知一次。
+    """
+    parser = NexusAudiencesSiteUserInfo(
+        site_name="Audiences",
+        url="https://audiences.me/",
+        site_cookie="",
+        apikey=None,
+        token=None,
+    )
+    parser.message_unread = 172
+    list_html = """
+    <html>
+      <body>
+        <table>
+          <tr>
+            <td class="rowfollow" align="center">
+              <img class="unreadpm" src="pic/trans.gif" alt="Unread" title="未读">
+            </td>
+            <td class="rowfollow" align="left">
+              <a href="messages.php?action=viewmessage&amp;id=4318225">种子被删除</a>
+            </td>
+          </tr>
+        </table>
+      </body>
+    </html>
+    """
+    requested_urls = []
+
+    def fake_get_page_content(url, params=None, headers=None):
+        """
+        模拟观众分页异常：每个未读列表页都返回同一个消息链接。
+        """
+        requested_urls.append(url)
+        return "<html></html>" if "viewmessage" in url else list_html
+
+    def fake_parse_message_content(_):
+        """
+        返回可识别的消息详情，便于验证重复链接没有被重复通知。
+        """
+        return "种子被删除", "2026-05-07 23:01:58", "消息摘要内容"
+
+    parser._get_page_content = fake_get_page_content
+    parser._parse_message_content = fake_parse_message_content
+
+    parser._pase_unread_msgs()
+
+    mailbox_requests = [url for url in requested_urls if "viewmailbox" in url]
+    detail_requests = [url for url in requested_urls if "viewmessage" in url]
+    assert mailbox_requests == [
+        "https://audiences.me/messages.php?action=viewmailbox&box=1&unread=yes",
+        "https://audiences.me/messages.php?action=viewmailbox&box=1&unread=yes&page=1",
+    ]
+    assert detail_requests == [
+        "https://audiences.me/messages.php?action=viewmessage&id=4318225"
+    ]
+    assert parser.message_unread_contents == [
+        ("种子被删除", "2026-05-07 23:01:58", "消息摘要内容")
+    ]
+
+
+def test_audiences_unread_messages_skip_empty_detail():
+    """
+    详情页解析失败时，不应把全 None 的消息写入通知列表。
+    """
+    parser = NexusAudiencesSiteUserInfo(
+        site_name="Audiences",
+        url="https://audiences.me/",
+        site_cookie="",
+        apikey=None,
+        token=None,
+    )
+    parser.message_unread = 1
+    list_html = """
+    <html>
+      <body>
+        <table>
+          <tr>
+            <td class="rowfollow" align="center">
+              <img class="unreadpm" src="pic/trans.gif" alt="Unread" title="未读">
+            </td>
+            <td class="rowfollow" align="left">
+              <a href="messages.php?action=viewmessage&amp;id=4318225">种子被删除</a>
+            </td>
+          </tr>
+        </table>
+      </body>
+    </html>
+    """
+
+    def fake_get_page_content(url, params=None, headers=None):
+        """
+        未读列表正常返回链接，消息详情页返回无法解析的空页面。
+        """
+        return "<html></html>" if "viewmessage" in url else list_html
+
+    def fake_parse_message_content(_):
+        """
+        模拟详情页解析不到标题、时间和内容。
+        """
+        return None, None, None
+
+    parser._get_page_content = fake_get_page_content
+    parser._parse_message_content = fake_parse_message_content
+
+    parser._pase_unread_msgs()
+
+    assert parser.message_unread_contents == []
+
+
+def test_audiences_unknown_unread_count_updates_from_collected_links():
+    """
+    只有未读状态没有可靠数量时，最终用实际抓到的未读链接数回填。
+    """
+    parser = NexusAudiencesSiteUserInfo(
+        site_name="Audiences",
+        url="https://audiences.me/",
+        site_cookie="",
+        apikey=None,
+        token=None,
+    )
+    parser.message_unread = 99999
+    first_list_html = """
+    <html>
+      <body>
+        <table>
+          <tr>
+            <td class="rowfollow" align="center">
+              <img class="unreadpm" src="pic/trans.gif" alt="Unread" title="未读">
+            </td>
+            <td class="rowfollow" align="left">
+              <a href="messages.php?action=viewmessage&amp;id=4318225">种子被删除</a>
+            </td>
+          </tr>
+        </table>
+      </body>
+    </html>
+    """
+    second_list_html = first_list_html.replace("4318225", "4318226").replace("种子被删除", "系统通知")
+
+    def fake_get_page_content(url, params=None, headers=None):
+        """
+        模拟未读数量未知时正常翻到空页为止。
+        """
+        if "viewmessage" in url:
+            return "<html></html>"
+        if "page=1" in url:
+            return second_list_html
+        if "page=2" in url:
+            return "<html><body><table></table></body></html>"
+        return first_list_html
+
+    def fake_parse_message_content(html_text):
+        """
+        返回固定消息详情，测试重点是未知数量回填。
+        """
+        return "标题", "2026-05-07 23:01:58", "内容"
+
+    parser._get_page_content = fake_get_page_content
+    parser._parse_message_content = fake_parse_message_content
+
+    parser._pase_unread_msgs()
+
+    assert parser.message_unread == 2
+    assert len(parser.message_unread_contents) == 2
+
+
+def test_audiences_unknown_unread_count_resets_when_no_links():
+    """
+    未知未读数量但列表为空时，不保留 99999 作为通知数量。
+    """
+    parser = NexusAudiencesSiteUserInfo(
+        site_name="Audiences",
+        url="https://audiences.me/",
+        site_cookie="",
+        apikey=None,
+        token=None,
+    )
+    parser.message_unread = 99999
+
+    def fake_get_page_content(url, params=None, headers=None):
+        """
+        模拟站点标记有未读但未读列表为空。
+        """
+        return "<html><body><table></table></body></html>"
+
+    parser._get_page_content = fake_get_page_content
+
+    parser._pase_unread_msgs()
+
+    assert parser.message_unread == 0
+    assert parser.message_unread_contents == []