aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-09-18 22:14:43 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-09-18 22:14:43 +0200
commitd0ae9e3a8d807d0466bccc27186c8c2d86215350 (patch)
treeba1d4c9bfe8652c870354f3ac21cf71570ead456
parenta19413c311e1bd2ffef2705212a8719b7126eef9 (diff)
[newgrounds] simplify
-rw-r--r--youtube_dl/extractor/newgrounds.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py
index e66294ade..2ef80bce0 100644
--- a/youtube_dl/extractor/newgrounds.py
+++ b/youtube_dl/extractor/newgrounds.py
@@ -4,6 +4,7 @@ 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 = {
@@ -12,7 +13,7 @@ class NewgroundsIE(InfoExtractor):
u'md5': u'fe6033d297591288fa1c1f780386f07a',
u'info_dict': {
u"title": u"B7 - BusMode",
- u"uploader" : u"Burn7",
+ u"uploader": u"Burn7",
}
}
@@ -21,17 +22,17 @@ class NewgroundsIE(InfoExtractor):
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)
+ title = self._html_search_regex(r',"name":"([^"]+)",', webpage, u'music title')
+ uploader = self._html_search_regex(r',"artist":"([^"]+)",', webpage, u'music uploader')
- music_url_json_string = '{"url":"' + self._html_search_regex(r'{"url":"([^"]+)",', webpage, 'music url', flags=re.DOTALL) + '"}'
+ music_url_json_string = self._html_search_regex(r'({"url":"[^"]+"),', webpage, u'music url') + '}'
music_url_json = json.loads(music_url_json_string)
music_url = music_url_json['url']
- return [{
+ return {
'id': music_id,
- 'title': title,
+ 'title': title,
'url': music_url,
'uploader': uploader,
'ext': determine_ext(music_url),
- }]
+ }