mirror of
https://github.com/soimort/you-get.git
synced 2025-03-14 11:54:01 +03:00
Merge branch 'develop' of https://github.com/linhua55/you-get into linhua55-develop (fix #875)
This commit is contained in:
commit
3c7499e3cb
@ -129,7 +129,15 @@ class Youku(VideoExtractor):
|
|||||||
ssl_context = request.HTTPSHandler(
|
ssl_context = request.HTTPSHandler(
|
||||||
context=ssl.SSLContext(ssl.PROTOCOL_TLSv1))
|
context=ssl.SSLContext(ssl.PROTOCOL_TLSv1))
|
||||||
cookie_handler = request.HTTPCookieProcessor()
|
cookie_handler = request.HTTPCookieProcessor()
|
||||||
opener = request.build_opener(ssl_context, cookie_handler)
|
if 'extractor_proxy' in kwargs and kwargs['extractor_proxy']:
|
||||||
|
proxy = parse_host(kwargs['extractor_proxy'])
|
||||||
|
proxy_handler = request.ProxyHandler({
|
||||||
|
'http': '%s:%s' % proxy,
|
||||||
|
'https': '%s:%s' % proxy,
|
||||||
|
})
|
||||||
|
else:
|
||||||
|
proxy_handler = request.ProxyHandler({})
|
||||||
|
opener = request.build_opener(ssl_context, cookie_handler, proxy_handler)
|
||||||
opener.addheaders = [('Cookie','__ysuid={}'.format(time.time()))]
|
opener.addheaders = [('Cookie','__ysuid={}'.format(time.time()))]
|
||||||
request.install_opener(opener)
|
request.install_opener(opener)
|
||||||
|
|
||||||
@ -267,6 +275,7 @@ class Youku(VideoExtractor):
|
|||||||
fileid = fileid,
|
fileid = fileid,
|
||||||
q = q
|
q = q
|
||||||
)
|
)
|
||||||
|
# unset_proxy() also strips cookies,because k.youku.com doesn't need cookies('r') for now
|
||||||
ksegs += [i['server'] for i in json.loads(get_content(u))]
|
ksegs += [i['server'] for i in json.loads(get_content(u))]
|
||||||
except error.HTTPError as e:
|
except error.HTTPError as e:
|
||||||
# Use fallback stream data in case of HTTP 404
|
# Use fallback stream data in case of HTTP 404
|
||||||
|
Loading…
x
Reference in New Issue
Block a user