Merge branch 'development' into hermes

# Conflicts:
#	views/system.tpl
pull/997/head
Louis Vézina 5 years ago
commit 2abc6a8a9a

@ -36,7 +36,7 @@ def store_subtitles(original_path, reversed_path):
subtitle_languages = embedded_subs_reader.list_languages(reversed_path) subtitle_languages = embedded_subs_reader.list_languages(reversed_path)
for subtitle_language, subtitle_forced, subtitle_codec in subtitle_languages: for subtitle_language, subtitle_forced, subtitle_codec in subtitle_languages:
try: 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))) logging.debug("BAZARR skipping pgs sub for language: " + str(alpha2_from_alpha3(subtitle_language)))
continue continue
@ -112,7 +112,7 @@ def store_subtitles_movie(original_path, reversed_path):
subtitle_languages = embedded_subs_reader.list_languages(reversed_path) subtitle_languages = embedded_subs_reader.list_languages(reversed_path)
for subtitle_language, subtitle_forced, subtitle_codec in subtitle_languages: for subtitle_language, subtitle_forced, subtitle_codec in subtitle_languages:
try: 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))) logging.debug("BAZARR skipping pgs sub for language: " + str(alpha2_from_alpha3(subtitle_language)))
continue continue

@ -188,4 +188,5 @@ class SubsSabBzProvider(Provider):
elif is_zipfile(archive_stream): elif is_zipfile(archive_stream):
return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link ) return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link )
else: else:
raise ValueError('Not a valid archive') logger.error('Ignore unsupported archive %r', request.headers)
return []

@ -196,4 +196,5 @@ class SubsUnacsProvider(Provider):
elif is_zipfile(archive_stream): elif is_zipfile(archive_stream):
return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link ) return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link )
else: else:
raise ValueError('Not a valid archive') logger.error('Ignore unsupported archive %r', request.headers)
return []

@ -175,5 +175,5 @@ class YavkaNetProvider(Provider):
elif is_zipfile(archive_stream): elif is_zipfile(archive_stream):
return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link ) return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link )
else: else:
raise ValueError('Not a valid archive') logger.error('Ignore unsupported archive %r', request.headers)
return []

Loading…
Cancel
Save