gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[wimp] Fix extraction (Closes #7784)

Browse source
This commit is contained in:
Sergey M․ 2015-12-07 22:14:45 +06:00
parent a5e52a1fd4
commit 0d2d967cc7
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
youtube_dl/extractor/wimp.py
View file

@ -5,7 +5,7 @@ from .youtube import YoutubeIE
class WimpIE(InfoExtractor): class WimpIE(InfoExtractor):
_VALID_URL = r'http://(?:www\.)?wimp\.com/(?P<id>[^/]+)/' _VALID_URL = r'http://(?:www\.)?wimp\.com/(?P<id>[^/]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.wimp.com/maruexhausted/', 'url': 'http://www.wimp.com/maruexhausted/',
'md5': 'ee21217ffd66d058e8b16be340b74883', 'md5': 'ee21217ffd66d058e8b16be340b74883',
@ -28,18 +28,23 @@ class WimpIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
video_url = self._search_regex(
[r"[\"']file[\"']\s*[:,]\s*[\"'](.+?)[\"']", r"videoId\s*:\s*[\"']([^\"']+)[\"']"], youtube_id = self._search_regex(
webpage, 'video URL') r"videoId\s*:\s*[\"']([0-9A-Za-z_-]{11})[\"']",
if YoutubeIE.suitable(video_url): webpage, 'video URL', default=None)
self.to_screen('Found YouTube video') if youtube_id:
return { return {
'_type': 'url', '_type': 'url',
'url': video_url, 'url': youtube_id,
'ie_key': YoutubeIE.ie_key(), 'ie_key': YoutubeIE.ie_key(),
} }
video_url = self._search_regex(
r'<video[^>]+>\s*<source src=(["\'])(?P<url>.+?)\1',
webpage, 'video URL', group='url')
return { return {
'id': video_id, 'id': video_id,
'url': video_url, 'url': video_url,