dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[patreon] Modernize

This commit is contained in:
Philipp Hagemeister 2015-02-19 00:38:05 +01:00
parent a025d3c5a5
commit 7707004043
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/patreon.py
View File

@ -11,7 +11,7 @@ from ..utils import (
class PatreonIE(InfoExtractor): class PatreonIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?patreon\.com/creation\?hid=(.+)' _VALID_URL = r'https?://(?:www\.)?patreon\.com/creation\?hid=(?P<id>[^&#]+)'
_TESTS = [ _TESTS = [
{ {
'url': 'http://www.patreon.com/creation?hid=743933', 'url': 'http://www.patreon.com/creation?hid=743933',
@ -65,9 +65,7 @@ class PatreonIE(InfoExtractor):
''' '''
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group(1)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
title = self._og_search_title(webpage).strip() title = self._og_search_title(webpage).strip()
@ -80,11 +78,10 @@ class PatreonIE(InfoExtractor):
uploader = self._html_search_regex( uploader = self._html_search_regex(
r'<strong>(.*?)</strong> is creating', webpage, 'uploader') r'<strong>(.*?)</strong> is creating', webpage, 'uploader')
else: else:
playlist_js = self._search_regex( playlist = self._parse_json(self._search_regex(
r'(?s)new\s+jPlayerPlaylist\(\s*\{\s*[^}]*},\s*(\[.*?,?\s*\])', r'(?s)new\s+jPlayerPlaylist\(\s*\{\s*[^}]*},\s*(\[.*?,?\s*\])',
webpage, 'playlist JSON') webpage, 'playlist JSON'),
playlist_json = js_to_json(playlist_js) video_id, transform_source=js_to_json)
playlist = json.loads(playlist_json)
data = playlist[0] data = playlist[0]
video_url = self._proto_relative_url(data['mp3']) video_url = self._proto_relative_url(data['mp3'])
thumbnail = self._proto_relative_url(data.get('cover')) thumbnail = self._proto_relative_url(data.get('cover'))