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

Revert "[ZhanQi]temporary fix using RTMP url"

Browse Source 
This reverts commit 953c2547bc.

Signed-off-by: Zhang Ning <zhangn1985@gmail.com>
This commit is contained in:
Zhang Ning 2016-01-22 17:59:09 +08:00
parent 1f2c0bde94
commit 75d8367ade
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/you_get/extractors/zhanqi.py
View File

@ -19,17 +19,15 @@ def zhanqi_download(url, output_dir = '.', merge = True, info_only = False, **kw
title = unescape_html(title) title = unescape_html(title)
rtmp_base = "http://wshdl.load.cdn.zhanqi.tv/zqlive" rtmp_base = "http://wshdl.load.cdn.zhanqi.tv/zqlive"
vod_base = "http://dlvod.cdn.zhanqi.tv" vod_base = "http://dlvod.cdn.zhanqi.tv"
rtmp_real_base = "rtmp://dlrtmp.cdn.zhanqi.tv/zqlive/"
if video_type == "LIVE": if video_type == "LIVE":
rtmp_id = match1(html, rtmp_id_patt).replace('\\/','/') rtmp_id = match1(html, rtmp_id_patt).replace('\\/','/')
#request_url = rtmp_base+'/'+rtmp_id+'.flv?get_url=1' request_url = rtmp_base+'/'+rtmp_id+'.flv?get_url=1'
#real_url = get_html(request_url) real_url = get_html(request_url)
real_url = rtmp_real_base + '/' + rtmp_id
print_info(site_info, title, 'flv', float('inf')) print_info(site_info, title, 'flv', float('inf'))
if not info_only: if not info_only:
download_rtmp_url(real_url, title, 'flv', {}, output_dir, merge = merge) #download_rtmp_url(real_url, title, 'flv', {}, output_dir, merge = merge)
#download_urls([real_url], title, 'flv', None, output_dir, merge = merge) download_urls([real_url], title, 'flv', None, output_dir, merge = merge)
elif video_type == "VOD": elif video_type == "VOD":
vod_m3u8_request = vod_base + match1(html, vod_m3u8_id_patt).replace('\\/','/') vod_m3u8_request = vod_base + match1(html, vod_m3u8_id_patt).replace('\\/','/')
vod_m3u8 = get_html(vod_m3u8_request) vod_m3u8 = get_html(vod_m3u8_request)
@ -49,7 +47,6 @@ def zhanqi_download(url, output_dir = '.', merge = True, info_only = False, **kw
download_urls(real_url, title, type_ or 'ts', size, output_dir, merge = merge) download_urls(real_url, title, type_ or 'ts', size, output_dir, merge = merge)
else: else:
NotImplementedError('Unknown_video_type') NotImplementedError('Unknown_video_type')
site_info = "zhanqi.tv" site_info = "zhanqi.tv"
download = zhanqi_download download = zhanqi_download
download_playlist = playlist_not_supported('zhanqi') download_playlist = playlist_not_supported('zhanqi')