X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fhotnewhiphop.py;h=ccca1d7e0bb41dae5694c2bd582728cc939b87da;hb=204da0d3e3cc5f8675f10f44d0717e210405f8ca;hp=b2fb56e703e4fd3e2de63582f2bea8af186e256d;hpb=ed54491c60d15aee454a322bacbf2fb4ef38d2ab;p=youtube-dl diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py index b2fb56e70..ccca1d7e0 100644 --- a/youtube_dl/extractor/hotnewhiphop.py +++ b/youtube_dl/extractor/hotnewhiphop.py @@ -5,8 +5,15 @@ 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' + _TEST = { + u'url': u"http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html'", + u'file': u'1435540.mp3', + u'md5': u'2c2cd2f76ef11a9b3b581e8b232f3d96', + u'info_dict': { + u"title": u"Freddie Gibbs Songs - Lay It Down" + } + } def _real_extract(self, url): m = re.match(self._VALID_URL, url) @@ -22,21 +29,16 @@ 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) results = [{ 'id': video_id, 'url' : video_url, 'title' : video_title, - 'thumbnail' : thumbnail, + 'thumbnail' : self._og_search_thumbnail(webpage_src), 'ext' : 'mp3', }] - return results \ No newline at end of file + return results