fix(metadata): purge unwanted Ms.Rose & Mr.Cane and resolve Obsession to official 2026 Curry Barker release

apex/apex_stream/tmdb_meta.py

@@ -641,6 +641,21 @@ def best_tmdb_match(results: List[Dict], query: str, media_type: str,
             elif not is_indian and lang == "en" and hit_lang not in {"en", ""}:
                 score -= 0.35
 
+        # Boost real distributed films with popularity/votes/artwork over zero-vote placeholders
+        try:
+            pop = float(r.get("popularity") or 0.0)
+            votes = int(r.get("vote_count") or 0)
+            if pop >= 5.0 or votes >= 10:
+                score += 0.20
+            if r.get("poster_path"):
+                score += 0.10
+            if r.get("backdrop_path") or r.get("overview"):
+                score += 0.05
+            if not r.get("poster_path") and votes == 0:
+                score -= 0.15
+        except (ValueError, TypeError):
+            pass
+
         if score > best_score:
             best, best_score = r, score
     return best if best_score >= threshold else None

apex/combined-entrypoint.sh

@@ -56,7 +56,8 @@ restore_jellyfin_local() {
 
     # Permanently delete TV Shows/English and blacklisted demo episodes from media paths
     rm -rf "/data/jellyfin/media/TV Shows/English" "/opt/jellyfin-local/media/TV Shows/English" 2>/dev/null || true
-    find /data/jellyfin/media -iname "*mot*test*servicing*" -exec rm -rf {} + 2>/dev/null || true
+    find /data/jellyfin/media /data/movies /data/tvshows -iname "*mot*test*servicing*" -exec rm -rf {} + 2>/dev/null || true
+    find /data/jellyfin/media /data/movies /data/tvshows -iname "*rose*cane*" -exec rm -rf {} + 2>/dev/null || true
 
     # Purge old low-res Jellyfin image cache so newly fetched HD/4K artwork is displayed immediately
     rm -rf "$LOCAL_ROOT/cache/images"/* /data/jellyfin/cache/images/* 2>/dev/null || true

apex/repair_jellyfin_libraries.py

@@ -100,11 +100,14 @@ def repair_database(db_path: str) -> bool:
                 print(f"[REPAIR] Healed '{name}' ({row_id}): Path -> '{views_path}', Locations -> {locs}")
                 repaired += 1
 
-        # Permanently purge blacklisted demo items and invalid TV Shows/English items
+        # Permanently purge blacklisted demo items, Ms.Rose & Mr.Cane, and invalid TV Shows/English items
         cur.execute(
             "DELETE FROM BaseItems WHERE Path LIKE '%/TV Shows/English%' "
             "OR Path LIKE '%Mot test servicing%' "
             "OR Name LIKE '%Mot test servicing%' "
+            "OR Path LIKE '%Rose%Cane%' "
+            "OR Name LIKE '%Rose%Cane%' "
+            "OR Name LIKE '%Ms.Rose%' "
             "OR (Name = 'English' AND type LIKE '%Series%')"
         )
         purged = cur.rowcount

apex/tests/test_tmdb_meta.py

@@ -534,4 +534,38 @@ class TestNfoRepair:
         assert backdrop.exists()
 
         with Image.open(str(backdrop)) as out_img:
-            assert out_img.size == (1920, 1080)
+            assert out_img.size == (1920, 1080)
+
+    def test_ms_rose_mr_cane_blacklisted(self):
+        from tg_streamer import is_blacklisted
+        assert is_blacklisted("Ms.Rose & Mr.Cane") is True
+        assert is_blacklisted("Ms Rose & Mr Cane 2026") is True
+        assert is_blacklisted("Ms. Rose & Mr. Cane (2026).strm") is True
+        assert is_blacklisted("Mot test servicing") is True
+        assert is_blacklisted("Obsession (2025).strm") is False
+
+    def test_popular_movie_preferred_within_one_year_gap(self):
+        candidates = [
+            {
+                "id": 999999,
+                "title": "Obsession",
+                "release_date": "2025-01-01",
+                "popularity": 0.5,
+                "vote_count": 0,
+                "poster_path": None,
+                "backdrop_path": None,
+            },
+            {
+                "id": 1339713,
+                "title": "Obsession",
+                "release_date": "2026-05-15",
+                "popularity": 65.0,
+                "vote_count": 450,
+                "poster_path": "/obsession_poster.jpg",
+                "backdrop_path": "/obsession_backdrop.jpg",
+                "overview": "A man uses a mystical charm to make his crush fall in love.",
+            }
+        ]
+        match = best_tmdb_match(candidates, "obsession", "movie", year=2025)
+        assert match is not None
+        assert match["id"] == 1339713

apex/tg_streamer.py

@@ -19,6 +19,7 @@ from typing import Optional
 
 _BLACKLIST_PATTERNS = [
     re.compile(r"mot\s*test\s*servicing", re.IGNORECASE),
+    re.compile(r"ms\.?\s*rose\s*&?\s*mr\.?\s*cane", re.IGNORECASE),
 ]
 
 
@@ -1064,23 +1065,31 @@ async def _tmdb_search(media_type, query, year=None, language=None):
     params = {"query": query or "", "include_adult": "false"}
     if language:
         params["language"] = language
+
+    results = []
     if year:
+        yparams = dict(params)
         if media_type == "tv":
-            params["first_air_date_year"] = int(year)
+            yparams["first_air_date_year"] = int(year)
         else:
-            params["year"] = int(year)
-    data = await _tmdb_get(f"/search/{media_type}", params)
-    results = data.get("results") or [] if data else []
-    # Release filenames often contain an incorrect/future year. Retry without
-    # the year so a valid TMDB title can still be matched and enriched.
-    if not results and year:
-        params.pop("year", None)
-        params.pop("first_air_date_year", None)
-        data = await _tmdb_get(f"/search/{media_type}", params)
-        results = data.get("results") or [] if data else []
-    if results:
-        return results
-    return []
+            yparams["year"] = int(year)
+        data = await _tmdb_get(f"/search/{media_type}", yparams)
+        results = (data.get("results") or []) if data else []
+
+    # Also query without strict year filter so releases where festival premiere year
+    # vs theatrical release year differ by 1 year (e.g. Obsession 2025 festival vs 2026 theatrical)
+    # are included in candidate hits for best_tmdb_match to rank.
+    data_all = await _tmdb_get(f"/search/{media_type}", params)
+    all_results = (data_all.get("results") or []) if data_all else []
+
+    seen = set()
+    merged = []
+    for r in results + all_results:
+        rid = r.get("id")
+        if rid and rid not in seen:
+            seen.add(rid)
+            merged.append(r)
+    return merged
 
 
 async def _tmdb_find(external_id):
@@ -1365,6 +1374,21 @@ async def _enrich_media_metadata(entry):
                         f"[TMDB-LANG] '{entry.get('title')}' matched via language '{lang_code}'"
                     )
                     break
+
+        # Specific resolution for known modern blockbuster titles with festival vs theatrical date skew:
+        # "Obsession" (2025 PSA release -> 2026 theatrical release, TMDB ID 1339713 by Curry Barker)
+        raw_name_lower = (entry.get("file_name") or entry.get("raw_name") or entry.get("title") or "").lower()
+        if "obsession" in raw_name_lower and entry.get("year") in (2025, 2026, None):
+            if not hit or hit.get("id") != 1339713:
+                try:
+                    obsession_hit = await _tmdb_get("/movie/1339713", {})
+                    if obsession_hit and obsession_hit.get("id") == 1339713:
+                        hit = obsession_hit
+                        used_query = "Obsession"
+                        logger.info("[TMDB] Resolved Obsession directly to TMDB ID 1339713 (Curry Barker)")
+                except Exception as _exc:
+                    pass
+
         # AI-tier-2 fallback: rule parsing + TMDB all missed; ask the LLM to
         # resolve the canonical title (it knows real-world films and handles ANY
         # release junk), then retry TMDB — single-type first, then multi-search —
@@ -3869,6 +3893,12 @@ async def _reconcile_and_upgrade_library():
                             logger.info(f"[PURGE] Removed misplaced Patriot 2000 directory: {dn}")
                         except OSError:
                             pass
+                    if "rose" in dn.lower() and "cane" in dn.lower():
+                        try:
+                            shutil.rmtree(os.path.join(dirpath, dn), ignore_errors=True)
+                            logger.info(f"[PURGE] Removed unwanted Ms.Rose & Mr.Cane directory: {dn}")
+                        except OSError:
+                            pass
 
         # Step 2: Remove blacklisted items from FILE_ID_CACHE
         keys_to_purge = []
@@ -3955,12 +3985,15 @@ async def _reconcile_and_upgrade_library():
                         pass
 
             suspicious = False
-            if lang in ("tamil", "malayalam", "telugu", "hindi", "kannada"):
+            raw_name_lower = (data.get("file_name") or data.get("title") or "").lower()
+            if not suspicious and "obsession" in raw_name_lower:
+                if data.get("tmdb_id") != 1339713:
+                    suspicious = True
+            if not suspicious and lang in ("tamil", "malayalam", "telugu", "hindi", "kannada"):
                 for foreign_pfx in ("a vingança", "vingança", "el ", "le ", "die ", "der "):
                     if foreign_pfx in tmdb_title or foreign_pfx in nfo_text:
                         suspicious = True
                         break
-                raw_name_lower = (data.get("file_name") or data.get("title") or "").lower()
                 if not suspicious and "patriot" in raw_name_lower:
                     if data.get("tmdb_id") == 2108 or "mel gibson" in nfo_text or (tmdb_year and tmdb_year <= 2010):
                         suspicious = True