X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnewgrounds.py;h=7059403239ce19ac8b2861fa4af0dde93c98467b;hb=97653f81b2565c752f2c107fc44167a93c3eef42;hp=f316b92722764495289cf58a841a15bd063d8b1b;hpb=1ef80b55ddf05d7fe2bcba08c414aa10c524870d;p=youtube-dl

diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py
index f316b9272..705940323 100644
--- a/youtube_dl/extractor/newgrounds.py
+++ b/youtube_dl/extractor/newgrounds.py
@@ -1,37 +1,53 @@
+from __future__ import unicode_literals
+
 import json
 import re
 
 from .common import InfoExtractor
-from ..utils import determine_ext
+
 
 class NewgroundsIE(InfoExtractor):
-    _VALID_URL = r'(?:https?://)?(?:www\.)?newgrounds\.com/audio/listen/(?P<id>\d+)'
-    _TEST = {
-        u'url': u'http://www.newgrounds.com/audio/listen/549479',
-        u'file': u'549479.mp3',
-        u'md5': u'2924d938f60415cd7afbe7ae9042a99e',
-        u'info_dict': {
-            u"title": u"B7 - BusMode",
-            u"uploader" : u"Burn7",
+    _VALID_URL = r'https?://(?:www\.)?newgrounds\.com/(?:audio/listen|portal/view)/(?P<id>[0-9]+)'
+    _TESTS = [{
+        'url': 'http://www.newgrounds.com/audio/listen/549479',
+        'md5': 'fe6033d297591288fa1c1f780386f07a',
+        'info_dict': {
+            'id': '549479',
+            'ext': 'mp3',
+            'title': 'B7 - BusMode',
+            'uploader': 'Burn7',
         }
-    }
+    }, {
+        'url': 'http://www.newgrounds.com/portal/view/673111',
+        'md5': '3394735822aab2478c31b1004fe5e5bc',
+        'info_dict': {
+            'id': '673111',
+            'ext': 'mp4',
+            'title': 'Dancin',
+            'uploader': 'Squirrelman82',
+        },
+    }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         music_id = mobj.group('id')
         webpage = self._download_webpage(url, music_id)
-        
-        title = self._html_search_regex(r',"name":"([^"]+)",', webpage, 'music title', flags=re.DOTALL)
-        uploader = self._html_search_regex(r',"artist":"([^"]+)",', webpage, 'music uploader', flags=re.DOTALL)
-        
-        music_url_json_string = '{"url":"' + self._html_search_regex(r'{"url":"([^"]+)",', webpage, 'music url', flags=re.DOTALL) + '"}'
+
+        title = self._html_search_regex(
+            r'<title>([^>]+)</title>', webpage, 'title')
+
+        uploader = self._html_search_regex(
+            [r',"artist":"([^"]+)",', r'[\'"]owner[\'"]\s*:\s*[\'"]([^\'"]+)[\'"],'],
+            webpage, 'uploader')
+
+        music_url_json_string = self._html_search_regex(
+            r'({"url":"[^"]+"),', webpage, 'music url') + '}'
         music_url_json = json.loads(music_url_json_string)
         music_url = music_url_json['url']
 
-        return [{
-            'id':       music_id,
-            'title':    title,            
-            'url':      music_url,
+        return {
+            'id': music_id,
+            'title': title,
+            'url': music_url,
             'uploader': uploader,
-            'ext':      determine_ext(music_url),
-        }]
+        }