fix(apex): fix portrait detail title stacking, suppress library playall buttons, and normalize movie title deduplication

apex/repair_jellyfin_libraries.py

@@ -853,10 +853,10 @@ def heal_missing_db_strm_paths(databases=None):
 
 def deduplicate_media_strms(roots=None, databases=None):
     """
-    Deduplicates .strm files on disk and removes duplicate rows from Jellyfin BaseItems.
-    When multiple folders or .strm files point to the exact same stream URL, picks the
-    canonical version, deletes the duplicate folder/file from disk, and removes the redundant
-    rows from BaseItems in jellyfin.db.
+    Deduplicates .strm files and folders on disk, and removes duplicate rows from Jellyfin BaseItems.
+    When multiple folders or .strm files point to the exact same stream URL, or share the exact same
+    normalized movie/show title, picks the canonical version, deletes duplicate folders/files from disk,
+    and removes redundant rows from BaseItems in jellyfin.db.
     """
     media_roots = roots or [
         "/data/jellyfin/media/Movies",
@@ -866,6 +866,10 @@ def deduplicate_media_strms(roots=None, databases=None):
     ]
     db_list = databases or TARGET_DATABASES
 
+    def normalize_title(s: str) -> str:
+        cleaned = re.sub(r"\s*\(\s*\d{4}\s*\)\s*", "", s or "")
+        return re.sub(r"[^a-z0-9]", "", cleaned.lower())
+
     def score_path(p: str) -> int:
         score = 0
         bname = os.path.basename(p)
@@ -891,6 +895,8 @@ def deduplicate_media_strms(roots=None, databases=None):
     for root_dir in media_roots:
         if not os.path.isdir(root_dir):
             continue
+
+        # 1. Deduplicate by identical stream URL inside .strm files
         url_map = {}
         for dirpath, _, filenames in os.walk(root_dir):
             for fn in filenames:
@@ -930,7 +936,43 @@ def deduplicate_media_strms(roots=None, databases=None):
                         print(f"[DEDUP] Error removing file {dup}: {e}")
                 all_deleted_paths.append(dup)
 
-        # Also detect duplicate episodes in the same Season folder matching SxxExx
+        # 2. Deduplicate media folders matching the same normalized title (e.g. Movies/Shang-Chi (2021) vs Movies/Shang-Chi)
+        folder_groups = {}
+        try:
+            for entry in os.scandir(root_dir):
+                if entry.is_dir():
+                    norm_k = normalize_title(entry.name)
+                    if norm_k:
+                        folder_groups.setdefault(norm_k, []).append(entry.path)
+        except Exception:
+            pass
+
+        for norm_k, fpaths in folder_groups.items():
+            if len(fpaths) <= 1:
+                continue
+            def score_folder(p: str) -> int:
+                s = score_path(p)
+                try:
+                    for sub_f in os.listdir(p):
+                        if sub_f.lower().endswith(".strm") and os.path.getsize(os.path.join(p, sub_f)) > 0:
+                            s += 100
+                            break
+                except Exception:
+                    pass
+                return s
+            fpaths.sort(key=score_folder, reverse=True)
+            canon_folder = fpaths[0]
+            for dup_folder in fpaths[1:]:
+                if dup_folder in all_deleted_dirs:
+                    continue
+                print(f"[DEDUP] Removing duplicate media folder by title: '{dup_folder}' (retaining '{canon_folder}')")
+                try:
+                    shutil.rmtree(dup_folder, ignore_errors=True)
+                    all_deleted_dirs.append(dup_folder)
+                except Exception as e:
+                    print(f"[DEDUP] Error removing folder {dup_folder}: {e}")
+
+        # 3. Detect duplicate episodes in the same Season folder matching SxxExx
         ep_map = {}
         for dirpath, _, filenames in os.walk(root_dir):
             for fn in filenames:
@@ -981,33 +1023,41 @@ def deduplicate_media_strms(roots=None, databases=None):
             """)
             del_count += cur.rowcount
 
-            # Remove duplicate BaseItems rows having identical Name and Type
+            # Remove duplicate BaseItems rows matching same normalized name and type
             cur.execute("""
-                SELECT Name, type, COUNT(*) c
+                SELECT Id, Name, Path, type
                 FROM BaseItems
                 WHERE type LIKE '%Movie' OR type LIKE '%Series'
-                GROUP BY Name, type
-                HAVING c > 1
             """)
-            name_dups = cur.fetchall()
-            for name, itype, _ in name_dups:
-                cur.execute("SELECT Id, Path FROM BaseItems WHERE Name = ? AND type = ?", (name, itype))
-                dup_rows = cur.fetchall()
+            all_media_items = cur.fetchall()
+            title_groups = {}
+            for item_id, item_name, item_path, item_type in all_media_items:
+                if not item_name:
+                    continue
+                norm_key = (normalize_title(item_name), item_type)
+                title_groups.setdefault(norm_key, []).append((item_id, item_name, item_path))
+
+            for (norm_title, itype), candidates in title_groups.items():
+                if len(candidates) <= 1:
+                    continue
                 def score_db_row(r):
-                    p = (r[1] or "").lower()
+                    p = (r[2] or "").lower()
+                    name = (r[1] or "")
                     s = 0
-                    if os.path.exists(r[1] or ""): s += 100
+                    if os.path.exists(r[2] or ""): s += 200
+                    if re.search(r"\(\d{4}\)", name): s += 30
+                    if "-" in name: s += 10
                     if "spider-man" in p: s += 50
                     if "shang-chi" in p: s += 50
                     if "china-town" in p: s += 50
                     if "," in p or "." in p: s += 10
                     s += len(p)
                     return s
-                dup_rows.sort(key=score_db_row, reverse=True)
-                for redundant in dup_rows[1:]:
-                    print(f"[DEDUP] Removing duplicate BaseItems row by name: '{name}' (Id={redundant[0]}, Path={redundant[1]})")
+                candidates.sort(key=score_db_row, reverse=True)
+                for redundant in candidates[1:]:
+                    print(f"[DEDUP] Removing duplicate BaseItems row by normalized name: '{redundant[1]}' (Id={redundant[0]}, Path={redundant[2]})")
                     cur.execute("DELETE FROM BaseItems WHERE Id = ?", (redundant[0],))
-                    del_count += cur.rowcount
+                    del_count += 1
             conn.commit()
             conn.close()
             if del_count > 0:

apex/tests/test_repair_jellyfin_libraries.py

@@ -756,3 +756,52 @@ def test_deduplicate_media_strms_removes_duplicate_folders_and_db_rows(tmp_path)
     assert str(canon_strm) in paths
     assert str(dup_strm) not in paths
     assert str(dup_dir) not in paths
+
+def test_deduplicate_media_strms_normalizes_title_variants(tmp_path):
+    """Ensure duplicate movie folders with differing punctuation, case, or year are deduplicated."""
+    movies_root = tmp_path / "Movies"
+    movies_root.mkdir()
+
+    # Folder 1: Spider-Man Far From Home (2019)
+    dir1 = movies_root / "Spider-Man Far From Home (2019)"
+    dir1.mkdir()
+    strm1 = dir1 / "Spider-Man Far From Home (2019).strm"
+    strm1.write_text("http://127.0.0.1:8082/stream/111", encoding="utf-8")
+
+    # Folder 2: Spider-Man: Far from Home
+    dir2 = movies_root / "Spider-Man: Far from Home"
+    dir2.mkdir()
+    strm2 = dir2 / "Spider-Man Far from Home.strm"
+    strm2.write_text("http://127.0.0.1:8082/stream/222", encoding="utf-8")
+
+    # DB with both rows
+    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
+        )
+    """)
+    cur.execute("INSERT INTO BaseItems VALUES ('id_canon', ?, 'Spider-Man: Far From Home', 'MediaBrowser.Controller.Entities.Movies.Movie')", (str(strm1),))
+    cur.execute("INSERT INTO BaseItems VALUES ('id_dup', ?, 'Spider-Man: Far from Home', 'MediaBrowser.Controller.Entities.Movies.Movie')", (str(strm2),))
+    conn.commit()
+    conn.close()
+
+    deduplicate_media_strms(roots=[str(movies_root)], databases=[str(db_file)])
+
+    # Exactly one folder and one DB item should remain
+    assert dir1.exists() != dir2.exists()
+
+    conn = sqlite3.connect(str(db_file))
+    cur = conn.cursor()
+    cur.execute("SELECT Id FROM BaseItems")
+    remaining_ids = [r[0] for r in cur.fetchall()]
+    conn.close()
+
+    assert len(remaining_ids) == 1
+    assert 'id_canon' in remaining_ids
+

apex/ui/abyss.css

@@ -3257,9 +3257,11 @@ div[role="main"] {
 /* 9. Action Buttons Across ALL Settings & Dashboard */
 .MuiButton-contained,
 .MuiButton-containedPrimary,
-.type-interior button.raised:not([class*="delete"]):not([class*="cancel"]):not([class*="warn"]):not([class*="restart"]):not([class*="shutdown"]):not([class*="button-flat"]),
-.type-interior .button-submit,
-.settingsContainer button.raised {
+#dashboardPage button.raised:not([class*="delete"]):not([class*="cancel"]):not([class*="warn"]):not([class*="restart"]):not([class*="shutdown"]):not([class*="button-flat"]),
+.dashboardPage button.raised:not([class*="delete"]):not([class*="cancel"]):not([class*="warn"]):not([class*="restart"]):not([class*="shutdown"]):not([class*="button-flat"]),
+.settingsContainer button.raised,
+.formDialog button.raised,
+.type-interior .button-submit {
     background: rgba(255, 255, 255, 0.95) !important;
     color: #0e0e11 !important;
     border-radius: 50px !important;
@@ -3278,6 +3280,42 @@ div[role="main"] {
     box-shadow: 0 4px 16px rgba(255, 255, 255, 0.2) !important;
 }
 
+
+/* Suppress floating Play All and Shuffle All in library collection views */
+.page:not(#itemDetailPage):not(#videoOsdPage) .btnPlay,
+.page:not(#itemDetailPage):not(#videoOsdPage) .btnShuffle,
+.viewSettings .btnPlay,
+.viewSettings .btnShuffle,
+.pageTitleWithDefaultButton .btnPlay,
+.pageTitleWithDefaultButton .btnShuffle,
+button[data-action="playall"],
+button[data-action="shuffleall"],
+.mainTabsContainer .btnPlay,
+.mainTabsContainer .btnShuffle,
+.headerRight .btnPlay,
+.headerRight .btnShuffle {
+    display: none !important;
+    visibility: hidden !important;
+    width: 0 !important;
+    height: 0 !important;
+    padding: 0 !important;
+    margin: 0 !important;
+    pointer-events: none !important;
+}
+
+/* Hidden duplicate cards */
+.card.apex-duplicate-hidden {
+    display: none !important;
+    visibility: hidden !important;
+    width: 0 !important;
+    height: 0 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    flex: 0 0 0 !important;
+    pointer-events: none !important;
+    overflow: hidden !important;
+}
+
 /* Restart button */
 .MuiButton-root:has([data-testid*="Restart"]),
 button[id*="Restart"],
@@ -4566,78 +4604,89 @@ header .pageTitle,
 
 
 /* ========================================================
-   DETAIL PAGE: POSTER THUMBNAIL & METADATA SPACING FIX
-   Prevents poster from overlapping title/metadata text
-   Ensures title never breaks letter-by-letter in landscape or portrait
+   DETAIL PAGE: MOBILE PORTRAIT & DEFAULT CLEAN LAYOUT
+   Full-width title, zero text breaking or vertical letter stacking
    ======================================================== */
-#itemDetailPage .detailRibbon,
-.layout-mobile #itemDetailPage .detailRibbon,
-.layout-desktop #itemDetailPage .detailRibbon,
-.layout-tv #itemDetailPage .detailRibbon,
-.detailRibbon {
-    display: flex !important;
-    flex-direction: row !important;
-    align-items: flex-start !important;
-    gap: 20px !important;
-    padding-left: 20px !important;
-    padding-right: 20px !important;
-    padding-top: 16px !important;
-    margin-top: 0 !important;
-    box-sizing: border-box !important;
-    width: 100% !important;
-    max-width: 100% !important;
-}
+@media (orientation: portrait) {
+    #itemDetailPage .detailRibbon,
+    .layout-mobile #itemDetailPage .detailRibbon {
+        display: flex !important;
+        flex-direction: column !important;
+        align-items: stretch !important;
+        width: 100% !important;
+        max-width: 100% !important;
+        padding: 16px 20px !important;
+        gap: 12px !important;
+        box-sizing: border-box !important;
+    }
 
-#itemDetailPage .detailImageContainer,
-.detailImageContainer {
-    position: relative !important;
-    flex: 0 0 150px !important;
-    width: 150px !important;
-    max-width: 150px !important;
-    min-width: 130px !important;
-    margin: 0 !important;
-    z-index: 2 !important;
-}
+    #itemDetailPage .infoWrapper,
+    .layout-mobile #itemDetailPage .infoWrapper {
+        display: flex !important;
+        flex-direction: column !important;
+        align-items: stretch !important;
+        width: 100% !important;
+        max-width: 100% !important;
+    }
 
-#itemDetailPage .detailImageContainer .card,
-.layout-mobile #itemDetailPage .detailImageContainer .card,
-.layout-desktop #itemDetailPage .detailImageContainer .card,
-.layout-tv #itemDetailPage .detailImageContainer .card,
-.detailImageContainer .card {
-    position: relative !important;
-    top: auto !important;
-    left: auto !important;
-    margin: 0 !important;
-    width: 100% !important;
-    max-width: 100% !important;
-    border-radius: 12px !important;
-}
+    /* On mobile portrait, hide redundant small poster so full-width backdrop and clean title shine */
+    .layout-mobile #itemDetailPage .detailImageContainer {
+        display: none !important;
+        visibility: hidden !important;
+        width: 0 !important;
+        height: 0 !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        pointer-events: none !important;
+    }
 
-#itemDetailPage .detailPagePrimaryContent,
-.layout-mobile #itemDetailPage .detailPagePrimaryContent,
-.layout-desktop #itemDetailPage .detailPagePrimaryContent,
-.layout-tv #itemDetailPage .detailPagePrimaryContent,
-.detailPagePrimaryContent,
-#itemDetailPage .detailPageContent {
-    flex: 1 1 auto !important;
-    min-width: 0 !important;
-    width: auto !important;
-    max-width: 100% !important;
-    padding-left: 0 !important;
-    margin-left: 0 !important;
-}
+    #itemDetailPage .nameContainer,
+    .layout-mobile #itemDetailPage .nameContainer {
+        display: flex !important;
+        flex-direction: row !important;
+        align-items: center !important;
+        justify-content: space-between !important;
+        width: 100% !important;
+        max-width: 100% !important;
+        margin-bottom: 8px !important;
+    }
 
-#itemDetailPage .nameContainer,
-#itemDetailPage .itemName,
-#itemDetailPage .parentName,
-#itemDetailPage h1.itemName,
-.itemName {
-    white-space: normal !important;
-    word-break: normal !important;
-    overflow-wrap: break-word !important;
-    display: block !important;
-    width: auto !important;
-    max-width: 100% !important;
+    #itemDetailPage .itemName,
+    .layout-mobile #itemDetailPage .itemName,
+    #itemDetailPage h1.itemName {
+        display: block !important;
+        width: 100% !important;
+        max-width: 100% !important;
+        font-size: 1.65rem !important;
+        font-weight: 700 !important;
+        line-height: 1.25 !important;
+        color: #ffffff !important;
+        white-space: normal !important;
+        word-break: normal !important;
+        overflow-wrap: break-word !important;
+        letter-spacing: normal !important;
+    }
+
+    #itemDetailPage .itemMiscInfo,
+    .layout-mobile #itemDetailPage .itemMiscInfo {
+        display: flex !important;
+        flex-direction: row !important;
+        align-items: center !important;
+        flex-wrap: wrap !important;
+        gap: 8px !important;
+        width: 100% !important;
+        margin-bottom: 12px !important;
+    }
+
+    #itemDetailPage .mainDetailButtons,
+    .layout-mobile #itemDetailPage .mainDetailButtons {
+        display: flex !important;
+        flex-direction: row !important;
+        align-items: center !important;
+        flex-wrap: wrap !important;
+        gap: 10px !important;
+        width: 100% !important;
+    }
 }
 
 /* Universal Abyss Spotlight Hero Banner Iframe */

apex/ui/spotlight-loader.js

@@ -901,21 +901,28 @@ function findHomeTab() {
 
   function deduplicateDomCards() {
     safe(function () {
-      var containers = document.querySelectorAll('.itemsContainer');
+      var containers = document.querySelectorAll(".itemsContainer");
       for (var i = 0; i < containers.length; i++) {
         var container = containers[i];
-        var cards = container.children;
+        var cards = container.querySelectorAll(":scope > .card, :scope > div > .card");
+        if (!cards || !cards.length) cards = container.children;
         var seenTitles = {};
         for (var j = 0; j < cards.length; j++) {
           var card = cards[j];
-          if (!card.classList || !card.classList.contains('card')) continue;
-          var titleEl = card.querySelector('.cardText-first, .cardTextCentered, .cardText, .cardText-secondary');
-          var title = (titleEl ? titleEl.textContent : (card.getAttribute('aria-label') || '')).trim().toLowerCase();
-          var normTitle = title.replace(/[^a-z0-9]/g, '');
+          if (!card.classList || !card.classList.contains("card")) continue;
+          var titleEl = card.querySelector(".cardText-first") || card.querySelector(".cardText:not(.cardText-secondary)") || card.querySelector(".cardTextCentered") || card.querySelector(".cardText");
+          var rawTitle = (titleEl ? titleEl.textContent : (card.getAttribute("aria-label") || "")).trim().toLowerCase();
+          var normTitle = rawTitle.replace(/\s*\(\s*\d{4}\s*\)\s*/g, "").replace(/[^a-z0-9]/g, "");
           if (!normTitle) continue;
           if (seenTitles[normTitle]) {
-            card.style.display = 'none';
-            card.style.visibility = 'hidden';
+            card.classList.add("apex-duplicate-hidden");
+            card.style.setProperty("display", "none", "important");
+            card.style.setProperty("visibility", "hidden", "important");
+            card.style.setProperty("width", "0px", "important");
+            card.style.setProperty("height", "0px", "important");
+            card.style.setProperty("flex", "0 0 0px", "important");
+            card.style.setProperty("margin", "0px", "important");
+            card.style.setProperty("padding", "0px", "important");
           } else {
             seenTitles[normTitle] = true;
           }