aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--youtube_dl/extractor/hotnewhiphop.py67
1 files changed, 46 insertions, 21 deletions
diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py
index 0ee74fb38..a106f81d2 100644
--- a/youtube_dl/extractor/hotnewhiphop.py
+++ b/youtube_dl/extractor/hotnewhiphop.py
@@ -1,17 +1,25 @@
+from __future__ import unicode_literals
+
import re
import base64
from .common import InfoExtractor
+from ..utils import (
+ compat_urllib_parse,
+ compat_urllib_request,
+ ExtractorError,
+ HEADRequest,
+)
class HotNewHipHopIE(InfoExtractor):
_VALID_URL = r'http://www\.hotnewhiphop.com/.*\.(?P<id>.*)\.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 "Lay It Down"'
+ 'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
+ 'file': '1435540.mp3',
+ 'md5': '2c2cd2f76ef11a9b3b581e8b232f3d96',
+ 'info_dict': {
+ 'title': 'Freddie Gibbs - Lay It Down'
}
}
@@ -21,24 +29,41 @@ class HotNewHipHopIE(InfoExtractor):
webpage_src = self._download_webpage(url, video_id)
- video_url_base64 = self._search_regex(r'data-path="(.*?)"',
- webpage_src, u'video URL', fatal=False)
+ video_url_base64 = self._search_regex(
+ r'data-path="(.*?)"', webpage_src, u'video URL', fatal=False)
- if video_url_base64 == None:
- video_url = self._search_regex(r'"contentUrl" content="(.*?)"', webpage_src,
- u'video URL')
+ if video_url_base64 is None:
+ video_url = self._search_regex(
+ r'"contentUrl" content="(.*?)"', webpage_src, u'video URL')
return self.url_result(video_url, ie='Youtube')
- video_url = base64.b64decode(video_url_base64).decode('utf-8')
+ reqdata = compat_urllib_parse.urlencode([
+ ('mediaType', 's'),
+ ('mediaId', video_id),
+ ])
+ r = compat_urllib_request.Request(
+ 'http://www.hotnewhiphop.com/ajax/media/getActions/', data=reqdata)
+ r.add_header('Content-Type', 'application/x-www-form-urlencoded')
+ mkd = self._download_json(
+ r, video_id, note='Requesting media key',
+ errnote='Could not download media key')
+ if 'mediaKey' not in mkd:
+ raise ExtractorError('Did not get a media key')
+
+ redirect_url = base64.b64decode(video_url_base64).decode('utf-8')
+ redirect_req = HEADRequest(redirect_url)
+ req = self._request_webpage(
+ redirect_req, video_id,
+ note='Resolving final URL', errnote='Could not resolve final URL')
+ video_url = req.geturl()
+ if video_url.endswith('.html'):
+ raise ExtractorError('Redirect failed')
- video_title = self._html_search_regex(r"<title>(.*)</title>",
- webpage_src, u'title')
+ video_title = self._og_search_title(webpage_src).strip()
- results = [{
- 'id': video_id,
- 'url' : video_url,
- 'title' : video_title,
- 'thumbnail' : self._og_search_thumbnail(webpage_src),
- 'ext' : 'mp3',
- }]
- return results
+ return {
+ 'id': video_id,
+ 'url': video_url,
+ 'title': video_title,
+ 'thumbnail': self._og_search_thumbnail(webpage_src),
+ }