From fef68202e94b3b3e4bc83b1e9b5bdcb0ec0fb7fa Mon Sep 17 00:00:00 2001
From: imSp4rky <george+slight@slight.me>
Date: Sat, 4 Apr 2026 09:56:20 -0600
Subject: [PATCH] fix(dl): preserve per-language video selection in quality
 step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The video quality Cartesian product (resolution × range × codec) only picked the first matching track, collapsing multi-language selections back to a single language. Add language as a product dimension when -l best/all or -vl with multiple languages is used.
---
 unshackle/commands/dl.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/unshackle/commands/dl.py b/unshackle/commands/dl.py
index 86f56ad..a3de0c4 100644
--- a/unshackle/commands/dl.py
+++ b/unshackle/commands/dl.py
@@ -1601,7 +1601,9 @@ class dl:
                             )
                             sys.exit(1)
 
-                    video_languages = [lang for lang in (v_lang or lang) if lang != "best"]
+                    effective_video_lang = v_lang or lang
+                    video_languages = [lang for lang in effective_video_lang if lang != "best"]
+                    video_multi_lang = "best" in effective_video_lang or "all" in effective_video_lang or len(video_languages) > 1
                     if video_languages and "all" not in video_languages:
                         processed_video_lang = []
                         for language in video_languages:
@@ -1711,8 +1713,15 @@ class dl:
                         # For non-hybrid ranges, apply Cartesian product selection
                         non_hybrid_selected: list[Video] = []
                         if non_hybrid_ranges and non_hybrid_tracks:
-                            for resolution, color_range, codec in product(
-                                quality or [None], non_hybrid_ranges, vcodec or [None]
+                            # Include language dimension when multiple video languages were requested
+                            if video_multi_lang:
+                                non_hybrid_langs = list(
+                                    dict.fromkeys(str(v.language) for v in non_hybrid_tracks)
+                                )
+                            else:
+                                non_hybrid_langs = [None]
+                            for resolution, color_range, codec, vlang in product(
+                                quality or [None], non_hybrid_ranges, vcodec or [None], non_hybrid_langs
                             ):
                                 candidates = [
                                     t
@@ -1724,6 +1733,7 @@ class dl:
                                     )
                                     and (not color_range or t.range == color_range)
                                     and (not codec or t.codec == codec)
+                                    and (vlang is None or str(t.language) == vlang)
                                 ]
                                 match = candidates[-1] if worst and candidates else next(iter(candidates), None)
                                 if match and match not in non_hybrid_selected:
@@ -1732,8 +1742,14 @@ class dl:
                         title.tracks.videos = hybrid_selected + non_hybrid_selected
                     else:
                         selected_videos: list[Video] = []
-                        for resolution, color_range, codec in product(
-                            quality or [None], range_ or [None], vcodec or [None]
+                        if video_multi_lang:
+                            unique_video_langs = list(
+                                dict.fromkeys(str(v.language) for v in title.tracks.videos)
+                            )
+                        else:
+                            unique_video_langs = [None]
+                        for resolution, color_range, codec, vlang in product(
+                            quality or [None], range_ or [None], vcodec or [None], unique_video_langs
                         ):
                             candidates = [
                                 t
@@ -1745,6 +1761,7 @@ class dl:
                                 )
                                 and (not color_range or t.range == color_range)
                                 and (not codec or t.codec == codec)
+                                and (vlang is None or str(t.language) == vlang)
                             ]
                             match = candidates[-1] if worst and candidates else next(iter(candidates), None)
                             if match and match not in selected_videos: