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

pull/684/head
Louis Vézina 5 years ago
commit de1b28acb6

@ -294,7 +294,8 @@ def request_json(url, **kwargs):
def updated(restart=True):
if settings.general.getboolean('update_restart') and restart:
try:
requests.get(bazarr_url + 'restart')
from main import restart
restart()
except requests.ConnectionError:
logging.info('BAZARR Restart failed, please restart Bazarr manualy')
updated(restart=False)

@ -121,7 +121,7 @@ class SubtitleStreamParser(BaseParser):
"""Returns a string """
tags = data.get("tags", None)
if tags:
info = tags.get("language", None)
info = tags.get("language", None) or tags.get("LANGUAGE", None)
return info, (info or "null")
return None, "null"

Loading…
Cancel
Save