pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-14 22:37:59 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:rg3/youtube-dl

Browse Source
This commit is contained in:
Sergey M․ 2016-09-10 19:21:03 +07:00
commit f009fcac0d
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
version <unreleased>
Extractors
* [newgrounds] Fix uploader extraction (#10584)
version 2016.09.08 version 2016.09.08
Extractors Extractors

23
youtube_dl/extractor/newgrounds.py
View File

@ -1,15 +1,12 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import json
import re
from .common import InfoExtractor from .common import InfoExtractor
class NewgroundsIE(InfoExtractor): class NewgroundsIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?newgrounds\.com/(?:audio/listen|portal/view)/(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:www\.)?newgrounds\.com/(?:audio/listen|portal/view)/(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.newgrounds.com/audio/listen/549479', 'url': 'https://www.newgrounds.com/audio/listen/549479',
'md5': 'fe6033d297591288fa1c1f780386f07a', 'md5': 'fe6033d297591288fa1c1f780386f07a',
'info_dict': { 'info_dict': {
'id': '549479', 'id': '549479',
@ -18,7 +15,7 @@ class NewgroundsIE(InfoExtractor):
'uploader': 'Burn7', 'uploader': 'Burn7',
} }
}, { }, {
'url': 'http://www.newgrounds.com/portal/view/673111', 'url': 'https://www.newgrounds.com/portal/view/673111',
'md5': '3394735822aab2478c31b1004fe5e5bc', 'md5': '3394735822aab2478c31b1004fe5e5bc',
'info_dict': { 'info_dict': {
'id': '673111', 'id': '673111',
@ -29,24 +26,20 @@ class NewgroundsIE(InfoExtractor):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) media_id = self._match_id(url)
music_id = mobj.group('id') webpage = self._download_webpage(url, media_id)
webpage = self._download_webpage(url, music_id)
title = self._html_search_regex( title = self._html_search_regex(
r'<title>([^>]+)</title>', webpage, 'title') r'<title>([^>]+)</title>', webpage, 'title')
uploader = self._html_search_regex( uploader = self._html_search_regex(
[r',"artist":"([^"]+)",', r'[\'"]owner[\'"]\s*:\s*[\'"]([^\'"]+)[\'"],'], r'Author\s*<a[^>]+>([^<]+)', webpage, 'uploader', fatal=False)
webpage, 'uploader')
music_url_json_string = self._html_search_regex( music_url = self._parse_json(self._search_regex(
r'({"url":"[^"]+"),', webpage, 'music url') + '}' r'"url":("[^"]+"),', webpage, ''), media_id)
music_url_json = json.loads(music_url_json_string)
music_url = music_url_json['url']
return { return {
'id': music_id, 'id': media_id,
'title': title, 'title': title,
'url': music_url, 'url': music_url,
'uploader': uploader, 'uploader': uploader,