From: Sergey M․ Date: Sun, 11 Jan 2015 10:20:16 +0000 (+0600) Subject: [veehd] Improve extraction X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=a798e64c1549f4bdf240dec4492203b304a39783;p=youtube-dl [veehd] Improve extraction --- diff --git a/youtube_dl/extractor/veehd.py b/youtube_dl/extractor/veehd.py index 4f76ca403..5dc38dd94 100644 --- a/youtube_dl/extractor/veehd.py +++ b/youtube_dl/extractor/veehd.py @@ -47,18 +47,35 @@ class VeeHDIE(InfoExtractor): self._download_webpage(player_url, video_id, 'Requesting player page') player_page = self._download_webpage( player_url, video_id, 'Downloading player page') + config_json = self._search_regex( - r'value=\'config=({.+?})\'', player_page, 'config json') - config = json.loads(config_json) + r'value=\'config=({.+?})\'', player_page, 'config json', default=None) + + if config_json: + config = json.loads(config_json) + video_url = compat_urlparse.unquote(config['clip']['url']) + else: + iframe_src = self._search_regex( + r']+src="/?([^"]+)"', player_page, 'iframe url') + iframe_url = 'http://veehd.com/%s' % iframe_src + + self._download_webpage(iframe_url, video_id, 'Requesting iframe page') + iframe_page = self._download_webpage( + iframe_url, video_id, 'Downloading iframe page') + + video_url = self._search_regex( + r"file\s*:\s*'([^']+)'", iframe_page, 'video url') - video_url = compat_urlparse.unquote(config['clip']['url']) title = clean_html(get_element_by_id('videoName', webpage).rpartition('|')[0]) - uploader_id = self._html_search_regex(r'(.+?)', - webpage, 'uploader') - thumbnail = self._search_regex(r'(.*?)(.+?)', + webpage, 'uploader') + thumbnail = self._search_regex( + r'(.*?)