From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Jun 2013 15:58:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/HEAD'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=500f3d24324c8d9a53af2a55d9b3dd8c3db79eab;hp=c90f13d1067067e0532dfc1666c1743366bc4d31;p=youtube-dl

Merge remote-tracking branch 'origin/HEAD'
---

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/__init__.py b/youtube_dl/extractor/__init__.py
index 2750fc8f9..cc818fcc1 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -18,6 +18,7 @@ from .gametrailers import GametrailersIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
+from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .hypem import HypemIE
 from .ina import InaIE
@@ -136,6 +137,7 @@ def gen_extractors():
         TudouIE(),
         CSpanIE(),
         WimpIE(),
+        HotNewHipHopIE(),
         GenericIE()
     ]
 
diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py
new file mode 100644
index 000000000..82752f912
--- /dev/null
+++ b/youtube_dl/extractor/hotnewhiphop.py
@@ -0,0 +1,40 @@
+import re
+import base64
+
+from .common import InfoExtractor
+
+
+class HotNewHipHopIE(InfoExtractor):
+    _VALID_URL = r'http://www\.hotnewhiphop.com/.*\.(?P<id>.*)\.html'
+
+    def _real_extract(self, url):
+        m = re.match(self._VALID_URL, url)
+        video_id = m.group('id')
+
+        webpage_src = self._download_webpage(url, video_id)
+
+        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')
+            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')
+        
+        # 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,
+                    'ext' : 'mp3',
+                    }]
+        return results
\ No newline at end of file