From 5537dce84da34110198fc9b46c1770e5eca0fa8b Mon Sep 17 00:00:00 2001 From: David Fabijan Date: Sun, 3 Aug 2014 10:50:25 +0200 Subject: [Mojvideo] Add new extractor --- youtube_dl/extractor/__init__.py | 1 + youtube_dl/extractor/mojvideo.py | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 youtube_dl/extractor/mojvideo.py (limited to '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..db315c17e --- /dev/null +++ b/youtube_dl/extractor/mojvideo.py @@ -0,0 +1,46 @@ +import re + +from .common import InfoExtractor + +class MojvideoIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)?mojvideo\.com/video-.*/(?P[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 + # TODO more properties, either as: + # * A value + # * MD5 checksum; start the string with md5: + # * A regular expression; start the string with re: + # * Any Python type (for example int or float) + } + } + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + video_id = mobj.group('id') + + # TODO more code goes here, for example ... + webpage = self._download_webpage(url, video_id) + title = self._html_search_regex(r'(.*?)', webpage, 'title') + description = self._search_regex(r'', webpage, 'video description') + final_url = self._html_search_regex(r'mp4: \'(.*)\'', webpage, 'video url') + height=int(self._search_regex(r'',webpage,"video height")) + width=int(self._search_regex(r'',webpage,"video width")) + + return { + 'id': video_id, + 'title': title, + 'description': description, + 'ext': 'mp4', + 'url': final_url, + 'height':height, + 'width':width + # TODO more properties (see youtube_dl/extractor/common.py) + } \ No newline at end of file -- cgit v1.2.3 From be79b079070e321dd9ab63573494709f9ae81cbd Mon Sep 17 00:00:00 2001 From: David Fabijan Date: Sun, 3 Aug 2014 11:55:51 +0200 Subject: [Mojvideo] Add new extractor (minor changes) --- youtube_dl/extractor/mojvideo.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'youtube_dl') diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dl/extractor/mojvideo.py index db315c17e..db2bb6dc2 100644 --- a/youtube_dl/extractor/mojvideo.py +++ b/youtube_dl/extractor/mojvideo.py @@ -12,13 +12,8 @@ class MojvideoIE(InfoExtractor): 'ext': 'mp4', 'title': 'V avtu pred mano rdečelaska - Alfi Nipič', 'description':'Video: V avtu pred mano rdečelaska - Alfi Nipič', - 'height':378, + 'height':37 8, 'width':480 - # TODO more properties, either as: - # * A value - # * MD5 checksum; start the string with md5: - # * A regular expression; start the string with re: - # * Any Python type (for example int or float) } } @@ -26,7 +21,6 @@ class MojvideoIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') - # TODO more code goes here, for example ... webpage = self._download_webpage(url, video_id) title = self._html_search_regex(r'(.*?)', webpage, 'title') description = self._search_regex(r'', webpage, 'video description') @@ -42,5 +36,4 @@ class MojvideoIE(InfoExtractor): 'url': final_url, 'height':height, 'width':width - # TODO more properties (see youtube_dl/extractor/common.py) } \ No newline at end of file -- cgit v1.2.3 From 78b296b0ff3f759d17ca1b5de9fb057b6867c089 Mon Sep 17 00:00:00 2001 From: David Fabijan Date: Sun, 3 Aug 2014 11:56:32 +0200 Subject: [Mojvideo] Add new extractor (minor changes) --- youtube_dl/extractor/mojvideo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'youtube_dl') diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dl/extractor/mojvideo.py index db2bb6dc2..1223fdf2f 100644 --- a/youtube_dl/extractor/mojvideo.py +++ b/youtube_dl/extractor/mojvideo.py @@ -12,7 +12,7 @@ class MojvideoIE(InfoExtractor): 'ext': 'mp4', 'title': 'V avtu pred mano rdečelaska - Alfi Nipič', 'description':'Video: V avtu pred mano rdečelaska - Alfi Nipič', - 'height':37 8, + 'height':378, 'width':480 } } -- cgit v1.2.3 From 66420a2db455cb9ae41ba0e2bd06f53e4e5092fc Mon Sep 17 00:00:00 2001 From: David Fabijan Date: Wed, 6 Aug 2014 14:44:29 +0200 Subject: Fixed the encoding --- youtube_dl/extractor/mojvideo.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'youtube_dl') diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dl/extractor/mojvideo.py index 1223fdf2f..ddfef6d3c 100644 --- a/youtube_dl/extractor/mojvideo.py +++ b/youtube_dl/extractor/mojvideo.py @@ -1,3 +1,5 @@ +# coding: utf-8 +from __future__ import unicode_literals import re from .common import InfoExtractor -- cgit v1.2.3