From 71fa56b887b7c4d1a3ba16c7127736fcaec34b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Mon, 4 May 2015 18:59:22 +0600
Subject: [PATCH] [escapist] Fix formats extraction
---
youtube_dl/extractor/escapist.py | 35 ++++++++++++++------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/youtube_dl/extractor/escapist.py b/youtube_dl/extractor/escapist.py
index 8facf1185..802943dc2 100644
--- a/youtube_dl/extractor/escapist.py
+++ b/youtube_dl/extractor/escapist.py
@@ -8,7 +8,7 @@ from ..compat import compat_urllib_request
from ..utils import (
determine_ext,
clean_html,
- qualities,
+ int_or_none,
)
@@ -72,28 +72,23 @@ class EscapistIE(InfoExtractor):
video_id = imsVideo['videoID']
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 = []
- 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))
- data = json.loads(_decrypt_config(key, config))
+ title = clean_html(data['videoData']['title'])
+ duration = data['videoData']['duration'] / 1000
- title = clean_html(data['videoData']['title'])
- duration = data['videoData']['duration'] / 1000
-
- for i, v in enumerate(data['files']['videos']):
-
- formats.append({
- 'url': v,
- 'format_id': determine_ext(v) + '_' + q + str(i),
- 'quality': quality(q),
- })
+ formats = [{
+ 'url': video['src'],
+ 'format_id': '%s-%sp' % (determine_ext(video['src']), video['res']),
+ 'height': int_or_none(video.get('res')),
+ } for video in data['files']['videos']]
+ self._sort_formats(formats)
return {
'id': video_id,