X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnewgrounds.py;h=cd117b04edeff88d90842f2ed8e15a8c43bde714;hb=c571dea9532e468ba294b933d16d9366baf825d5;hp=e66294adeed2b88969fc36482b195f08f52a30f1;hpb=a19413c311e1bd2ffef2705212a8719b7126eef9;p=youtube-dl.git

diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py
index e66294ade..cd117b04e 100644
--- a/youtube_dl/extractor/newgrounds.py
+++ b/youtube_dl/extractor/newgrounds.py
@@ -1,18 +1,21 @@
+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+)'
+    _VALID_URL = r'https?://(?:www\.)?newgrounds\.com/audio/listen/(?P<id>[0-9]+)'
     _TEST = {
-        u'url': u'http://www.newgrounds.com/audio/listen/549479',
-        u'file': u'549479.mp3',
-        u'md5': u'fe6033d297591288fa1c1f780386f07a',
-        u'info_dict': {
-            u"title": u"B7 - BusMode",
-            u"uploader" : u"Burn7",
+        'url': 'http://www.newgrounds.com/audio/listen/549479',
+        'md5': 'fe6033d297591288fa1c1f780386f07a',
+        'info_dict': {
+            'id': '549479',
+            'ext': 'mp3',
+            'title': 'B7 - BusMode',
+            'uploader': 'Burn7',
         }
     }
 
@@ -20,18 +23,20 @@ class NewgroundsIE(InfoExtractor):
         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',"name":"([^"]+)",', webpage, 'music title')
+        uploader = self._html_search_regex(
+            r',"artist":"([^"]+)",', webpage, 'music 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),
-        }]
+        }