Merge remote-tracking branch 'origin/subliminal_patch' into subliminal_patch

# Conflicts:
#	bazarr/main.py

bazarr/main.py

@@ -55,6 +55,7 @@ gc.enable()
 update_notifier()
 
 bazarr_version = '0.7.0.5'
+os.environ["SZ_USER_AGENT"] = "Bazarr/1"
 
 configure_logging(settings.general.getboolean('debug') or args.debug)
 

libs/subliminal_patch/providers/mixins.py

@@ -148,7 +148,8 @@ class ProviderSubtitleArchiveMixin(object):
                         subs_fallback.append(sub_name)
 
         if not matching_sub and not subs_unsure and not subs_fallback:
-            raise ProviderError("None of expected subtitle found in archive")
+            logger.error("None of expected subtitle found in archive")
+            return
 
         elif subs_unsure:
             matching_sub = subs_unsure[0]

libs/subscene_api/subscene.py

@@ -176,8 +176,12 @@ class Film(object):
 
         content = soup.find("div", "subtitles")
         header = content.find("div", "box clearfix")
+        cover = None
 
+        try:
             cover = header.find("div", "poster").img.get("src")
+        except AttributeError:
+            pass
 
         title = header.find("div", "header").h2.text[:-12].strip()