From: Jaime Marquínez Ferrándiz Date: Sat, 13 Jul 2013 10:07:07 +0000 (+0200) Subject: YouJizzIE: support videos that define the urls in a playlist page (closes #1037) X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=2e78b2beadcdb1fc2cfa60789bb501cccd5dbce5;p=youtube-dl YouJizzIE: support videos that define the urls in a playlist page (closes #1037) --- diff --git a/youtube_dl/extractor/youjizz.py b/youtube_dl/extractor/youjizz.py index 6f022670c..1265639e8 100644 --- a/youtube_dl/extractor/youjizz.py +++ b/youtube_dl/extractor/youjizz.py @@ -40,8 +40,20 @@ class YouJizzIE(InfoExtractor): webpage = self._download_webpage(embed_page_url, video_id) # Get the video URL - video_url = self._search_regex(r'so.addVariable\("file",encodeURIComponent\("(?P[^"]+)"\)\);', - webpage, u'video URL') + m_playlist = re.search(r'so.addVariable\("playlist", ?"(?P.+?)"\);', webpage) + if m_playlist is not None: + playlist_url = m_playlist.group('playlist') + playlist_page = self._download_webpage(playlist_url, video_id, + u'Downloading playlist page') + m_levels = list(re.finditer(r'[^"]+)"\)\);', + webpage, u'video URL') info = {'id': video_id, 'url': video_url,