mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed retries to get download link to avoid throttling

This commit is contained in:
Bazarr 2020-05-07 12:16:25 +01:00
parent 8b04941a3f
commit abcf03e389
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/subliminal_patch/providers/legendasdivx.py
View File

@ -170,7 +170,7 @@ class LegendasdivxProvider(Provider):
logger.error("Couldn't retrieve session ID, check your credentials") logger.error("Couldn't retrieve session ID, check your credentials")
raise AuthenticationError("Please check your credentials.") raise AuthenticationError("Please check your credentials.")
except Exception as e: except Exception as e:
if 'bloqueado' in res.text.lower(): # blocked IP address if (res and 'bloqueado' in res.text.lower()): # blocked IP address
logger.error("LegendasDivx.pt :: Your IP is blocked on this server.") logger.error("LegendasDivx.pt :: Your IP is blocked on this server.")
raise ParseResponseError("Legendasdivx.pt :: %r" % res.text) raise ParseResponseError("Legendasdivx.pt :: %r" % res.text)
logger.error("LegendasDivx.pt :: Uncaught error: %r" % repr(e)) logger.error("LegendasDivx.pt :: Uncaught error: %r" % repr(e))
@ -193,9 +193,9 @@ class LegendasdivxProvider(Provider):
for _subbox in _allsubs: for _subbox in _allsubs:
hits = 0 hits = 0
for th in _subbox.findAll("th", {"class": "color2"}): for th in _subbox.findAll("th", {"class": "color2"}):
if th.string == 'Hits:': if th.text == 'Hits:':
hits = int(th.parent.find("td").string) hits = int(th.parent.find("td").text)
if th.string == 'Idioma:': if th.text == 'Idioma:':
lang = th.parent.find("td").find("img").get('src') lang = th.parent.find("td").find("img").get('src')
if 'brazil' in lang.lower(): if 'brazil' in lang.lower():
lang = Language.fromopensubtitles('pob') lang = Language.fromopensubtitles('pob')
@ -209,13 +209,12 @@ class LegendasdivxProvider(Provider):
download = _subbox.find("a", {"class": "sub_download"}) download = _subbox.find("a", {"class": "sub_download"})
# sometimes BSoup can't find 'a' tag and returns None. # sometimes BSoup can't find 'a' tag and returns None.
i = 0 try:
while not (download): # must get it... trying again... dl = download.get('href')
download = _subbox.find("a", {"class": "sub_download"}) logger.debug("Found subtitle link on: {0}").format(self.download_link.format(link=dl))
i=+1 except:
logger.debug("Try number {0} try!".format(str(i))) logger.debug("Couldn't find download link. Trying next...")
dl = download.get('href') continue
logger.debug("Found subtitle on: %s" % self.download_link.format(link=dl))
# get subtitle uploader # get subtitle uploader
sub_header = _subbox.find("div", {"class" :"sub_header"}) sub_header = _subbox.find("div", {"class" :"sub_header"})
@ -268,7 +267,7 @@ class LegendasdivxProvider(Provider):
self.session.headers.update(self.headers.items()) self.session.headers.update(self.headers.items())
res = self.session.get(_searchurl.format(query=querytext)) res = self.session.get(_searchurl.format(query=querytext))
if "A legenda não foi encontrada" in res.text: if (res and "A legenda não foi encontrada" in res.text):
logger.warning('%s not found', querytext) logger.warning('%s not found', querytext)
return [] return []
@ -281,12 +280,13 @@ class LegendasdivxProvider(Provider):
#get number of pages bases on results found #get number of pages bases on results found
page_header = bsoup.find("div", {"class": "pager_bar"}) page_header = bsoup.find("div", {"class": "pager_bar"})
results_found = re.search(r'\((.*?) encontradas\)', page_header.text).group(1) results_found = re.search(r'\((.*?) encontradas\)', page_header.text).group(1) if page_header else 0
logger.debug("Found %s subtitles" % str(results_found))
num_pages = (int(results_found) // 10) + 1 num_pages = (int(results_found) // 10) + 1
num_pages = min(MAX_PAGES, num_pages) num_pages = min(MAX_PAGES, num_pages)
if num_pages > 1: if num_pages > 1:
for num_page in range(2, num_pages+2): for num_page in range(2, num_pages+1):
_search_next = self.searchurl.format(query=querytext) + "&page={0}".format(str(num_page)) _search_next = self.searchurl.format(query=querytext) + "&page={0}".format(str(num_page))
logger.debug("Moving to next page: %s" % _search_next) logger.debug("Moving to next page: %s" % _search_next)
res = self.session.get(_search_next) res = self.session.get(_search_next)
@ -305,6 +305,8 @@ class LegendasdivxProvider(Provider):
if res: if res:
if res.status_code in ['500', '503']: if res.status_code in ['500', '503']:
raise ServiceUnavailable("Legendasdivx.pt :: 503 - Service Unavailable") raise ServiceUnavailable("Legendasdivx.pt :: 503 - Service Unavailable")
elif res.status_code == '403':
raise ParseResponseError("Legendasdivx.pt :: 403 - Forbidden")
elif 'limite' in res.text.lower(): # daily downloads limit reached elif 'limite' in res.text.lower(): # daily downloads limit reached
raise DownloadLimitReached("Legendasdivx.pt :: Download limit reached") raise DownloadLimitReached("Legendasdivx.pt :: Download limit reached")
elif 'bloqueado' in res.text.lower(): # blocked IP address elif 'bloqueado' in res.text.lower(): # blocked IP address