unshackle-dl/unshackle
1
0
Fork 0
forked from kenzuya/unshackle
Code Pull Requests 1 Activity

fix(titles): avoid None/double spaces in HDR tokens

Browse Source 
Ensure dynamic-range tokens use safe fallback when not in DYNAMIC_RANGE_MAP and append exactly one space-separated token without trailing/double spaces.
This commit is contained in:
Andy
2026-02-07 19:55:45 -07:00
parent 29f0e4eee8
commit 425b3764f4
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
unshackle/core/titles/episode.py
View File

@@ -209,19 +209,29 @@ class Episode(Title):
) )
frame_rate = float(primary_video_track.frame_rate) frame_rate = float(primary_video_track.frame_rate)
def _append_token(current: str, token: Optional[str]) -> str:
token = (token or "").strip()
current = current.rstrip()
if not token:
return current
if current.endswith(f" {token}"):
return current
return f"{current} {token}"
# Primary HDR format detection # Primary HDR format detection
if hdr_format: if hdr_format:
if hdr_format_full.startswith("Dolby Vision"): if hdr_format_full.startswith("Dolby Vision"):
name += " DV" name = _append_token(name, "DV")
if any( if any(
indicator in (hdr_format_full + " " + hdr_format) indicator in (hdr_format_full + " " + hdr_format)
for indicator in ["HDR10", "SMPTE ST 2086"] for indicator in ["HDR10", "SMPTE ST 2086"]
): ):
name += " HDR" name = _append_token(name, "HDR")
elif "HDR Vivid" in hdr_format: elif "HDR Vivid" in hdr_format:
name += " HDR" name = _append_token(name, "HDR")
else: else:
name += f" {DYNAMIC_RANGE_MAP.get(hdr_format)}" dynamic_range = DYNAMIC_RANGE_MAP.get(hdr_format) or hdr_format or ""
name = _append_token(name, dynamic_range)
elif "HLG" in trc or "Hybrid Log-Gamma" in trc or "ARIB STD-B67" in trc or "arib-std-b67" in trc.lower(): elif "HLG" in trc or "Hybrid Log-Gamma" in trc or "ARIB STD-B67" in trc or "arib-std-b67" in trc.lower():
name += " HLG" name += " HLG"
elif any(indicator in trc for indicator in ["PQ", "SMPTE ST 2084", "BT.2100"]) or "smpte2084" in trc.lower() or "bt.2020-10" in trc.lower(): elif any(indicator in trc for indicator in ["PQ", "SMPTE ST 2084", "BT.2100"]) or "smpte2084" in trc.lower() or "bt.2020-10" in trc.lower():

18
unshackle/core/titles/movie.py
View File

@@ -144,19 +144,29 @@ class Movie(Title):
) )
frame_rate = float(primary_video_track.frame_rate) frame_rate = float(primary_video_track.frame_rate)
def _append_token(current: str, token: Optional[str]) -> str:
token = (token or "").strip()
current = current.rstrip()
if not token:
return current
if current.endswith(f" {token}"):
return current
return f"{current} {token}"
# Primary HDR format detection # Primary HDR format detection
if hdr_format: if hdr_format:
if hdr_format_full.startswith("Dolby Vision"): if hdr_format_full.startswith("Dolby Vision"):
name += " DV" name = _append_token(name, "DV")
if any( if any(
indicator in (hdr_format_full + " " + hdr_format) indicator in (hdr_format_full + " " + hdr_format)
for indicator in ["HDR10", "SMPTE ST 2086"] for indicator in ["HDR10", "SMPTE ST 2086"]
): ):
name += " HDR" name = _append_token(name, "HDR")
elif "HDR Vivid" in hdr_format: elif "HDR Vivid" in hdr_format:
name += " HDR" name = _append_token(name, "HDR")
else: else:
name += f" {DYNAMIC_RANGE_MAP.get(hdr_format)} " dynamic_range = DYNAMIC_RANGE_MAP.get(hdr_format) or hdr_format or ""
name = _append_token(name, dynamic_range)
elif "HLG" in trc or "Hybrid Log-Gamma" in trc or "ARIB STD-B67" in trc or "arib-std-b67" in trc.lower(): elif "HLG" in trc or "Hybrid Log-Gamma" in trc or "ARIB STD-B67" in trc or "arib-std-b67" in trc.lower():
name += " HLG" name += " HLG"
elif any(indicator in trc for indicator in ["PQ", "SMPTE ST 2084", "BT.2100"]) or "smpte2084" in trc.lower() or "bt.2020-10" in trc.lower(): elif any(indicator in trc for indicator in ["PQ", "SMPTE ST 2084", "BT.2100"]) or "smpte2084" in trc.lower() or "bt.2020-10" in trc.lower():