Merge branch 'redtube' into develop

This commit is contained in:
Dmitry Bogatov 2014-12-23 10:32:19 +03:00
commit f4b6eae4a9
2 changed files with 20 additions and 1 deletions

View File

@ -899,7 +899,7 @@ def script_main(script_name, download, download_playlist = None):
sys.exit(1)
def url_to_module(url):
from .extractors import netease, w56, acfun, baidu, baomihua, bilibili, blip, catfun, cntv, cbs, coursera, dailymotion, dongting, douban, douyutv, ehow, facebook, freesound, google, sina, ifeng, alive, instagram, iqiyi, joy, jpopsuki, khan, ku6, kugou, kuwo, letv, magisto, miomio, mixcloud, mtv81, nicovideo, pptv, qq, sohu, songtaste, soundcloud, ted, theplatform, tudou, tucao, tumblr, vid48, videobam, vimeo, vine, vk, xiami, yinyuetai, youku, youtube, zhanqi
from .extractors import netease, w56, acfun, baidu, baomihua, bilibili, blip, catfun, cntv, cbs, coursera, dailymotion, dongting, douban, douyutv, ehow, facebook, freesound, google, sina, ifeng, alive, instagram, iqiyi, joy, jpopsuki, khan, ku6, kugou, kuwo, letv, magisto, miomio, mixcloud, mtv81, nicovideo, pptv, redtube, qq, sohu, songtaste, soundcloud, ted, theplatform, tudou, tucao, tumblr, vid48, videobam, vimeo, vine, vk, xiami, yinyuetai, youku, youtube, zhanqi
video_host = r1(r'https?://([^/]+)/', url)
video_url = r1(r'https?://[^/]+(.*)', url)
@ -950,6 +950,7 @@ def url_to_module(url):
'mtv81': mtv81,
'nicovideo': nicovideo,
'pptv': pptv,
'redtube' : redtube,
'qq': qq,
'sina': sina,
'smgbb': bilibili,

View File

@ -0,0 +1,18 @@
#!/usr/bin/env python3
__all__ = ['redtube_download']
from ..common import *
def redtube_download(url, output_dir = '.', merge = True, info_only = False):
html = get_content(url)
video_url = match1(html, r'<source src="([^"]+)"')
title = match1(html,r'<title>(.*?)</title>').rsplit('|', maxsplit=1)[0].strip()
(type, ext, size) = url_info(video_url)
print_info(site_info, title, type, size)
if not info_only:
download_urls([video_url], title, ext, size, output_dir, merge = merge)
site_info = "redtube.com"
download= redtube_download
download_playlist = playlist_not_supported('redtube')