From a4763fc6a21412bca9b32109487233deeb9d0d46 Mon Sep 17 00:00:00 2001 From: cnbeining Date: Fri, 8 Aug 2014 01:41:38 -0400 Subject: [PATCH] Add VideoBam as requested in #117 --- src/you_get/common.py | 3 ++- src/you_get/extractors/__init__.py | 1 + src/you_get/extractors/videobam.py | 31 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/you_get/extractors/videobam.py diff --git a/src/you_get/common.py b/src/you_get/common.py index 65af9e9a..be0a9e56 100644 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -928,7 +928,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, bilibili, blip, catfun, cntv, cbs, coursera, dailymotion, douban, ehow, facebook, freesound, google, sina, ifeng, alive, instagram, iqiyi, joy, jpopsuki, khan, ku6, kugou, kuwo, letv, magisto, miomio, mixcloud, mtv81, nicovideo, pptv, qq, sohu, songtaste, soundcloud, ted, theplatform, tudou, tucao, tumblr, vid48, vimeo, vine, vk, xiami, yinyuetai, youku, youtube + from .extractors import netease, w56, acfun, baidu, bilibili, blip, catfun, cntv, cbs, coursera, dailymotion, douban, ehow, facebook, freesound, google, sina, ifeng, alive, instagram, iqiyi, joy, jpopsuki, khan, ku6, kugou, kuwo, letv, magisto, miomio, mixcloud, mtv81, nicovideo, pptv, qq, sohu, songtaste, soundcloud, ted, theplatform, tudou, tucao, tumblr, vid48, videobam, vimeo, vine, vk, xiami, yinyuetai, youku, youtube video_host = r1(r'https?://([^/]+)/', url) video_url = r1(r'https?://[^/]+(.*)', url) @@ -988,6 +988,7 @@ def url_to_module(url): 'tudou': tudou, 'tumblr': tumblr, 'vid48': vid48, + 'videobam': videobam, 'vimeo': vimeo, 'vine': vine, 'vk': vk, diff --git a/src/you_get/extractors/__init__.py b/src/you_get/extractors/__init__.py index e2510ee3..98aae05f 100644 --- a/src/you_get/extractors/__init__.py +++ b/src/you_get/extractors/__init__.py @@ -41,6 +41,7 @@ from .tucao import * from .tudou import * from .tumblr import * from .vid48 import * +from .videobam import * from .vimeo import * from .vine import * from .vk import * diff --git a/src/you_get/extractors/videobam.py b/src/you_get/extractors/videobam.py new file mode 100644 index 00000000..2764b590 --- /dev/null +++ b/src/you_get/extractors/videobam.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python + +__all__ = ['videobam_download'] + +from ..common import * +import urllib.error +import json + +def videobam_download(url, output_dir = '.', merge = True, info_only = False): + if re.match(r'http://videobam.com/\w+', url): + #Todo: Change to re. way + vid = url.split('/')[-1] + downloadurl = 'http://videobam.com/videos/download/' + vid + html = get_html(downloadurl) + downloadPage_list = html.split('\n') + title = r1(r'