Merge branch 'development' into hermes

# Conflicts:
#	views/system.tpl

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
 

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

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

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