projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9b3ab4
)
[escapist] Fix formats extraction
author
Sergey M․
<dstftw@gmail.com>
Mon, 4 May 2015 12:59:22 +0000
(18:59 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 4 May 2015 12:59:22 +0000
(18:59 +0600)
youtube_dl/extractor/escapist.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/escapist.py
b/youtube_dl/extractor/escapist.py
index 8facf11858fefe48490f4b40e1129c0c45d36b06..802943dc2f765110104dbfe16d4a038b5ef876e9 100644
(file)
--- 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,
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']
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,
return {
'id': video_id,