diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..66b5967d
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+you-get
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..e206d70d
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..46a6daaa
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..94015baa
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
new file mode 100644
index 00000000..922003b8
--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..c80f2198
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..bace881f
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1407466376215
+ 1407466376215
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/you-get.iml b/.idea/you-get.iml
new file mode 100644
index 00000000..0a39f16b
--- /dev/null
+++ b/.idea/you-get.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/README.md b/README.md
index 245da7b5..8146db26 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ __中文说明__已移至[wiki](https://github.com/soimort/you-get/wiki/%E4%B8%A
* JPopsuki
* MTV 81
* VID48
+* VideoBam
* Niconico (ニコニコ動画)
* Youku (优酷)
* Tudou (土豆)
diff --git a/src/you_get/common.py b/src/you_get/common.py
old mode 100644
new mode 100755
index 65af9e9a..be0a9e56
--- 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
old mode 100644
new mode 100755
index e2510ee3..e19dd2a8
--- 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 *
+form .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 100755
index 00000000..20d8d36c
--- /dev/null
+++ b/src/you_get/extractors/videobam.py
@@ -0,0 +1,35 @@
+#!/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):
+ #dont know what would happen if I remove those...
+ old_fake_headers = fake_headers
+ #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'