diff --git a/bazarr/list_subtitles.py b/bazarr/list_subtitles.py index 636145cde..623f799df 100644 --- a/bazarr/list_subtitles.py +++ b/bazarr/list_subtitles.py @@ -36,7 +36,7 @@ def store_subtitles(original_path, reversed_path): subtitle_languages = embedded_subs_reader.list_languages(reversed_path) for subtitle_language, subtitle_forced, subtitle_codec in subtitle_languages: try: - if settings.general.getboolean("ignore_pgs_subs") and subtitle_codec == "hdmv_pgs_subtitle": + if settings.general.getboolean("ignore_pgs_subs") and subtitle_codec == "PGS": logging.debug("BAZARR skipping pgs sub for language: " + str(alpha2_from_alpha3(subtitle_language))) continue @@ -112,7 +112,7 @@ def store_subtitles_movie(original_path, reversed_path): subtitle_languages = embedded_subs_reader.list_languages(reversed_path) for subtitle_language, subtitle_forced, subtitle_codec in subtitle_languages: try: - if settings.general.getboolean("ignore_pgs_subs") and subtitle_codec == "hdmv_pgs_subtitle": + if settings.general.getboolean("ignore_pgs_subs") and subtitle_codec == "PGS": logging.debug("BAZARR skipping pgs sub for language: " + str(alpha2_from_alpha3(subtitle_language))) continue diff --git a/libs/subliminal_patch/providers/subssabbz.py b/libs/subliminal_patch/providers/subssabbz.py index f2bb05450..de93e47b3 100644 --- a/libs/subliminal_patch/providers/subssabbz.py +++ b/libs/subliminal_patch/providers/subssabbz.py @@ -188,4 +188,5 @@ class SubsSabBzProvider(Provider): elif is_zipfile(archive_stream): return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link ) else: - raise ValueError('Not a valid archive') + logger.error('Ignore unsupported archive %r', request.headers) + return [] diff --git a/libs/subliminal_patch/providers/subsunacs.py b/libs/subliminal_patch/providers/subsunacs.py index 87c97c486..e3237b80b 100644 --- a/libs/subliminal_patch/providers/subsunacs.py +++ b/libs/subliminal_patch/providers/subsunacs.py @@ -196,4 +196,5 @@ class SubsUnacsProvider(Provider): elif is_zipfile(archive_stream): return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link ) else: - raise ValueError('Not a valid archive') + logger.error('Ignore unsupported archive %r', request.headers) + return [] diff --git a/libs/subliminal_patch/providers/yavkanet.py b/libs/subliminal_patch/providers/yavkanet.py index d695245ee..1ea0d2ca0 100644 --- a/libs/subliminal_patch/providers/yavkanet.py +++ b/libs/subliminal_patch/providers/yavkanet.py @@ -175,5 +175,5 @@ class YavkaNetProvider(Provider): elif is_zipfile(archive_stream): return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link ) else: - raise ValueError('Not a valid archive') - + logger.error('Ignore unsupported archive %r', request.headers) + return []