From b96fd9326979b08876ef9818bfab0a735dcc0f06 Mon Sep 17 00:00:00 2001 From: Vitiko Date: Mon, 16 May 2022 23:56:52 -0400 Subject: Embedded Subtitles provider: improve HI fallback --- .../providers/embeddedsubtitles.py | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'libs') diff --git a/libs/subliminal_patch/providers/embeddedsubtitles.py b/libs/subliminal_patch/providers/embeddedsubtitles.py index 63e7c8fde..d738ee024 100644 --- a/libs/subliminal_patch/providers/embeddedsubtitles.py +++ b/libs/subliminal_patch/providers/embeddedsubtitles.py @@ -245,21 +245,26 @@ def _check_allowed_extensions(subtitle: FFprobeSubtitleStream): def _check_hi_fallback(streams, languages): for language in languages: - compatible_streams = [ - stream for stream in streams if stream.language == language - ] - if len(compatible_streams) == 1: - stream = compatible_streams[0] - logger.debug("HI fallback: updating %s HI to False", stream) - stream.disposition.hearing_impaired = False - - elif all(stream.disposition.hearing_impaired for stream in streams): - for stream in streams: - logger.debug("HI fallback: updating %s HI to False", stream) + logger.debug("Checking HI fallback for '%s' language", language) + + streams_ = [stream for stream in streams if stream.language == language] + if len(streams_) == 1 and streams_[0].disposition.hearing_impaired: + logger.debug( + "HI fallback: updating %s HI to False (only subtitle found is HI)", + streams_[0], + ) + streams_[0].disposition.hearing_impaired = False + + elif all(stream.disposition.hearing_impaired for stream in streams_): + for stream in streams_: + logger.debug( + "HI fallback: updating %s HI to False (all subtitles are HI)", + stream, + ) stream.disposition.hearing_impaired = False else: - logger.debug("HI fallback not needed: %s", compatible_streams) + logger.debug("HI fallback not needed: %s", streams_) def _discard_possible_incomplete_subtitles(streams): -- cgit v1.2.3 From 770ae2d6f60d57d5a119b7158f07b8bb06656dac Mon Sep 17 00:00:00 2001 From: Vitiko Date: Wed, 18 May 2022 00:16:55 -0400 Subject: Embedded Subtitles provider: fix cached streams with HI fallback Fix #1884 --- libs/subliminal_patch/providers/embeddedsubtitles.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libs') diff --git a/libs/subliminal_patch/providers/embeddedsubtitles.py b/libs/subliminal_patch/providers/embeddedsubtitles.py index d738ee024..0cff01a8e 100644 --- a/libs/subliminal_patch/providers/embeddedsubtitles.py +++ b/libs/subliminal_patch/providers/embeddedsubtitles.py @@ -254,6 +254,7 @@ def _check_hi_fallback(streams, languages): streams_[0], ) streams_[0].disposition.hearing_impaired = False + streams_[0].disposition.generic = True elif all(stream.disposition.hearing_impaired for stream in streams_): for stream in streams_: @@ -262,6 +263,7 @@ def _check_hi_fallback(streams, languages): stream, ) stream.disposition.hearing_impaired = False + stream.disposition.generic = True else: logger.debug("HI fallback not needed: %s", streams_) -- cgit v1.2.3