depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-22 02:01:50 +00:00
Code Issues Releases Wiki Activity

[escapist] Modernize

Browse source
This commit is contained in:
Remita Amine 2019-03-11 08:18:57 +01:00
parent 99534feaff
commit fddb4a3a8b
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
youtube_dl/extractor/escapist.py
View file

@ -1,14 +1,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import json
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
clean_html, clean_html,
int_or_none, int_or_none,
float_or_none, float_or_none,
sanitized_Request,
) )
@ -36,7 +33,7 @@ def _decrypt_config(key, string):
class EscapistIE(InfoExtractor): class EscapistIE(InfoExtractor):
_VALID_URL = r'https?://?(?:www\.)?escapistmagazine\.com/videos/view/[^/?#]+/(?P<id>[0-9]+)-[^/?#]*(?:$|[?#])' _VALID_URL = r'https?://?(?:(?:www|v1)\.)?escapistmagazine\.com/videos/view/[^/]+/(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate', 'url': 'http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate',
'md5': 'ab3a706c681efca53f0a35f1415cf0d1', 'md5': 'ab3a706c681efca53f0a35f1415cf0d1',
@ -61,6 +58,12 @@ class EscapistIE(InfoExtractor):
'duration': 304, 'duration': 304,
'uploader': 'The Escapist', 'uploader': 'The Escapist',
} }
}, {
'url': 'http://escapistmagazine.com/videos/view/the-escapist-presents/6618',
'only_matching': True,
}, {
'url': 'https://v1.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -74,19 +77,20 @@ class EscapistIE(InfoExtractor):
video_id = ims_video['videoID'] video_id = ims_video['videoID']
key = ims_video['hash'] key = ims_video['hash']
config_req = sanitized_Request( config = self._download_webpage(
'http://www.escapistmagazine.com/videos/' 'http://www.escapistmagazine.com/videos/vidconfig.php',
'vidconfig.php?videoID=%s&hash=%s' % (video_id, key)) video_id, 'Downloading video config', headers={
config_req.add_header('Referer', url) 'Referer': url,
config = self._download_webpage(config_req, video_id, 'Downloading video config') }, query={
'videoID': video_id,
'hash': key,
})
data = json.loads(_decrypt_config(key, config)) data = self._parse_json(_decrypt_config(key, config), video_id)
video_data = data['videoData'] video_data = data['videoData']
title = clean_html(video_data['title']) title = clean_html(video_data['title'])
duration = float_or_none(video_data.get('duration'), 1000)
uploader = video_data.get('publisher')
formats = [{ formats = [{
'url': video['src'], 'url': video['src'],
@ -99,8 +103,9 @@ class EscapistIE(InfoExtractor):
'id': video_id, 'id': video_id,
'formats': formats, 'formats': formats,
'title': title, 'title': title,
'thumbnail': self._og_search_thumbnail(webpage), 'thumbnail': self._og_search_thumbnail(webpage) or data.get('poster'),
'description': self._og_search_description(webpage), 'description': self._og_search_description(webpage),
'duration': duration, 'duration': float_or_none(video_data.get('duration'), 1000),
'uploader': uploader, 'uploader': video_data.get('publisher'),
'series': video_data.get('show'),
} }