[common] divide the import of extractors into multiple lines

This commit is contained in:
Mort Yao 2015-09-12 23:38:02 +02:00
parent 3b179ddc46
commit b277d8d5d4

View File

@ -580,7 +580,7 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
else:
for part in parts:
os.remove(part)
elif ext == "ts":
try:
from .processor.ffmpeg import has_ffmpeg_installed
@ -940,7 +940,72 @@ 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, funshion, google, sina, ifeng, alive, instagram, iqilu, iqiyi, joy, jpopsuki, khan, ku6, kugou, kuwo, letv, lizhi, magisto, metacafe, miaopai, miomio, mixcloud, mtv81, nicovideo, pptv, qianmo, qq, sohu, songtaste, soundcloud, ted, theplatform, tudou, tucao, tumblr, twitter, vid48, videobam, vidto, vimeo, vine, vk, xiami, yinyuetai, youku, youtube, zhanqi
from .extractors import (
acfun,
alive,
baidu,
baomihua,
bilibili,
blip,
catfun,
cbs,
cntv,
coursera,
dailymotion,
dongting,
douban,
douyutv,
ehow,
facebook,
freesound,
funshion,
google,
ifeng,
instagram,
iqilu,
iqiyi,
joy,
jpopsuki,
khan,
ku6,
kugou,
kuwo,
letv,
lizhi,
magisto,
metacafe,
miaopai,
miomio,
mixcloud,
mtv81,
netease,
nicovideo,
pptv,
qianmo,
qq,
sina,
sohu,
songtaste,
soundcloud,
ted,
theplatform,
tucao,
tudou,
tumblr,
twitter,
vid48,
videobam,
vidto,
vimeo,
vine,
vk,
w56,
xiami,
yinyuetai,
youku,
youtube,
zhanqi,
)
video_host = r1(r'https?://([^/]+)/', url)
video_url = r1(r'https?://[^/]+(.*)', url)