kenzuya/unshackle
1
0
Fork 2
mirror of https://github.com/unshackle-dl/unshackle.git synced 2026-06-15 21:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dl): preserve per-language video selection in quality step

Browse Source 
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.
This commit is contained in:
imSp4rky
2026-04-04 09:56:20 -06:00
parent c051d9df23
commit fef68202e9
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
unshackle/commands/dl.py
View File

@@ -1601,7 +1601,9 @@ class dl:
) )
sys.exit(1) 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: if video_languages and "all" not in video_languages:
processed_video_lang = [] processed_video_lang = []
for language in video_languages: for language in video_languages:
@@ -1711,8 +1713,15 @@ class dl:
# For non-hybrid ranges, apply Cartesian product selection # For non-hybrid ranges, apply Cartesian product selection
non_hybrid_selected: list[Video] = [] non_hybrid_selected: list[Video] = []
if non_hybrid_ranges and non_hybrid_tracks: if non_hybrid_ranges and non_hybrid_tracks:
for resolution, color_range, codec in product( # Include language dimension when multiple video languages were requested
quality or [None], non_hybrid_ranges, vcodec or [None] 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 = [ candidates = [
t t
@@ -1724,6 +1733,7 @@ class dl:
) )
and (not color_range or t.range == color_range) and (not color_range or t.range == color_range)
and (not codec or t.codec == codec) 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) match = candidates[-1] if worst and candidates else next(iter(candidates), None)
if match and match not in non_hybrid_selected: if match and match not in non_hybrid_selected:
@@ -1732,8 +1742,14 @@ class dl:
title.tracks.videos = hybrid_selected + non_hybrid_selected title.tracks.videos = hybrid_selected + non_hybrid_selected
else: else:
selected_videos: list[Video] = [] selected_videos: list[Video] = []
for resolution, color_range, codec in product( if video_multi_lang:
quality or [None], range_ or [None], vcodec or [None] 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 = [ candidates = [
t t
@@ -1745,6 +1761,7 @@ class dl:
) )
and (not color_range or t.range == color_range) and (not color_range or t.range == color_range)
and (not codec or t.codec == codec) 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) match = candidates[-1] if worst and candidates else next(iter(candidates), None)
if match and match not in selected_videos: if match and match not in selected_videos: