From 0de968b58408a5584c9ad51f646f07e0fe161def Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Sat, 16 Apr 2016 17:36:30 +0800 Subject: [PATCH] [newgrounds] Support videos (closes #9138) --- youtube_dl/extractor/newgrounds.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py index cd117b04e..705940323 100644 --- a/youtube_dl/extractor/newgrounds.py +++ b/youtube_dl/extractor/newgrounds.py @@ -7,8 +7,8 @@ class NewgroundsIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?newgrounds\.com/audio/listen/(?P[0-9]+)' - _TEST = { + _VALID_URL = r'https?://(?:www\.)?newgrounds\.com/(?:audio/listen|portal/view)/(?P[0-9]+)' + _TESTS = [{ 'url': 'http://www.newgrounds.com/audio/listen/549479', 'md5': 'fe6033d297591288fa1c1f780386f07a', 'info_dict': { @@ -17,7 +17,16 @@ class NewgroundsIE(InfoExtractor): '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) @@ -25,9 +34,11 @@ def _real_extract(self, url): webpage = self._download_webpage(url, music_id) title = self._html_search_regex( - r',"name":"([^"]+)",', webpage, 'music title') + r'([^>]+)', webpage, 'title') + uploader = self._html_search_regex( - r',"artist":"([^"]+)",', webpage, 'music uploader') + [r',"artist":"([^"]+)",', r'[\'"]owner[\'"]\s*:\s*[\'"]([^\'"]+)[\'"],'], + webpage, 'uploader') music_url_json_string = self._html_search_regex( r'({"url":"[^"]+"),', webpage, 'music url') + '}'