From f0826dd1e9105e66d9e97517ebcd72a09bcdd237 Mon Sep 17 00:00:00 2001 From: cnbeining Date: Wed, 2 Sep 2015 15:37:50 -0400 Subject: [PATCH] Add metacafe support --- README.md | 7 ++++--- src/you_get/common.py | 3 ++- src/you_get/extractors/__init__.py | 1 + src/you_get/extractors/metacafe.py | 27 +++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 src/you_get/extractors/metacafe.py diff --git a/README.md b/README.md index cb3550d1..b3f2e257 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Fork me on GitHub: * DouyuTV (斗鱼) * eHow * Facebook -* Fun.tv (风行, Funshion) +* Fun.tv (风行, Funshion) * Google Drive * ifeng (凤凰视频) * iQIYI (爱奇艺) @@ -54,15 +54,16 @@ Fork me on GitHub: * Kuwo (酷我音乐) * LeTV (乐视网) * Lizhi.fm (荔枝FM) +* Metacafe * MioMio * MTV 81 * NetEase (网易视频) * NetEase Music (网易云音乐) * PPTV -* QianMo (阡陌视频) +* QianMo (阡陌视频) * QQ (腾讯视频) * Sina (新浪视频) -* Weibo Miaopai (新浪微博秒拍视频) +* Weibo Miaopai (新浪微博秒拍视频) * Sohu (搜狐视频) * SongTaste * SoundCloud diff --git a/src/you_get/common.py b/src/you_get/common.py index 0a79ab98..376e8516 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -922,7 +922,7 @@ 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, iqiyi, joy, jpopsuki, khan, ku6, kugou, kuwo, letv, lizhi, magisto, 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 netease, w56, acfun, baidu, baomihua, bilibili, blip, catfun, cntv, cbs, coursera, dailymotion, dongting, douban, douyutv, ehow, facebook, freesound, funshion, google, sina, ifeng, alive, instagram, 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 video_host = r1(r'https?://([^/]+)/', url) video_url = r1(r'https?://[^/]+(.*)', url) @@ -970,6 +970,7 @@ def url_to_module(url): 'letv': letv, 'lizhi':lizhi, 'magisto': magisto, + 'metacafe': metacafe, 'miomio': miomio, 'mixcloud': mixcloud, 'mtv81': mtv81, diff --git a/src/you_get/extractors/__init__.py b/src/you_get/extractors/__init__.py index 198bc55b..2f1c268b 100755 --- a/src/you_get/extractors/__init__.py +++ b/src/you_get/extractors/__init__.py @@ -28,6 +28,7 @@ from .kuwo import * from .letv import * from .lizhi import * from .magisto import * +from .metacafe import * from .miaopai import * from .miomio import * from .mixcloud import * diff --git a/src/you_get/extractors/metacafe.py b/src/you_get/extractors/metacafe.py new file mode 100644 index 00000000..d7da5661 --- /dev/null +++ b/src/you_get/extractors/metacafe.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +__all__ = ['metacafe_download'] + +from ..common import * +import urllib.error +from urllib.parse import unquote + +def metacafe_download(url, output_dir = '.', merge = True, info_only = False): + if re.match(r'http://www.metacafe.com/watch/\w+', url): + html =get_content(url) + title = r1(r'