morpheus65535/bazarr
1
1
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-02-23 06:16:36 +08:00
Code Issues Projects Releases Packages Wiki Activity

core: update to subliminal_patch:head; implicitly handle cf

Browse source
This commit is contained in:
panni 2019-04-04 19:16:31 +02:00
parent 6c4c124ae4
commit 1bf40127a0
2 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libs/subliminal_patch/http.py
View file

@ -8,12 +8,19 @@ import requests
import xmlrpclib import xmlrpclib
import dns.resolver import dns.resolver
from requests import Session, exceptions from requests import exceptions
from urllib3.util import connection from urllib3.util import connection
from retry.api import retry_call from retry.api import retry_call
from exceptions import APIThrottled from exceptions import APIThrottled
from dogpile.cache.api import NO_VALUE
from subliminal.cache import region
from cfscrape import CloudflareScraper from cfscrape import CloudflareScraper
try:
from urlparse import urlparse
except ImportError:
from urllib.parse import urlparse
from subzero.lib.io import get_viable_encoding from subzero.lib.io import get_viable_encoding
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -45,10 +52,37 @@ class CertifiSession(CloudflareScraper):
'DNT': '1' 'DNT': '1'
}) })
def request(self, *args, **kwargs): def request(self, method, url, *args, **kwargs):
if kwargs.get('timeout') is None: if kwargs.get('timeout') is None:
kwargs['timeout'] = self.timeout kwargs['timeout'] = self.timeout
return super(CertifiSession, self).request(*args, **kwargs)
parsed_url = urlparse(url)
domain = parsed_url.netloc
cache_key = "cf_data_%s" % domain
if not self.cookies.get("__cfduid", "", domain=domain) or not self.cookies.get("cf_clearance", "",
domain=domain):
cf_data = region.get(cache_key)
if cf_data is not NO_VALUE:
cf_cookies, user_agent = cf_data
logger.debug("Trying to use old cf data for %s: %s", domain, cf_data)
for cookie, value in cf_cookies.iteritems():
self.cookies.set(cookie, value, domain=domain)
self.headers['User-Agent'] = user_agent
ret = super(CertifiSession, self).request(method, url, *args, **kwargs)
try:
cf_data = self.get_live_tokens(domain)
except:
pass
else:
if cf_data != region.get(cache_key):
logger.debug("Storing cf data for %s: %s", domain, cf_data)
region.set(cache_key, cf_data)
return ret
class RetryingSession(CertifiSession): class RetryingSession(CertifiSession):

16
libs/subliminal_patch/providers/subscene.py
View file

@ -201,24 +201,8 @@ class SubsceneProvider(Provider, ProviderSubtitleArchiveMixin):
vfn = get_video_filename(video) vfn = get_video_filename(video)
subtitles = [] subtitles = []
logger.debug(u"Searching for: %s", vfn) logger.debug(u"Searching for: %s", vfn)
cf_data = region.get("cf_data")
if cf_data is not NO_VALUE:
cf_cookies, user_agent = cf_data
logger.debug("Trying to use old cf cookies")
self.session.cookies.update(cf_cookies)
self.session.headers['User-Agent'] = user_agent
film = search(vfn, session=self.session) film = search(vfn, session=self.session)
try:
cf_data = self.session.get_live_tokens("subscene.com")
except:
pass
else:
logger.debug("Storing cf cookies")
region.set("cf_data", cf_data)
if film and film.subtitles: if film and film.subtitles:
logger.debug('Release results found: %s', len(film.subtitles)) logger.debug('Release results found: %s', len(film.subtitles))
subtitles = self.parse_results(video, film) subtitles = self.parse_results(video, film)