PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-09 03:37:52 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'pastebt-develop' into develop

Browse Source
This commit is contained in:
Mort Yao 2015-02-09 15:13:20 +08:00
commit 66053b0788
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/you_get/extractors/bilibili.py
View File

@ -19,7 +19,8 @@ client = {
'Accept-Charset': 'UTF-8,*;q=0.5', 'Accept-Charset': 'UTF-8,*;q=0.5',
'Accept-Encoding': 'gzip,deflate,sdch', 'Accept-Encoding': 'gzip,deflate,sdch',
'Accept-Language': 'en-US,en;q=0.8', 'Accept-Language': 'en-US,en;q=0.8',
'User-Agent': 'Biligrab /0.8 (cnbeining@gmail.com)' #'User-Agent': 'Biligrab /0.8 (cnbeining@gmail.com)'
'User-Agent': "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.94 Safari/537.36"
} }
def get_srt_xml(id): def get_srt_xml(id):

6
src/you_get/extractors/sohu.py
View File

@ -11,7 +11,7 @@ def real_url(host, prot, file, new):
start, _, host, key = get_html(url).split('|')[:4] start, _, host, key = get_html(url).split('|')[:4]
return '%s%s?key=%s' % (start[:-1], new, key) return '%s%s?key=%s' % (start[:-1], new, key)
def sohu_download(url, output_dir = '.', merge = True, info_only = False): def sohu_download(url, output_dir = '.', merge = True, info_only = False, extractor_proxy=None):
if re.match(r'http://share.vrs.sohu.com', url): if re.match(r'http://share.vrs.sohu.com', url):
vid = r1('id=(\d+)', url) vid = r1('id=(\d+)', url)
else: else:
@ -20,12 +20,16 @@ def sohu_download(url, output_dir = '.', merge = True, info_only = False):
assert vid assert vid
if re.match(r'http://tv.sohu.com/', url): if re.match(r'http://tv.sohu.com/', url):
if extractor_proxy:
set_proxy(tuple(extractor_proxy.split(":")))
data = json.loads(get_decoded_html('http://hot.vrs.sohu.com/vrs_flash.action?vid=%s' % vid)) data = json.loads(get_decoded_html('http://hot.vrs.sohu.com/vrs_flash.action?vid=%s' % vid))
for qtyp in ["oriVid","superVid","highVid" ,"norVid","relativeId"]: for qtyp in ["oriVid","superVid","highVid" ,"norVid","relativeId"]:
hqvid = data['data'][qtyp] hqvid = data['data'][qtyp]
if hqvid != 0 and hqvid != vid : if hqvid != 0 and hqvid != vid :
data = json.loads(get_decoded_html('http://hot.vrs.sohu.com/vrs_flash.action?vid=%s' % hqvid)) data = json.loads(get_decoded_html('http://hot.vrs.sohu.com/vrs_flash.action?vid=%s' % hqvid))
break break
if extractor_proxy:
unset_proxy()
host = data['allot'] host = data['allot']
prot = data['prot'] prot = data['prot']
urls = [] urls = []