X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fhotnewhiphop.py;h=ca3abb7d7fdaaf5c84869e1b4eda125d5076573a;hb=20c3893f0ea7c341ed015a15cec951ab4f7c8748;hp=24f6e81438bfd2827693b1071f9964319cd88818;hpb=8b50fed04b15647210f7597150b84514ca6ff7d0;p=youtube-dl

diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py
index 24f6e8143..ca3abb7d7 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<id>.*)\.html)'
-    IE_NAME = u'HotNewHipHop'
+    _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 Songs - Lay It Down"
+        }
+    }
 
     def _real_extract(self, url):
         m = re.match(self._VALID_URL, url)
@@ -15,14 +22,18 @@ 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')
+            webpage_src, u'video URL', fatal=False)
 
-        video_url = base64.b64decode(video_url_base64)
+        if video_url_base64 == 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')
 
         video_title = self._html_search_regex(r"<title>(.*)</title>",
             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)