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

[nova] Fix extraction (closes #17241)

Browse Source
This commit is contained in:
Sergey M․ 2018-08-16 00:11:41 +07:00
parent 60c0856223
commit d6ef8b4dd4
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
youtube_dl/extractor/nova.py
View File

@ -6,7 +6,9 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
clean_html, clean_html,
js_to_json,
unified_strdate, unified_strdate,
url_or_none,
) )
@ -111,8 +113,21 @@ class NovaIE(InfoExtractor):
webpage, 'video id') webpage, 'video id')
config_url = self._search_regex( config_url = self._search_regex(
r'src="(http://tn\.nova\.cz/bin/player/videojs/config\.php\?[^"]+)"', r'src="(https?://(?:tn|api)\.nova\.cz/bin/player/videojs/config\.php\?[^"]+)"',
webpage, 'config url', default=None) webpage, 'config url', default=None)
config_params = {}
if not config_url:
player = self._parse_json(
self._search_regex(
r'(?s)Player\s*\(.+?\s*,\s*({.+?\bmedia\b["\']?\s*:\s*["\']?\d+.+?})\s*\)', webpage,
'player', default='{}'),
video_id, transform_source=js_to_json, fatal=False)
if player:
config_url = url_or_none(player.get('configUrl'))
params = player.get('configParams')
if isinstance(params, dict):
config_params = params
if not config_url: if not config_url:
DEFAULT_SITE_ID = '23000' DEFAULT_SITE_ID = '23000'
@ -127,14 +142,20 @@ class NovaIE(InfoExtractor):
} }
site_id = self._search_regex( site_id = self._search_regex(
r'site=(\d+)', webpage, 'site id', default=None) or SITES.get(site, DEFAULT_SITE_ID) r'site=(\d+)', webpage, 'site id', default=None) or SITES.get(
site, DEFAULT_SITE_ID)
config_url = ('http://tn.nova.cz/bin/player/videojs/config.php?site=%s&media=%s&jsVar=vjsconfig' config_url = 'https://api.nova.cz/bin/player/videojs/config.php'
% (site_id, video_id)) config_params = {
'site': site_id,
'media': video_id,
'quality': 3,
'version': 1,
}
config = self._download_json( config = self._download_json(
config_url, display_id, config_url, display_id,
'Downloading config JSON', 'Downloading config JSON', query=config_params,
transform_source=lambda s: s[s.index('{'):s.rindex('}') + 1]) transform_source=lambda s: s[s.index('{'):s.rindex('}') + 1])
mediafile = config['mediafile'] mediafile = config['mediafile']