Merge branch 'mojvideo' of https://github.com/DavidFabijan/youtube-dl into DavidFabijan-mojvideo

3 files changed, 42 insertions, 0 deletions

diff --git a/youtube-dl b/youtube-dl
index e3eb8774c..87b20758a 100755
--- a/youtube-dl
+++ b/youtube-dl
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 66c873789..468c7dc29 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -181,6 +181,7 @@ from .mixcloud import MixcloudIE
 from .mlb import MLBIE
 from .mpora import MporaIE
 from .mofosex import MofosexIE
+from .mojvideo import MojvideoIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motherless import MotherlessIE
diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dl/extractor/mojvideo.py
new file mode 100644
index 000000000..ddfef6d3c
--- /dev/null
+++ b/youtube_dl/extractor/mojvideo.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+from __future__ import unicode_literals
+import re
+
+from .common import InfoExtractor
+
+class MojvideoIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?mojvideo\.com/video-.*/(?P<id>[a-f0-9]+)'
+    _TEST = {
+        'url': 'http://www.mojvideo.com/video-v-avtu-pred-mano-rdecelaska-alfi-nipic/3d1ed4497707730b2906',
+        'md5': 'f7fd662cc8ce2be107b0d4f2c0483ae7',
+        'info_dict': {
+            'id': '3d1ed4497707730b2906',
+            'ext': 'mp4',
+            'title': 'V avtu pred mano rdečelaska - Alfi Nipič',
+            'description':'Video: V avtu pred mano rdečelaska - Alfi Nipič',
+            'height':378,
+            'width':480
+        }
+    }
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('id')
+
+        webpage = self._download_webpage(url, video_id)
+        title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title')
+        description = self._search_regex(r'<meta name="description" content="(.*)" />', webpage, 'video description')
+        final_url = self._html_search_regex(r'mp4: \'(.*)\'', webpage, 'video url')
+        height=int(self._search_regex(r'<meta name="video_height" content="([0-9]*)" />',webpage,"video height"))
+        width=int(self._search_regex(r'<meta name="video_width" content="([0-9]*)" />',webpage,"video width"))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'description': description,
+            'ext': 'mp4',
+            'url': final_url,
+            'height':height,
+            'width':width
+        }
\ No newline at end of file