mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-01-31 11:22:38 +00:00
Code Issues Releases Wiki Activity

core: update to subliminal_patch:head; subscene stawp!

Browse source
This commit is contained in:
panni 2019-06-06 01:39:33 +02:00
parent cda6cc5b53
commit a2e3650653
1 changed files with 16 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
libs/subscene_api/subscene.py
View file

@ -56,7 +56,7 @@ DEFAULT_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWeb"\
"Kit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.47 Safari/537.36" "Kit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.47 Safari/537.36"
ENDPOINT_RE = re.compile(ur'(?uis)<form action="/subtitles/(.+)">.*?<input type="text"') ENDPOINT_RE = re.compile(ur'(?uis)<form.+?action="/subtitles/(.+)">.*?<input type="text"')
class NewEndpoint(Exception): class NewEndpoint(Exception):
@ -64,24 +64,14 @@ class NewEndpoint(Exception):
# utils # utils
def soup_for(url, session=None, user_agent=DEFAULT_USER_AGENT): def soup_for(url, data=None, session=None, user_agent=DEFAULT_USER_AGENT):
url = re.sub("\s", "+", url) url = re.sub("\s", "+", url)
if not session: if not session:
r = Request(url, data=None, headers=dict(HEADERS, **{"User-Agent": user_agent})) r = Request(url, data=None, headers=dict(HEADERS, **{"User-Agent": user_agent}))
html = urlopen(r).read().decode("utf-8") html = urlopen(r).read().decode("utf-8")
else: else:
ret = session.get(url) ret = session.post(url, data=data)
try:
ret.raise_for_status() ret.raise_for_status()
except requests.HTTPError, e:
if e.response.status_code == 404:
m = ENDPOINT_RE.search(ret.text)
if m:
try:
raise NewEndpoint(m.group(1))
except:
pass
raise
html = ret.text html = ret.text
return BeautifulSoup(html, "html.parser") return BeautifulSoup(html, "html.parser")
@ -272,33 +262,22 @@ def get_first_film(soup, section, year=None, session=None):
def search(term, release=True, session=None, year=None, limit_to=SearchTypes.Exact, throttle=0): def search(term, release=True, session=None, year=None, limit_to=SearchTypes.Exact, throttle=0):
# note to subscene: if you actually start to randomize the endpoint, we'll have to query your server even more # note to subscene: if you actually start to randomize the endpoint, we'll have to query your server even more
endpoints = ["searching", "search", "srch", "find"]
if release: if release:
endpoints = ["release"] endpoint = "release"
else: else:
endpoint = region.get("subscene_endpoint") endpoint = region.get("subscene_endpoint2")
if endpoint is not NO_VALUE and endpoint not in endpoints: if endpoint is NO_VALUE:
endpoints.insert(0, endpoint) ret = session.get(SITE_DOMAIN)
soup = None
for endpoint in endpoints:
try:
soup = soup_for("%s/subtitles/%s?q=%s" % (SITE_DOMAIN, endpoint, term),
session=session)
except NewEndpoint, e:
new_endpoint = e.message
if new_endpoint not in endpoints:
new_endpoint = new_endpoint.strip()
logger.debug("Switching main endpoint to %s", new_endpoint)
region.set("subscene_endpoint", new_endpoint)
time.sleep(throttle) time.sleep(throttle)
return search(term, release=release, session=session, year=year, limit_to=limit_to, throttle=throttle) m = ENDPOINT_RE.search(ret.text)
else: if m:
region.delete("subscene_endpoint") endpoint = m.group(1).strip()
raise Exception("New endpoint %s didn't work; exiting" % new_endpoint) logger.debug("Switching main endpoint to %s", endpoint)
break region.set("subscene_endpoint2", endpoint)
soup = soup_for("%s/subtitles/%s" % (SITE_DOMAIN, endpoint), data={"query": term},
session=session)
if soup: if soup:
if "Subtitle search by" in str(soup): if "Subtitle search by" in str(soup):