From 4df028d49fd7827b822ab61fc960cf15f347da27 Mon Sep 17 00:00:00 2001
From: flippedyizheng <46236786+flipped0119@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:44:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(metainfo):=20=E5=89=AF=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=B8=AD=E8=A2=AB=E5=90=A6=E5=AE=9A=E7=9A=84=E5=AD=A3=E9=9B=86?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E5=86=8D=E8=AF=86=E5=88=AB=E4=B8=BA=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=AD=A3=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

与 MoviePilot-Rust 同步 Python 兜底解析：副标题季/集正则增加「不包含/不包括/不含」
否定前缀的反向断言，避免「不包含 第二季」被识别为第 2 季，导致未标季号的第一季合集
命中第二季订阅并将订阅判定完成。补充 Python 兜底解析单测。
---
 app/domain/meta/metabase.py |  8 +++----
 tests/test_metainfo.py      | 47 +++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/app/domain/meta/metabase.py b/app/domain/meta/metabase.py
index ae7bd6c33..5c8dfaabc 100644
--- a/app/domain/meta/metabase.py
+++ b/app/domain/meta/metabase.py
@@ -19,9 +19,9 @@ logger = logging.getLogger(__name__)
 
 TITLE_EPISODE_RE = re.compile(r"Episode\s+(\d{1,4})", re.IGNORECASE)
 SUBTITLE_HAS_SEASON_EPISODE_RE = re.compile(r"[全第季集话話期幕]", re.IGNORECASE)
-SUBTITLE_SEASON_RE = re.compile(r"(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十S\-]+)\s*季(?!\s*[全共])", re.IGNORECASE)
+SUBTITLE_SEASON_RE = re.compile(r"(?<!(?:不包含|不包括|不含)\s*)(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十S\-]+)\s*季(?!\s*[全共])", re.IGNORECASE)
 SUBTITLE_SEASON_ALL_RE = re.compile(r"[全共]\s*([0-9一二三四五六七八九十]+)\s*季", re.IGNORECASE)
-SUBTITLE_EPISODE_RE = re.compile(r"(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十百零EP]+)\s*[集话話期幕](?!\s*[全共])", re.IGNORECASE)
+SUBTITLE_EPISODE_RE = re.compile(r"(?<!(?:不包含|不包括|不含)\s*)(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十百零EP]+)\s*[集话話期幕](?!\s*[全共])", re.IGNORECASE)
 SUBTITLE_EPISODE_BETWEEN_RE = re.compile(
     r"[第]*\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]?\s*-\s*第*\s*"
     r"([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]",
@@ -245,9 +245,9 @@ class MetaBase(object):
 
     _subtitle_flag = False
     _title_episodel_re = r"Episode\s+(\d{1,4})"
-    _subtitle_season_re = r"(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十S\-]+)\s*季(?!\s*[全共])"
+    _subtitle_season_re = r"(?<!(?:不包含|不包括|不含)\s*)(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十S\-]+)\s*季(?!\s*[全共])"
     _subtitle_season_all_re = r"[全共]\s*([0-9一二三四五六七八九十]+)\s*季"
-    _subtitle_episode_re = r"(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十百零EP]+)\s*[集话話期幕](?!\s*[全共])"
+    _subtitle_episode_re = r"(?<!(?:不包含|不包括|不含)\s*)(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十百零EP]+)\s*[集话話期幕](?!\s*[全共])"
     _subtitle_episode_between_re = r"[第]*\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]?\s*-\s*第*\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]"
     _subtitle_episode_all_re = r"([0-9一二三四五六七八九十百零]+)\s*集\s*全|[全共]\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]"
 
diff --git a/tests/test_metainfo.py b/tests/test_metainfo.py
index aaa15c090..daf8f5ccd 100644
--- a/tests/test_metainfo.py
+++ b/tests/test_metainfo.py
@@ -536,6 +536,53 @@ def test_python_subtitle_episode_range_end_variant():
     assert meta_cn.end_episode == 12
 
 
+@pytest.mark.parametrize(
+    "subtitle",
+    [
+        "【赛博朋克：边缘行者】 转载 不包含 第二季",
+        "赛博朋克：边缘行者 不含第2季",
+        "赛博朋克：边缘行者 不包括 第二季",
+    ],
+)
+def test_python_subtitle_negated_season_is_ignored(subtitle):
+    """
+    副标题中被“不包含/不含/不包括”否定的季号不应作为资源季号。
+    """
+    with patch("app.adapters.system.rust.parse_metainfo", return_value=None):
+        meta = MetaInfo(
+            title="[Nekomoe kissaten&VCB-Studio] Cyberpunk Edgerunners [Ma10p_1080p]",
+            subtitle=subtitle,
+        )
+
+    assert meta.begin_season is None
+
+
+def test_python_subtitle_negated_season_keeps_affirmed_season():
+    """
+    副标题同时声明包含与不包含的季时，只采用未被否定的季号。
+    """
+    with patch("app.adapters.system.rust.parse_metainfo", return_value=None):
+        meta = MetaInfo(
+            title="Cyberpunk Edgerunners 2022 1080p NF WEB-DL x264 DDP5.1-GRP",
+            subtitle="赛博朋克：边缘行者 第一季 不包含第二季",
+        )
+
+    assert meta.begin_season == 1
+
+
+def test_python_subtitle_negated_episode_is_ignored():
+    """
+    副标题中被否定的集号不应作为资源集号。
+    """
+    with patch("app.adapters.system.rust.parse_metainfo", return_value=None):
+        meta = MetaInfo(
+            title="Some Show S01 2022 1080p WEB-DL H264-GRP",
+            subtitle="某剧 不含第13集",
+        )
+
+    assert meta.begin_episode is None
+
+
 def test_python_subtitle_year_range_not_treated_as_episodes():
     """
     年份范围（如 2019-2020）不得误识别为集数。