Merge branch 'cnbeining-develop' into develop

* Fix #117

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,

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 *

src/you_get/extractors/videobam.py

+#!/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'<meta property="og:title" content="([^"]*)"', html)
+        for i in downloadPage_list:
+            if 'ajax_download_url' in i:
+                ajaxurl = 'http://videobam.com/videos/ajax_download_url/'+ vid+'/' + i.split('/')[-1][:-2]
+                break
+        json_class = json.JSONDecoder()
+        api_response = json_class.raw_decode(get_html(ajaxurl))
+        url = str(api_response[0]['url'])
+        type, ext, 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)
+
+site_info = "VideoBam"
+download = videobam_download
+download_playlist = playlist_not_supported('videobam')