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

Improved assrt provider error message logging. #1953

Browse source
This commit is contained in:
morpheus65535 2022-10-29 11:27:03 -04:00
parent aee1849ce3
commit 78f769d743
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/subliminal_patch/providers/assrt.py
View file

@ -45,6 +45,15 @@ def search_language_in_list(lang, langlist):
return None return None
def check_status_code(resp):
try:
response = resp.json()
if 'status' in response and 'errmsg' in response:
raise ProviderError(f'{response["errmsg"]} ({response["status"]})')
except Exception:
pass
class AssrtSubtitle(Subtitle): class AssrtSubtitle(Subtitle):
"""Assrt Sbutitle.""" """Assrt Sbutitle."""
provider_name = 'assrt' provider_name = 'assrt'
@ -72,6 +81,7 @@ class AssrtSubtitle(Subtitle):
logger.info('Get subtitle detail: GET /sub/detail %r', params) logger.info('Get subtitle detail: GET /sub/detail %r', params)
sleep(get_request_delay(self.max_request_per_minute)) sleep(get_request_delay(self.max_request_per_minute))
r = self.session.get(server_url + '/sub/detail', params=params, timeout=15) r = self.session.get(server_url + '/sub/detail', params=params, timeout=15)
check_status_code(r)
r.raise_for_status() r.raise_for_status()
result = r.json() result = r.json()
@ -137,6 +147,7 @@ class AssrtProvider(Provider):
def initialize(self): def initialize(self):
self.session.headers = {'User-Agent': os.environ.get("SZ_USER_AGENT", "Sub-Zero/2")} self.session.headers = {'User-Agent': os.environ.get("SZ_USER_AGENT", "Sub-Zero/2")}
res = self.session.get(server_url + '/user/quota', params={'token': self.token}, timeout=15) res = self.session.get(server_url + '/user/quota', params={'token': self.token}, timeout=15)
check_status_code(res)
res.raise_for_status() res.raise_for_status()
result = res.json() result = res.json()
if 'user' in result and 'quota' in result['user']: if 'user' in result and 'quota' in result['user']:
@ -181,13 +192,10 @@ class AssrtProvider(Provider):
logger.debug('Searching subtitles: GET /sub/search %r', params) logger.debug('Searching subtitles: GET /sub/search %r', params)
sleep(get_request_delay(self.max_request_per_minute)) sleep(get_request_delay(self.max_request_per_minute))
res = self.session.get(server_url + '/sub/search', params=params, timeout=15) res = self.session.get(server_url + '/sub/search', params=params, timeout=15)
check_status_code(res)
res.raise_for_status() res.raise_for_status()
result = res.json() result = res.json()
if result['status'] != 0:
logger.error('status error: %r', result['status'])
return []
# parse the subtitles # parse the subtitles
pattern = re.compile(r'lang(?P<code>\w+)') pattern = re.compile(r'lang(?P<code>\w+)')
subtitles = [] subtitles = []
@ -213,6 +221,7 @@ class AssrtProvider(Provider):
def download_subtitle(self, subtitle): def download_subtitle(self, subtitle):
sleep(get_request_delay(self.max_request_per_minute)) sleep(get_request_delay(self.max_request_per_minute))
r = self.session.get(subtitle.download_link, timeout=15) r = self.session.get(subtitle.download_link, timeout=15)
check_status_code(r)
r.raise_for_status() r.raise_for_status()
subtitle.content = fix_line_ending(r.content) subtitle.content = fix_line_ending(r.content)