From c81a855b0facdb143f656a360719f63d4a1061aa Mon Sep 17 00:00:00 2001 From: Oleg Prutz Date: Thu, 30 Jan 2014 21:26:50 +0400 Subject: [PATCH 1/3] Added support for normalboots.com --- youtube_dl/extractor/__init__.py | 1 + youtube_dl/extractor/normalboots.py | 50 +++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 youtube_dl/extractor/normalboots.py diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index e89b5cf9d..663c8bd7f 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -141,6 +141,7 @@ from .newgrounds import NewgroundsIE from .nhl import NHLIE, NHLVideocenterIE from .niconico import NiconicoIE from .ninegag import NineGagIE +from .normalboots import NormalbootsIE from .novamov import NovamovIE from .nowness import NownessIE from .nowvideo import NowVideoIE diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dl/extractor/normalboots.py new file mode 100644 index 000000000..75a5fa0a6 --- /dev/null +++ b/youtube_dl/extractor/normalboots.py @@ -0,0 +1,50 @@ +import re + +from .common import InfoExtractor + +from ..utils import ( + ExtractorError, + unified_strdate, +) + +class NormalbootsIE(InfoExtractor): + _VALID_URL = r'(?:http://)?(?:www\.)?normalboots\.com/video/(?P[0-9a-z-]*)/?$' + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + if mobj is None: + raise ExtractorError(u'Invalid URL: %s' % url) + video_id = mobj.group('videoid') + + info = { + 'id': video_id, + 'uploader': None, + 'upload_date': None, + } + + if url[:4] != 'http': + url = 'http://' + url + + webpage = self._download_webpage(url, video_id) + video_title = self._og_search_title(webpage) + video_description = self._og_search_description(webpage) + video_thumbnail = self._og_search_thumbnail(webpage) + video_uploader = self._html_search_regex(r'Posted\sby\s(?P[A-Za-z]*)\s', + webpage, 'uploader') + raw_upload_date = self._html_search_regex('[A-Za-z]+, (?P.*)', + webpage, 'date') + video_upload_date = unified_strdate(raw_upload_date) + video_upload_date = unified_strdate(raw_upload_date) + + player_url = self._html_search_regex(r'[\S]+)"', webpage, 'url') + player_page = self._download_webpage(player_url, video_id) + video_url = u'http://player.screenwavemedia.com/' + self._html_search_regex(r"'file':\s'(?P[0-9A-Za-z-_\.]+)'", player_page, 'file') + + info['url'] = video_url + info['title'] = video_title + info['description'] = video_description + info['thumbnail'] = video_thumbnail + info['uploader'] = video_uploader + info['upload_date'] = video_upload_date + + return info From 3bf8bc7f3753aef5fbd46b840b334e82ae409e4e Mon Sep 17 00:00:00 2001 From: Oleg Prutz Date: Thu, 30 Jan 2014 23:01:35 +0300 Subject: [PATCH 2/3] Update normalboots.py _TEST added --- youtube_dl/extractor/normalboots.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dl/extractor/normalboots.py index 75a5fa0a6..8da289d78 100644 --- a/youtube_dl/extractor/normalboots.py +++ b/youtube_dl/extractor/normalboots.py @@ -9,6 +9,17 @@ from ..utils import ( class NormalbootsIE(InfoExtractor): _VALID_URL = r'(?:http://)?(?:www\.)?normalboots\.com/video/(?P[0-9a-z-]*)/?$' + _TEST = { + u'url': u'http://normalboots.com/video/home-alone-games-jontron/', + u'file': u'JonTronShow-52e2fafa8718e_high.mp4', + u'md5': u'8b215e2e0168c6081a1cf84b2846a2b5', + u'info_dict': { + u'title': u'Home Alone Games - JonTron - NormalBoots', + u'description': u'Jon is late for Christmas. Typical. Thanks to: Paul Ritchey for Co-Writing/Filming: http://www.youtube.com/user/ContinueShow Micha Frar for Christmas Intro Animation: http://michafrar.tumblr.com/ Jerrod Waters for Christmas Intro Music: http://www.youtube.com/user/xXJerryTerryXx Casey Ormond for \u2018Tense Battle Theme\u2019:\xa0http://www.youtube.com/Kiamet/', + u'uploader': u'JonTron', + u'upload_date': u'20140125', + } + } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) From 2949cbe03615f1194340e555c1eba7912eb270d4 Mon Sep 17 00:00:00 2001 From: Oleg Prutz Date: Fri, 31 Jan 2014 16:51:34 +0300 Subject: [PATCH 3/3] Update normalboots.py fixed --- youtube_dl/extractor/normalboots.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dl/extractor/normalboots.py index 8da289d78..0bff8dc5b 100644 --- a/youtube_dl/extractor/normalboots.py +++ b/youtube_dl/extractor/normalboots.py @@ -11,8 +11,8 @@ class NormalbootsIE(InfoExtractor): _VALID_URL = r'(?:http://)?(?:www\.)?normalboots\.com/video/(?P[0-9a-z-]*)/?$' _TEST = { u'url': u'http://normalboots.com/video/home-alone-games-jontron/', - u'file': u'JonTronShow-52e2fafa8718e_high.mp4', - u'md5': u'8b215e2e0168c6081a1cf84b2846a2b5', + u'file': u'home-alone-games-jontron.mp4', + u'md5': u'8bf6de238915dd501105b44ef5f1e0f6', u'info_dict': { u'title': u'Home Alone Games - JonTron - NormalBoots', u'description': u'Jon is late for Christmas. Typical. Thanks to: Paul Ritchey for Co-Writing/Filming: http://www.youtube.com/user/ContinueShow Micha Frar for Christmas Intro Animation: http://michafrar.tumblr.com/ Jerrod Waters for Christmas Intro Music: http://www.youtube.com/user/xXJerryTerryXx Casey Ormond for \u2018Tense Battle Theme\u2019:\xa0http://www.youtube.com/Kiamet/',