X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnewgrounds.py;h=cd117b04edeff88d90842f2ed8e15a8c43bde714;hb=e4df2f98ccbe2e24785dd6883d7fd495193fd8e6;hp=5cb83ba143ba27b072ef9ac80050654c314bc037;hpb=bd2d82a5d3f119644d125e0b0a71dca738733fb4;p=youtube-dl diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py index 5cb83ba14..cd117b04e 100644 --- a/youtube_dl/extractor/newgrounds.py +++ b/youtube_dl/extractor/newgrounds.py @@ -4,18 +4,18 @@ 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\d+)' + _VALID_URL = r'https?://(?:www\.)?newgrounds\.com/audio/listen/(?P[0-9]+)' _TEST = { 'url': 'http://www.newgrounds.com/audio/listen/549479', - 'file': '549479.mp3', 'md5': 'fe6033d297591288fa1c1f780386f07a', 'info_dict': { - "title": "B7 - BusMode", - "uploader": "Burn7", + 'id': '549479', + 'ext': 'mp3', + 'title': 'B7 - BusMode', + 'uploader': 'Burn7', } } @@ -23,12 +23,12 @@ 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') 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)