mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-23 04:30:10 +09:00
[newgrounds] Support videos (closes #9138)
This commit is contained in:
parent
0841d5013c
commit
0de968b584
@ -7,8 +7,8 @@ from .common import InfoExtractor
|
|||||||
|
|
||||||
|
|
||||||
class NewgroundsIE(InfoExtractor):
|
class NewgroundsIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?newgrounds\.com/audio/listen/(?P<id>[0-9]+)'
|
_VALID_URL = r'https?://(?:www\.)?newgrounds\.com/(?:audio/listen|portal/view)/(?P<id>[0-9]+)'
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
'url': 'http://www.newgrounds.com/audio/listen/549479',
|
'url': 'http://www.newgrounds.com/audio/listen/549479',
|
||||||
'md5': 'fe6033d297591288fa1c1f780386f07a',
|
'md5': 'fe6033d297591288fa1c1f780386f07a',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -17,7 +17,16 @@ class NewgroundsIE(InfoExtractor):
|
|||||||
'title': 'B7 - BusMode',
|
'title': 'B7 - BusMode',
|
||||||
'uploader': 'Burn7',
|
'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):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
@ -25,9 +34,11 @@ class NewgroundsIE(InfoExtractor):
|
|||||||
webpage = self._download_webpage(url, music_id)
|
webpage = self._download_webpage(url, music_id)
|
||||||
|
|
||||||
title = self._html_search_regex(
|
title = self._html_search_regex(
|
||||||
r',"name":"([^"]+)",', webpage, 'music title')
|
r'<title>([^>]+)</title>', webpage, 'title')
|
||||||
|
|
||||||
uploader = self._html_search_regex(
|
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(
|
music_url_json_string = self._html_search_regex(
|
||||||
r'({"url":"[^"]+"),', webpage, 'music url') + '}'
|
r'({"url":"[^"]+"),', webpage, 'music url') + '}'
|
||||||
|
Loading…
Reference in New Issue
Block a user