mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-28 17:41:01 +01:00
[veehd] Improve extraction
This commit is contained in:
parent
6a5fa75490
commit
a798e64c15
@ -47,18 +47,35 @@ def _real_extract(self, url):
|
|||||||
self._download_webpage(player_url, video_id, 'Requesting player page')
|
self._download_webpage(player_url, video_id, 'Requesting player page')
|
||||||
player_page = self._download_webpage(
|
player_page = self._download_webpage(
|
||||||
player_url, video_id, 'Downloading player page')
|
player_url, video_id, 'Downloading player page')
|
||||||
config_json = self._search_regex(
|
|
||||||
r'value=\'config=({.+?})\'', player_page, 'config json')
|
|
||||||
config = json.loads(config_json)
|
|
||||||
|
|
||||||
video_url = compat_urlparse.unquote(config['clip']['url'])
|
config_json = self._search_regex(
|
||||||
|
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'<iframe[^>]+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')
|
||||||
|
|
||||||
title = clean_html(get_element_by_id('videoName', webpage).rpartition('|')[0])
|
title = clean_html(get_element_by_id('videoName', webpage).rpartition('|')[0])
|
||||||
uploader_id = self._html_search_regex(r'<a href="/profile/\d+">(.+?)</a>',
|
uploader_id = self._html_search_regex(
|
||||||
webpage, 'uploader')
|
r'<a href="/profile/\d+">(.+?)</a>',
|
||||||
thumbnail = self._search_regex(r'<img id="veehdpreview" src="(.+?)"',
|
webpage, 'uploader')
|
||||||
webpage, 'thumbnail')
|
thumbnail = self._search_regex(
|
||||||
description = self._html_search_regex(r'<td class="infodropdown".*?<div>(.*?)<ul',
|
r'<img id="veehdpreview" src="(.+?)"',
|
||||||
webpage, 'description', flags=re.DOTALL)
|
webpage, 'thumbnail')
|
||||||
|
description = self._html_search_regex(
|
||||||
|
r'<td class="infodropdown".*?<div>(.*?)<ul',
|
||||||
|
webpage, 'description', flags=re.DOTALL)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'_type': 'video',
|
'_type': 'video',
|
||||||
|
Loading…
Reference in New Issue
Block a user