diff --git a/libs/subliminal_patch/core.py b/libs/subliminal_patch/core.py
index 9fe4f4d35..46d701dc8 100644
--- a/libs/subliminal_patch/core.py
+++ b/libs/subliminal_patch/core.py
@@ -28,7 +28,7 @@ from subliminal.utils import hash_napiprojekt, hash_opensubtitles, hash_shooter,
from subliminal.video import VIDEO_EXTENSIONS, Video, Episode, Movie
from subliminal.core import guessit, ProviderPool, io, is_windows_special_path, \
ThreadPoolExecutor, check_video
-from subliminal_patch.exceptions import TooManyRequests, APIThrottled, ParseResponseError
+from subliminal_patch.exceptions import TooManyRequests, APIThrottled
from subzero.language import Language, ENDSWITH_LANGUAGECODE_RE
from scandir import scandir, scandir_generic as _scandir_generic
@@ -280,14 +280,10 @@ class SZProviderPool(ProviderPool):
logger.debug("RAR Traceback: %s", traceback.format_exc())
return False
- except (TooManyRequests, DownloadLimitExceeded, ServiceUnavailable, APIThrottled, ParseResponseError) as e:
- self.throttle_callback(subtitle.provider_name, e)
- self.discarded_providers.add(subtitle.provider_name)
- return False
-
- except:
+ except Exception as e:
logger.exception('Unexpected error in provider %r, Traceback: %s', subtitle.provider_name,
traceback.format_exc())
+ self.throttle_callback(subtitle.provider_name, e)
self.discarded_providers.add(subtitle.provider_name)
return False
@@ -611,16 +607,6 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen
if adv_tag:
forced = "forced" in adv_tag
- # extract the potential language code
- try:
- language_code = p_root.rsplit(".", 1)[1].replace('_', '-')
- try:
- Language.fromietf(language_code)
- except:
- language_code = None
- except IndexError:
- language_code = None
-
# remove possible language code for matching
p_root_bare = ENDSWITH_LANGUAGECODE_RE.sub("", p_root)
@@ -633,19 +619,21 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen
if match_strictness == "strict" or (match_strictness == "loose" and not filename_contains):
continue
- # default language is undefined
- language = Language('und')
+ language = None
- # attempt to parse
- if language_code:
+ # extract the potential language code
+ try:
+ language_code = p_root.rsplit(".", 1)[1].replace('_', '-')
try:
language = Language.fromietf(language_code)
language.forced = forced
except ValueError:
logger.error('Cannot parse language code %r', language_code)
- language = None
+ language_code = None
+ except IndexError:
+ language_code = None
- elif not language_code and only_one:
+ if not language and not language_code and only_one:
language = Language.rebuild(list(languages)[0], forced=forced)
subtitles[p] = language
@@ -875,6 +863,7 @@ def save_subtitles(file_path, subtitles, single=False, directory=None, chmod=Non
if content:
if os.path.exists(subtitle_path):
os.remove(subtitle_path)
+
with open(subtitle_path, 'w') as f:
f.write(content)
subtitle.storage_path = subtitle_path
diff --git a/libs/subliminal_patch/providers/addic7ed.py b/libs/subliminal_patch/providers/addic7ed.py
index 8507052d3..1e04821b0 100644
--- a/libs/subliminal_patch/providers/addic7ed.py
+++ b/libs/subliminal_patch/providers/addic7ed.py
@@ -10,7 +10,7 @@ from requests import Session
from subliminal.cache import region
from subliminal.exceptions import DownloadLimitExceeded, AuthenticationError
from subliminal.providers.addic7ed import Addic7edProvider as _Addic7edProvider, \
- Addic7edSubtitle as _Addic7edSubtitle, ParserBeautifulSoup, show_cells_re
+ Addic7edSubtitle as _Addic7edSubtitle, ParserBeautifulSoup
from subliminal.subtitle import fix_line_ending
from subliminal_patch.utils import sanitize
from subliminal_patch.exceptions import TooManyRequests
@@ -19,6 +19,8 @@ from subzero.language import Language
logger = logging.getLogger(__name__)
+show_cells_re = re.compile(b'| .*? | ', re.DOTALL)
+
#: Series header parsing regex
series_year_re = re.compile(r'^(?P[ \w\'.:(),*&!?-]+?)(?: \((?P\d{4})\))?$')
@@ -103,11 +105,15 @@ class Addic7edProvider(_Addic7edProvider):
tries = 0
while tries < 3:
r = self.session.get(self.server_url + 'login.php', timeout=10, headers={"Referer": self.server_url})
- if "grecaptcha" in r.content:
+ if "g-recaptcha" in r.content or "grecaptcha" in r.content:
logger.info('Addic7ed: Solving captcha. This might take a couple of minutes, but should only '
'happen once every so often')
- site_key = re.search(r'grecaptcha.execute\(\'(.+?)\',', r.content).group(1)
+ for g, s in (("g-recaptcha-response", r'g-recaptcha.+?data-sitekey=\"(.+?)\"'),
+ ("recaptcha_response", r'grecaptcha.execute\(\'(.+?)\',')):
+ site_key = re.search(s, r.content).group(1)
+ if site_key:
+ break
if not site_key:
logger.error("Addic7ed: Captcha site-key not found!")
return
@@ -121,7 +127,7 @@ class Addic7edProvider(_Addic7edProvider):
if not result:
raise Exception("Addic7ed: Couldn't solve captcha!")
- data["recaptcha_response"] = result
+ data[g] = result
r = self.session.post(self.server_url + 'dologin.php', data, allow_redirects=False, timeout=10,
headers={"Referer": self.server_url + "login.php"})
@@ -129,12 +135,11 @@ class Addic7edProvider(_Addic7edProvider):
if "relax, slow down" in r.content:
raise TooManyRequests(self.username)
- if r.status_code != 302:
- if "User doesn't exist" in r.content and tries <= 2:
- logger.info("Addic7ed: Error, trying again. (%s/%s)", tries+1, 3)
- tries += 1
- continue
+ if "Try again" in r.content or "Wrong password" in r.content:
+ raise AuthenticationError(self.username)
+ if r.status_code != 302:
+ logger.error("Addic7ed: Something went wrong when logging in")
raise AuthenticationError(self.username)
break