mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-25 09:12:38 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
# Conflicts:
#	bazarr/main.py
This commit is contained in:
Halali 2019-01-27 14:00:56 +01:00
commit f490951bfe
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bazarr/main.py
View file

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

3
libs/subliminal_patch/providers/mixins.py
View file

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

6
libs/subscene_api/subscene.py
View file

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