diff options
| author | Christophe Besson <cbesson@gmail.com> | 2026-08-30 16:31:44 +0200 |
|---|---|---|
| committer | Christophe Besson <cbesson@gmail.com> | 2026-08-30 16:31:44 +0200 |
| commit | b206dc86221d453c699074749f59f1d7cb3d47dc (patch) | |
| tree | 6db723f22ba49b892f07942ea93d04076d0f72fe /packages/meshbay-node/src/meshbay_node/indexer/title_parse.py | |
| parent | 4b64ba2513d3985c843167153311436a80474149 (diff) | |
| parent | 854b76338072979526ce36fbc176c82f6fc5d0bd (diff) | |
| download | meshbay-b206dc86221d453c699074749f59f1d7cb3d47dc.tar.gz | |
Merge branch 'fix/saga-match'
Diffstat (limited to 'packages/meshbay-node/src/meshbay_node/indexer/title_parse.py')
| -rw-r--r-- | packages/meshbay-node/src/meshbay_node/indexer/title_parse.py | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/packages/meshbay-node/src/meshbay_node/indexer/title_parse.py b/packages/meshbay-node/src/meshbay_node/indexer/title_parse.py index def947f..032dc58 100644 --- a/packages/meshbay-node/src/meshbay_node/indexer/title_parse.py +++ b/packages/meshbay-node/src/meshbay_node/indexer/title_parse.py @@ -129,7 +129,7 @@ def naive_title(filename: str) -> str: _PART_KEYWORDS = r"part|chapter|volume|vol|partie|chapitre|volet|livre|book|episode" _TRAILING_INDEX_RE = re.compile( - r"^(?P<base>.+?)(?:\s+(?:" + _PART_KEYWORDS + r"))?" + r"^(?P<base>.+?)(?:\s+(?P<kw>" + _PART_KEYWORDS + r"))?" r"\s+(?P<num>\d{1,2}|[ivxlcdm]{1,6}|" + "|".join(_NUMBER_WORDS) + r")$", re.IGNORECASE, ) @@ -151,8 +151,14 @@ def sequel_variants(title: str) -> list[str]: title: the file has a digit where TMDB uses a Roman numeral (or the reverse), spells the number out, or wraps it as "Part N" / "Chapitre N" (§3.3 row 4, §10.1/V10). Returns extra candidate titles to try — the - base alone, and the index re-rendered as digit and as Roman numeral. - Empty when `title` carries no recognisable trailing index. + index re-rendered as digit and as Roman numeral, plus (only when there + is no "Part"/"Episode"/… keyword) the bare base. + + The bare base is withheld for a keyword'd index — "Star Wars Episode + III" → "Star Wars" — because a franchise's bare name is very often a + real, *different* film (the 1977 original), and that variant matched + every episode to it (§10.1/V14). Without the keyword ("Jurassic Park 3") + the number is decoration and "Jurassic Park" is the right base to try. """ m = _TRAILING_INDEX_RE.match(title.strip()) if not m: @@ -164,12 +170,20 @@ def sequel_variants(title: str) -> list[str]: if n is None: return [] tok = m.group("num").lower() - out = [base] roman = _int_to_roman(n) - if roman and roman.lower() != tok: - out.append(f"{base} {roman}") - if str(n) != tok: - out.append(f"{base} {n}") + if m.group("kw"): + # keyword stripped ("… Part 2" -> base has neither the word nor the + # number), so both renderings are new; the bare base is withheld. + out = [f"{base} {n}"] + if roman: + out.append(f"{base} {roman}") + else: + # "Movie 2" — base already carries `tok`; only offer what differs. + out = [base] + if roman and roman.lower() != tok: + out.append(f"{base} {roman}") + if str(n) != tok: + out.append(f"{base} {n}") return [v for v in dict.fromkeys(out) if v != title] |