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

[escapist] Fix formats extraction

Browse Source
This commit is contained in:
Sergey M․ 2015-05-04 18:59:22 +06:00
parent b9b3ab45ea
commit 71fa56b887
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
youtube_dl/extractor/escapist.py
View File

@ -8,7 +8,7 @@ from ..compat import compat_urllib_request
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
clean_html, clean_html,
qualities, int_or_none,
) )
@ -72,28 +72,23 @@ class EscapistIE(InfoExtractor):
video_id = imsVideo['videoID'] video_id = imsVideo['videoID']
key = imsVideo['hash'] key = imsVideo['hash']
quality = qualities(['lq', 'hq', 'hd']) config_req = compat_urllib_request.Request(
'http://www.escapistmagazine.com/videos/'
'vidconfig.php?videoID=%s&hash=%s' % (video_id, key))
config_req.add_header('Referer', url)
config = self._download_webpage(config_req, video_id, 'Downloading video config')
formats = [] data = json.loads(_decrypt_config(key, config))
for q in ['lq', 'hq', 'hd']:
config_req = compat_urllib_request.Request(
'http://www.escapistmagazine.com/videos/'
'vidconfig.php?videoID=%s&hash=%s&quality=%s' % (video_id, key, 'mp4_' + q))
config_req.add_header('Referer', url)
config = self._download_webpage(config_req, video_id, 'Downloading video config ' + q.upper())
data = json.loads(_decrypt_config(key, config)) title = clean_html(data['videoData']['title'])
duration = data['videoData']['duration'] / 1000
title = clean_html(data['videoData']['title']) formats = [{
duration = data['videoData']['duration'] / 1000 'url': video['src'],
'format_id': '%s-%sp' % (determine_ext(video['src']), video['res']),
for i, v in enumerate(data['files']['videos']): 'height': int_or_none(video.get('res')),
} for video in data['files']['videos']]
formats.append({ self._sort_formats(formats)
'url': v,
'format_id': determine_ext(v) + '_' + q + str(i),
'quality': quality(q),
})
return { return {
'id': video_id, 'id': video_id,