Merge pull request #927 from cnbeining/yixia-miaopai

[YIxia-Miaopai] Fix #926
This commit is contained in:
David Zhuang 2016-02-19 02:24:35 -05:00
commit 6fd87de3b8

View File

@ -52,11 +52,11 @@ def yixia_download(url, output_dir = '.', merge = True, info_only = False, **kwa
site_info = "Yixia Miaopai"
if re.match(r'http://www.miaopai.com/show/channel/\w+', url): #PC
scid = match1(url, r'http://www.miaopai.com/show/channel/(\w+)')
scid = match1(url, r'http://www.miaopai.com/show/channel/(.+)\.htm')
elif re.match(r'http://www.miaopai.com/show/\w+', url): #PC
scid = match1(url, r'http://www.miaopai.com/show/(\w+)')
scid = match1(url, r'http://www.miaopai.com/show/(.+)\.htm')
elif re.match(r'http://m.miaopai.com/show/channel/\w+', url): #Mobile
scid = match1(url, r'http://m.miaopai.com/show/channel/(\w+)')
scid = match1(url, r'http://m.miaopai.com/show/channel/(.+)\.htm')
elif 'xiaokaxiu.com' in hostname: #Xiaokaxiu
yixia_download_by_scid = yixia_xiaokaxiu_download_by_scid