depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-22 16:57:40 +00:00
Code Issues Releases Wiki Activity

[wistia] Add alias and modernize

Browse source
This commit is contained in:
Sergey M․ 2016-05-20 20:55:10 +06:00
parent 31a70191e7
commit f0c96af9cb
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
youtube_dl/extractor/wistia.py
View file

@ -3,16 +3,16 @@ from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
sanitized_Request,
int_or_none, int_or_none,
) )
class WistiaIE(InfoExtractor): class WistiaIE(InfoExtractor):
_VALID_URL = r'https?://(?:fast\.)?wistia\.net/embed/iframe/(?P<id>[a-z0-9]+)' _VALID_URL = r'(?:wistia:|https?://(?:fast\.)?wistia\.net/embed/iframe/)(?P<id>[a-z0-9]+)'
_API_URL = 'http://fast.wistia.com/embed/medias/{0:}.json' _API_URL = 'http://fast.wistia.com/embed/medias/%s.json'
_IFRAME_URL = 'http://fast.wistia.net/embed/iframe/%s'
_TEST = { _TESTS = [{
'url': 'http://fast.wistia.net/embed/iframe/sh7fpupwlt', 'url': 'http://fast.wistia.net/embed/iframe/sh7fpupwlt',
'md5': 'cafeb56ec0c53c18c97405eecb3133df', 'md5': 'cafeb56ec0c53c18c97405eecb3133df',
'info_dict': { 'info_dict': {
@ -24,17 +24,25 @@ class WistiaIE(InfoExtractor):
'timestamp': 1386185018, 'timestamp': 1386185018,
'duration': 117, 'duration': 117,
}, },
} }, {
'url': 'wistia:sh7fpupwlt',
'only_matching': True,
}]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
request = sanitized_Request(self._API_URL.format(video_id)) data_json = self._download_json(
request.add_header('Referer', url) # Some videos require this. self._API_URL % video_id, video_id,
data_json = self._download_json(request, video_id) # Some videos require this.
headers={
'Referer': url if url.startswith('http') else self._IFRAME_URL % video_id,
})
if data_json.get('error'): if data_json.get('error'):
raise ExtractorError('Error while getting the playlist', raise ExtractorError(
expected=True) 'Error while getting the playlist', expected=True)
data = data_json['media'] data = data_json['media']
title = data['name'] title = data['name']