diff --git a/src/you_get/common.py b/src/you_get/common.py index 79fc74d1..224249b4 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -117,7 +117,6 @@ SITES = { 'xiaojiadianvideo' : 'fc2video', 'ximalaya' : 'ximalaya', 'xinpianchang' : 'xinpianchang', - 'yinyuetai' : 'yinyuetai', 'yizhibo' : 'yizhibo', 'youku' : 'youku', 'youtu' : 'youtube', diff --git a/src/you_get/extractors/__init__.py b/src/you_get/extractors/__init__.py index 4280d236..8cf1ea7c 100755 --- a/src/you_get/extractors/__init__.py +++ b/src/you_get/extractors/__init__.py @@ -80,10 +80,9 @@ from .w56 import * from .wanmen import * from .xiami import * from .xinpianchang import * -from .yinyuetai import * from .yixia import * from .youku import * from .youtube import * from .zhanqi import * from .zhibo import * -from .zhihu import * \ No newline at end of file +from .zhihu import * diff --git a/src/you_get/extractors/embed.py b/src/you_get/extractors/embed.py index ee539747..aedf5137 100644 --- a/src/you_get/extractors/embed.py +++ b/src/you_get/extractors/embed.py @@ -13,7 +13,6 @@ from .qq import qq_download_by_vid from .sina import sina_download_by_vid from .tudou import tudou_download_by_id from .vimeo import vimeo_download_by_id -from .yinyuetai import yinyuetai_download_by_id from .youku import youku_download_by_vid from . import iqiyi from . import bokecc @@ -40,8 +39,6 @@ refer to http://open.tudou.com/wiki/video/info """ tudou_api_patterns = [ ] -yinyuetai_embed_patterns = [ 'player\.yinyuetai\.com/video/swf/(\d+)' ] - iqiyi_embed_patterns = [ 'player\.video\.qiyi\.com/([^/]+)/[^/]+/[^/]+/[^/]+\.swf[^"]+tvId=(\d+)' ] netease_embed_patterns = [ '(http://\w+\.163\.com/movie/[^\'"]+)' ] @@ -82,11 +79,6 @@ def embed_download(url, output_dir = '.', merge = True, info_only = False, **kwa found = True tudou_download_by_id(vid, title=title, output_dir=output_dir, merge=merge, info_only=info_only, **kwargs) - vids = matchall(content, yinyuetai_embed_patterns) - for vid in vids: - found = True - yinyuetai_download_by_id(vid, title=title, output_dir=output_dir, merge=merge, info_only=info_only, **kwargs) - vids = matchall(content, iqiyi_embed_patterns) for vid in vids: found = True diff --git a/src/you_get/extractors/yinyuetai.py b/src/you_get/extractors/yinyuetai.py deleted file mode 100644 index 6c39540f..00000000 --- a/src/you_get/extractors/yinyuetai.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -__all__ = ['yinyuetai_download', 'yinyuetai_download_by_id'] - -from ..common import * - -def yinyuetai_download_by_id(vid, title=None, output_dir='.', merge=True, info_only=False): - video_info = json.loads(get_html('http://www.yinyuetai.com/insite/get-video-info?json=true&videoId=%s' % vid)) - url_models = video_info['videoInfo']['coreVideoInfo']['videoUrlModels'] - url_models = sorted(url_models, key=lambda i: i['qualityLevel']) - url = url_models[-1]['videoUrl'] - type = ext = r1(r'\.(flv|mp4)', url) - _, _, size = url_info(url) - - print_info(site_info, title, type, size) - if not info_only: - download_urls([url], title, ext, size, output_dir, merge = merge) - -def yinyuetai_download(url, output_dir='.', merge=True, info_only=False, **kwargs): - id = r1(r'http://\w+.yinyuetai.com/video/(\d+)', url) or \ - r1(r'http://\w+.yinyuetai.com/video/h5/(\d+)', url) - if not id: - yinyuetai_download_playlist(url, output_dir=output_dir, merge=merge, info_only=info_only) - return - - html = get_html(url, 'utf-8') - title = r1(r'', html) or r1(r'