From ed4a915e08927bad25db70b489972fa68c9ad0bb Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 27 Jun 2013 17:56:48 +0200 Subject: [PATCH] Add tests and improve for HotNewHipHop --- test/tests.json | 9 +++++++++ youtube_dl/extractor/hotnewhiphop.py | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/test/tests.json b/test/tests.json index ebc7a123c..d34d960f7 100644 --- a/test/tests.json +++ b/test/tests.json @@ -714,5 +714,14 @@ "info_dict": { "title": "Watch Till End: Herd of deer jump over a fence." } + }, + { + "name": "HotNewHipHop", + "url": "http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html'", + "file": "1435540.mp3", + "md5": "2c2cd2f76ef11a9b3b581e8b232f3d96", + "info_dict": { + "title": "Freddie Gibbs Songs - Lay It Down" + } } ] diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py index b2fb56e70..82752f912 100644 --- a/youtube_dl/extractor/hotnewhiphop.py +++ b/youtube_dl/extractor/hotnewhiphop.py @@ -5,8 +5,7 @@ from .common import InfoExtractor class HotNewHipHopIE(InfoExtractor): - _VALID_URL = r'(http://www\.hotnewhiphop.com/.*\.(?P.*)\.html)' - IE_NAME = u'HotNewHipHop' + _VALID_URL = r'http://www\.hotnewhiphop.com/.*\.(?P.*)\.html' def _real_extract(self, url): m = re.match(self._VALID_URL, url) @@ -22,12 +21,11 @@ class HotNewHipHopIE(InfoExtractor): u'video URL') return self.url_result(video_url, ie='Youtube') - video_url = base64.b64decode(video_url_base64) + video_url = base64.b64decode(video_url_base64).decode('utf-8') video_title = self._html_search_regex(r"(.*)", webpage_src, u'title') - #"og:image" content= # Getting thumbnail and if not thumbnail sets correct title for WSHH candy video. thumbnail = self._html_search_regex(r'"og:image" content="(.*)"', webpage_src, u'thumbnail', fatal=False)