fix: eliminate duplicate movie entries, prevent moving dubbed releases across language folders, and enable dynamic backdrop rotation in spotlight

apex/combined-entrypoint.sh

@@ -59,6 +59,11 @@ restore_jellyfin_local() {
     find /data/jellyfin/media /data/movies /data/tvshows /data /opt/jellyfin-local -iname "*mot*test*servicing*" -exec rm -rf {} + 2>/dev/null || true
     find /data/jellyfin/media /data/movies /data/tvshows /data /opt/jellyfin-local -iname "*rose*cane*" -o -iname "*ms.rose*" -o -iname "*ms rose*" -exec rm -rf {} + 2>/dev/null || true
     find /data/jellyfin/media/Movies/Telugu /data/movies/Telugu /opt/jellyfin-local -iname "*kattalan*" -exec rm -rf {} + 2>/dev/null || true
+    # Clean up empty movie directories or orphaned folders left behind after moves
+    find /data/jellyfin/media/Movies -mindepth 2 -type d -empty -delete 2>/dev/null || true
+    if [ -d "/data/jellyfin/media/Movies/English" ]; then
+        find "/data/jellyfin/media/Movies/English" -mindepth 1 -maxdepth 1 -type d -exec bash -c 'for d; do [ -z "$(find "$d" -name "*.strm" 2>/dev/null)" ] && rm -rf "$d"; done' _ {} + 2>/dev/null || true
+    fi
 
     # 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

@@ -119,6 +119,44 @@ def repair_database(db_path: str) -> bool:
         if purged > 0:
             print(f"[REPAIR] Purged {purged} blacklisted / stale item rows from {db_path}.")
 
+        # Clean up orphaned rows whose media files do not exist on disk (prevents duplicate ghost items)
+        cur.execute(
+            "SELECT Id, Path, Name FROM BaseItems "
+            "WHERE (Path LIKE '/data/jellyfin/media/%' OR Path LIKE '/opt/jellyfin-local/%' OR Path LIKE '/data/movies/%') "
+            "AND (type LIKE '%Movie%' OR type LIKE '%Episode%')"
+        )
+        orphaned = []
+        for row_id, item_path, item_name in cur.fetchall():
+            if item_path and not os.path.exists(item_path):
+                orphaned.append(row_id)
+        if orphaned:
+            cur.executemany("DELETE FROM BaseItems WHERE Id = ?", [(oid,) for oid in orphaned])
+            print(f"[REPAIR] Removed {len(orphaned)} orphaned item row(s) whose files no longer exist on disk.")
+
+        # Clean up duplicate Movie titles if any exist in BaseItems (e.g. duplicate Ne Zha 2)
+        cur.execute(
+            "SELECT Id, Path, Name FROM BaseItems WHERE type LIKE '%Movie%' AND Path IS NOT NULL"
+        )
+        seen_names = {}
+        dup_to_delete = []
+        for row_id, item_path, item_name in cur.fetchall():
+            if not item_name:
+                continue
+            clean_name = item_name.strip().lower()
+            exists = os.path.exists(item_path) if item_path else False
+            if clean_name in seen_names:
+                prev_id, prev_path, prev_exists = seen_names[clean_name]
+                if not exists:
+                    dup_to_delete.append(row_id)
+                elif not prev_exists:
+                    dup_to_delete.append(prev_id)
+                    seen_names[clean_name] = (row_id, item_path, exists)
+            else:
+                seen_names[clean_name] = (row_id, item_path, exists)
+        if dup_to_delete:
+            cur.executemany("DELETE FROM BaseItems WHERE Id = ?", [(did,) for did in dup_to_delete])
+            print(f"[REPAIR] Removed {len(dup_to_delete)} duplicate movie row(s) from {db_path}.")
+
         conn.execute("COMMIT")
         conn.close()
         if repaired:
@@ -131,6 +169,24 @@ def repair_database(db_path: str) -> bool:
         return False
 
 
+def cleanup_empty_media_folders(roots=None):
+    """Remove abandoned movie/show directories that contain no playable media files."""
+    search_roots = roots or ["/data/jellyfin/media/Movies", "/data/jellyfin/media/TV Shows", "/opt/jellyfin-local/media"]
+    for root_dir in search_roots:
+        if not os.path.exists(root_dir):
+            continue
+        for dirpath, dirnames, filenames in os.walk(root_dir, topdown=False):
+            if dirpath == root_dir:
+                continue
+            media_files = [f for f in filenames if f.endswith((".strm", ".mp4", ".mkv", ".avi", ".ts"))]
+            if not media_files and not dirnames:
+                try:
+                    import shutil
+                    shutil.rmtree(dirpath, ignore_errors=True)
+                except Exception:
+                    pass
+
+
 def purge_plugin_databases():
     """Scan Jellyfin local and persistent data dirs for all plugin SQLite databases
     (e.g., IntroSkipper.db, SkipMe.db) and purge any queued or metadata rows referencing
@@ -178,6 +234,7 @@ def main():
     for db in TARGET_DATABASES:
         repair_database(db)
     purge_plugin_databases()
+    cleanup_empty_media_folders()
 
 
 if __name__ == "__main__":

apex/tests/test_repair_jellyfin_libraries.py

@@ -0,0 +1,82 @@
+import sqlite3
+import os
+import shutil
+import tempfile
+import pytest
+
+from repair_jellyfin_libraries import repair_database, cleanup_empty_media_folders
+
+
+def test_repair_database_removes_orphans_and_duplicates(tmp_path):
+    db_file = tmp_path / "jellyfin.db"
+    conn = sqlite3.connect(str(db_file))
+    cur = conn.cursor()
+    cur.execute("""
+        CREATE TABLE BaseItems (
+            Id TEXT PRIMARY KEY,
+            Path TEXT,
+            Name TEXT,
+            type TEXT,
+            Data TEXT,
+            DateModified TEXT
+        )
+    """)
+
+    # Valid media file
+    media_dir = tmp_path / "media" / "Movies" / "Ne Zha 2 (2025)"
+    media_dir.mkdir(parents=True)
+    valid_file = media_dir / "Ne Zha 2 (2025).strm"
+    valid_file.write_text("http://stream")
+
+    # Stale/orphaned media path (does not exist on disk)
+    stale_path = str(tmp_path / "media" / "Movies" / "English" / "Ne Zha 2 (2025)" / "Ne Zha 2 (2025).strm")
+
+    cur.execute(
+        "INSERT INTO BaseItems VALUES (?, ?, ?, ?, ?, ?)",
+        ("item-valid", str(valid_file), "Ne Zha 2", "MediaBrowser.Controller.Entities.Movies.Movie", "{}", "2026-09-27T00:00:00Z")
+    )
+    cur.execute(
+        "INSERT INTO BaseItems VALUES (?, ?, ?, ?, ?, ?)",
+        ("item-stale", stale_path, "Ne Zha 2", "MediaBrowser.Controller.Entities.Movies.Movie", "{}", "2026-09-27T00:00:00Z")
+    )
+    cur.execute(
+        "INSERT INTO BaseItems VALUES (?, ?, ?, ?, ?, ?)",
+        ("item-blacklisted", "/data/jellyfin/media/Movies/Rose and Cane.strm", "Ms.Rose & Mr.Cane", "MediaBrowser.Controller.Entities.Movies.Movie", "{}", "2026-09-27T00:00:00Z")
+    )
+    conn.commit()
+    conn.close()
+
+    # Run repair
+    repair_database(str(db_file))
+
+    conn = sqlite3.connect(str(db_file))
+    cur = conn.cursor()
+    cur.execute("SELECT Id, Name, Path FROM BaseItems")
+    remaining = cur.fetchall()
+    conn.close()
+
+    # Only the valid file remains; stale orphan and blacklisted must be purged
+    assert len(remaining) == 1
+    assert remaining[0][0] == "item-valid"
+    assert remaining[0][1] == "Ne Zha 2"
+
+
+def test_cleanup_empty_media_folders(tmp_path):
+    movies_root = tmp_path / "Movies"
+    movies_root.mkdir()
+
+    # Empty movie dir
+    empty_movie = movies_root / "English" / "Ne Zha 2 (2025)"
+    empty_movie.mkdir(parents=True)
+    (empty_movie / "movie.nfo").write_text("<movie/>")  # sidecar only, no video
+
+    # Valid movie dir with .strm
+    valid_movie = movies_root / "Chinese" / "Ne Zha 2 (2025)"
+    valid_movie.mkdir(parents=True)
+    (valid_movie / "Ne Zha 2 (2025).strm").write_text("http://stream")
+
+    # Run cleanup
+    cleanup_empty_media_folders(roots=[str(movies_root)])
+
+    assert not empty_movie.exists()
+    assert valid_movie.exists()

apex/tg_streamer.py

@@ -1754,32 +1754,30 @@ async def _enrich_media_metadata(entry):
         # Filename tags are only a hint. TMDB's original_language is the
         # authoritative fallback for files such as a Malayalam movie whose
         # filename does not contain "Malayalam", "mal", or a language code.
+        # Record TMDB original_language as metadata, but DO NOT move an existing
+        # .strm file across language folders on disk. The upload may be dubbed (e.g.
+        # an English dubbed Chinese movie like Ne Zha 2), and moving files on disk
+        # leaves orphaned items in jellyfin.db, producing duplicate movie cards.
         tmdb_language = language_name_from_code(detail.get("original_language"))
-        if tmdb_language and tmdb_language != entry.get("language"):
+        if tmdb_language:
+            entry["tmdb_original_language"] = tmdb_language
             old_strm_path = entry.get("strm_path")
-            entry["language"] = tmdb_language
-            new_target_dir = strm_dir(MOVIES_DIR, SHOWS_DIR, entry)
-            new_show_root = (
-                tv_show_root(SHOWS_DIR, tmdb_language, entry.get("show_name"), entry.get("year"))
-                if entry.get("is_tv") and entry.get("show_name")
-                else None
-            )
-            new_strm_path = os.path.join(
-                new_target_dir, f"{entry.get('strm_base', strm_base(entry))}.strm"
-            )
-            if old_strm_path and os.path.exists(old_strm_path) and old_strm_path != new_strm_path:
-                os.makedirs(new_target_dir, exist_ok=True)
-                os.replace(old_strm_path, new_strm_path)
-                logger.info(
-                    f"[ORGANIZE] Moved '{entry.get('title')}' to {tmdb_language} folder"
+            if tmdb_language != entry.get("language") and (not old_strm_path or not os.path.exists(old_strm_path)):
+                entry["language"] = tmdb_language
+                new_target_dir = strm_dir(MOVIES_DIR, SHOWS_DIR, entry)
+                new_show_root = (
+                    tv_show_root(SHOWS_DIR, tmdb_language, entry.get("show_name"), entry.get("year"))
+                    if entry.get("is_tv") and entry.get("show_name")
+                    else None
                 )
-            entry["strm_path"] = new_strm_path
-            if old_strm_path and old_strm_path != new_strm_path:
-                entry["_prev_strm_path"] = old_strm_path
-            entry["target_dir"] = new_target_dir
-            entry["show_root"] = new_show_root
-            target_dir = new_target_dir
-            show_root = new_show_root
+                new_strm_path = os.path.join(
+                    new_target_dir, f"{entry.get('strm_base', strm_base(entry))}.strm"
+                )
+                entry["strm_path"] = new_strm_path
+                entry["target_dir"] = new_target_dir
+                entry["show_root"] = new_show_root
+                target_dir = new_target_dir
+                show_root = new_show_root
 
         os.makedirs(target_dir, exist_ok=True)
         connector = aiohttp.TCPConnector(family=socket.AF_INET)
@@ -1865,6 +1863,26 @@ async def _enrich_media_metadata(entry):
                 if not _image_is_hd(poster_path, _POSTER_MIN_WIDTH):
                     _mark_art_best_effort(show_root)
 
+                # Download extra high-res backdrops so Jellyfin indexes multiple BackdropImageTags for dynamic rotation
+                images_data = detail.get("images") or {}
+                backdrops_list = list(images_data.get("backdrops") or [])
+                if len(backdrops_list) > 1 and show_root:
+                    primary_file = os.path.basename(backdrop_url) if backdrop_url else ""
+                    extra_candidates = [
+                        b for b in backdrops_list
+                        if b.get("file_path") and os.path.basename(b.get("file_path")) != primary_file
+                    ]
+                    extra_candidates.sort(
+                        key=lambda b: (b.get("width", 0) >= 1280, b.get("width", 0), b.get("vote_average", 0)),
+                        reverse=True,
+                    )
+                    for b_idx, b_item in enumerate(extra_candidates[:3], start=1):
+                        b_fp = b_item.get("file_path")
+                        b_dst = os.path.join(show_root, f"backdrop{b_idx}.jpg")
+                        if not os.path.exists(b_dst) or os.path.getsize(b_dst) < 100000:
+                            b_url = f"https://image.tmdb.org/t/p/original{b_fp}"
+                            await _download_image(session, b_url, b_dst)
+
                 season_detail = None
                 season_number = int(entry.get("season") or 1)
                 season_detail = next(
@@ -1931,6 +1949,26 @@ async def _enrich_media_metadata(entry):
                 if not _image_is_hd(movie_poster, _POSTER_MIN_WIDTH):
                     _mark_art_best_effort(target_dir)
 
+                # Download extra high-res backdrops so Jellyfin indexes multiple BackdropImageTags for dynamic rotation
+                images_data = detail.get("images") or {}
+                backdrops_list = list(images_data.get("backdrops") or [])
+                if len(backdrops_list) > 1 and target_dir:
+                    primary_file = os.path.basename(backdrop_url) if backdrop_url else ""
+                    extra_candidates = [
+                        b for b in backdrops_list
+                        if b.get("file_path") and os.path.basename(b.get("file_path")) != primary_file
+                    ]
+                    extra_candidates.sort(
+                        key=lambda b: (b.get("width", 0) >= 1280, b.get("width", 0), b.get("vote_average", 0)),
+                        reverse=True,
+                    )
+                    for b_idx, b_item in enumerate(extra_candidates[:3], start=1):
+                        b_fp = b_item.get("file_path")
+                        b_dst = os.path.join(target_dir, f"backdrop{b_idx}.jpg")
+                        if not os.path.exists(b_dst) or os.path.getsize(b_dst) < 100000:
+                            b_url = f"https://image.tmdb.org/t/p/original{b_fp}"
+                            await _download_image(session, b_url, b_dst)
+
         prev = FILE_ID_CACHE.get(key)
         if isinstance(prev, dict):
             prev["tmdb_id"] = tmdb_id
@@ -4280,6 +4318,18 @@ async def _reconcile_and_upgrade_library():
                             logger.info(f"[PURGE] Removed misplaced Kattalan Telugu directory: {dn}")
                         except OSError:
                             pass
+                    # Remove abandoned movie directories that have no media (.strm) files left
+                    full_dn = os.path.join(dirpath, dn)
+                    if root == MOVIES_DIR and os.path.isdir(full_dn):
+                        try:
+                            subdirs = [sd for sd in os.listdir(full_dn) if os.path.isdir(os.path.join(full_dn, sd))]
+                            if not subdirs:
+                                has_strm = any(f.endswith((".strm", ".mp4", ".mkv")) for f in os.listdir(full_dn))
+                                if not has_strm:
+                                    shutil.rmtree(full_dn, ignore_errors=True)
+                                    logger.info(f"[PURGE] Removed abandoned movie folder without media: {dn}")
+                        except OSError:
+                            pass
 
         # Step 2: Remove blacklisted items from FILE_ID_CACHE
         keys_to_purge = []

apex/ui/spotlight.html

@@ -62,7 +62,7 @@
 			const $ = id => document.getElementById(id);
 			const AUTO_INTERVAL = 5000;
 			const REFRESH_INTERVAL = 60000;
-			const FIELDS = 'Overview,RunTimeTicks,UserData,OfficialRating,CommunityRating,SeriesName,SeriesId,ParentIndexNumber,IndexNumber,PlaybackPositionTicks,ChildCount,Status,ParentBackdropImageTags,SeriesPrimaryImageTag,SeriesThumbImageTag';
+			const FIELDS = 'Overview,RunTimeTicks,UserData,OfficialRating,CommunityRating,SeriesName,SeriesId,ParentIndexNumber,IndexNumber,PlaybackPositionTicks,ChildCount,Status,BackdropImageTags,ParentBackdropImageTags,SeriesPrimaryImageTag,SeriesThumbImageTag';
 			const reducedMotion = window.matchMedia('(prefers-reduced-motion: reduce)');
 			const imageCache = new Map();
 			let items = [];
@@ -528,11 +528,32 @@
 			function itemImageUrls(item) {
 				const isEpisode = item.Type === 'Episode';
 				const artworkId = isEpisode ? item.SeriesId || item.Id : item.Id;
-				const hasBackdrop = (item.BackdropImageTags && item.BackdropImageTags.length > 0) ||
-					(item.ParentBackdropImageTags && item.ParentBackdropImageTags.length > 0);
-				const backdropTag = (item.BackdropImageTags && item.BackdropImageTags.length > 0)
-					? item.BackdropImageTags[0]
-					: (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length > 0 ? item.ParentBackdropImageTags[0] : null);
+				const tags = (item.BackdropImageTags && item.BackdropImageTags.length > 0)
+					? item.BackdropImageTags
+					: (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length > 0 ? item.ParentBackdropImageTags : []);
+				const hasBackdrop = tags.length > 0;
+				let backdropIndex = 0;
+				let backdropTag = tags[0] || null;
+
+				// Dynamically rotate thumbnails/backdrops over time
+				if (tags.length > 1) {
+					let sessionOffset = 0;
+					try {
+						let s = sessionStorage.getItem('abyss_spotlight_backdrop_seed');
+						if (!s) {
+							s = String(Math.floor(Math.random() * 100));
+							sessionStorage.setItem('abyss_spotlight_backdrop_seed', s);
+						}
+						sessionOffset = parseInt(s, 10) || 0;
+					} catch { /* ignore */ }
+
+					// 4-hour time slot + item character seed + session offset
+					const timeSlot = Math.floor(Date.now() / (1000 * 60 * 60 * 4));
+					const charSeed = (item.Id || "").split("").reduce((acc, c) => (acc * 31 + c.charCodeAt(0)) >>> 0, 0);
+					backdropIndex = (timeSlot + charSeed + sessionOffset) % tags.length;
+					backdropTag = tags[backdropIndex];
+				}
+
 				const hasThumb = !!(item.ImageTags?.Thumb || item.SeriesThumbImageTag);
 				const thumbTag = item.ImageTags?.Thumb || item.SeriesThumbImageTag || null;
 				const hasPrimary = !!(item.ImageTags?.Primary || item.SeriesPrimaryImageTag);
@@ -541,7 +562,8 @@
 				const logoTag = item.ImageTags?.Logo || null;
 				return {
 					primary: (hasPrimary || !item.ImageTags) ? imageUrl(artworkId, 'Primary', null, primaryTag) : null,
-					backdrop: (hasBackdrop || !item.BackdropImageTags) ? imageUrl(artworkId, 'Backdrop', 0, backdropTag) : null,
+					backdrop: (hasBackdrop || !item.BackdropImageTags) ? imageUrl(artworkId, 'Backdrop', backdropIndex, backdropTag) : null,
+					backdropFallback: (backdropIndex > 0) ? imageUrl(artworkId, 'Backdrop', 0, tags[0]) : null,
 					thumb: (hasThumb || !item.ImageTags) ? imageUrl(artworkId, 'Thumb', null, thumbTag) : null,
 					logo: (hasLogo || !item.ImageTags) ? imageUrl(artworkId, 'Logo', null, logoTag) : null
 				};
@@ -554,11 +576,16 @@
 				let primaryBackdrop = false;
 				let usedThumb = false;
 
-				// 1. Try high-res 1080p widescreen backdrop
+				// 1. Try high-res 1080p widescreen backdrop (rotated)
 				if (urls.backdrop) {
 					backdrop = await fetchImage(urls.backdrop, signal);
 				}
 
+				// If rotated backdrop wasn't cached or failed, fallback to index 0
+				if (!backdrop && urls.backdropFallback) {
+					backdrop = await fetchImage(urls.backdropFallback, signal);
+				}
+
 				// 2. If backdrop not found, try 1080p horizontal thumb/landscape
 				if (!backdrop && urls.thumb) {
 					backdrop = await fetchImage(urls.thumb, signal);