From 611546adb2b6c095356f0d64319e93bf9953a4af Mon Sep 17 00:00:00 2001 From: cnbeining Date: Wed, 21 Oct 2015 13:46:46 -0400 Subject: [PATCH] Add Yixia-Miaopai support, replace #639 --- README.md | 1 + src/you_get/common.py | 1 + src/you_get/extractors/__init__.py | 1 + src/you_get/extractors/yixia_miaopai.py | 43 +++++++++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100755 src/you_get/extractors/yixia_miaopai.py diff --git a/README.md b/README.md index 5981d373..788008ef 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ Fork me on GitHub: * LeTV (乐视网) * Lizhi.fm (荔枝FM) * Metacafe +* MiaoPai (秒拍视频) * MioMio * MTV 81 * NetEase (网易视频) diff --git a/src/you_get/common.py b/src/you_get/common.py index 0f5080eb..1b940fbc 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -71,6 +71,7 @@ SITES = { 'vk' : 'vk', 'xiami' : 'xiami', 'yinyuetai' : 'yinyuetai', + 'miaopai': 'yixia_miaopai', 'youku' : 'youku', 'youtu' : 'youtube', 'youtube' : 'youtube', diff --git a/src/you_get/extractors/__init__.py b/src/you_get/extractors/__init__.py index 2a46d6cd..88329bc3 100755 --- a/src/you_get/extractors/__init__.py +++ b/src/you_get/extractors/__init__.py @@ -62,6 +62,7 @@ from .vk import * from .w56 import * from .xiami import * from .yinyuetai import * +from .yixia_miaopai import * from .youku import * from .youtube import * from .ted import * diff --git a/src/you_get/extractors/yixia_miaopai.py b/src/you_get/extractors/yixia_miaopai.py new file mode 100755 index 00000000..4f0938ce --- /dev/null +++ b/src/you_get/extractors/yixia_miaopai.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python + +__all__ = ['yixia_miaopai_download'] + +from ..common import * + +#---------------------------------------------------------------------- +def yixia_miaopai_download_by_scid(scid, output_dir = '.', merge = True, info_only = False): + """""" + headers = { + 'User-Agent': 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25', + 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8', + 'Cache-Control': 'max-age=0', + } + + html = get_content('http://m.miaopai.com/show/channel/' + scid, headers) + + title = match1(html, r'(\w+)') + + video_url = match1(html, r'<div class="vid_img" data-url=\'(.+)\'') + + 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) + +#---------------------------------------------------------------------- +def yixia_miaopai_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): + """wrapper""" + if re.match(r'http://www.miaopai.com/show/channel/\w+', url): + scid = match1(url, r'http://www.miaopai.com/show/channel/(\w+)') + elif re.match(r'http://www.miaopai.com/show/\w+', url): + scid = match1(url, r'http://www.miaopai.com/show/(\w+)') + elif re.match(r'http://m.miaopai.com/show/channel/\w+', url): + scid = match1(url, r'http://m.miaopai.com/show/channel/(\w+)') + else: + pass + yixia_miaopai_download_by_scid(scid, output_dir, merge, info_only) + +site_info = "Yixia MiaoPai" +download = yixia_miaopai_download +download_playlist = playlist_not_supported('yixia_miaopai')