mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'development' into hermes 

# Conflicts:
#	views/system.tpl
This commit is contained in:
Louis Vézina 2020-04-17 11:52:06 -04:00
parent 71f92fde90 59c9ed1fcf
commit 2abc6a8a9a
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bazarr/list_subtitles.py
View File

@ -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

3
libs/subliminal_patch/providers/subssabbz.py
View File

@ -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 []

3
libs/subliminal_patch/providers/subsunacs.py
View File

@ -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 []

4
libs/subliminal_patch/providers/yavkanet.py
View File

@ -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 []