diff --git a/src/you_get/extractors/yixia.py b/src/you_get/extractors/yixia.py index 7d5ba290..13b56a3f 100644 --- a/src/you_get/extractors/yixia.py +++ b/src/you_get/extractors/yixia.py @@ -57,7 +57,9 @@ def yixia_download(url, output_dir = '.', merge = True, info_only = False, **kwa scid = match1(url, r'http://www.miaopai.com/show/(.+)\.htm') elif re.match(r'http://m.miaopai.com/show/channel/.+', url): #Mobile scid = match1(url, r'http://m.miaopai.com/show/channel/(.+)\.htm') - + if scid == None : + scid = match1(url, r'http://m.miaopai.com/show/channel/(.+)') + elif 'xiaokaxiu.com' in hostname: #Xiaokaxiu yixia_download_by_scid = yixia_xiaokaxiu_download_by_scid site_info = "Yixia Xiaokaxiu" diff --git a/tests/test.py b/tests/test.py index ba15e447..84fb9cae 100644 --- a/tests/test.py +++ b/tests/test.py @@ -2,12 +2,10 @@ import unittest -from you_get import * from you_get.extractors import * -from you_get.common import * + class YouGetTests(unittest.TestCase): - def test_imgur(self): imgur.download("http://imgur.com/WVLk5nD", info_only=True) imgur.download("http://imgur.com/gallery/WVLk5nD", info_only=True) @@ -18,4 +16,11 @@ class YouGetTests(unittest.TestCase): def test_youtube(self): youtube.download("http://www.youtube.com/watch?v=pzKerr0JIPA", info_only=True) youtube.download("http://youtu.be/pzKerr0JIPA", info_only=True) - youtube.download("http://www.youtube.com/attribution_link?u=/watch?v%3DldAKIzq7bvs%26feature%3Dshare", info_only=True) + youtube.download("http://www.youtube.com/attribution_link?u=/watch?v%3DldAKIzq7bvs%26feature%3Dshare", + info_only=True) + + def test_yixia(self): + yixia_download("http://m.miaopai.com/show/channel/vlvreCo4OZiNdk5Jn1WvdopmAvdIJwi8", info_only=True) + +if __name__ == '__main__': + unittest.main()