Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-31 02:05:34 +08:00
Code Issues Releases Wiki Activity

[viddler] Modernize

Browse Source
This commit is contained in:
Remita Amine 2019-03-11 15:53:44 +01:00
parent 4993132344
commit e585547284
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
youtube_dl/extractor/viddler.py
View File

@ -1,19 +1,16 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import (
compat_urllib_parse_urlencode,
compat_urlparse,
)
from ..utils import ( from ..utils import (
float_or_none, float_or_none,
int_or_none, int_or_none,
sanitized_Request,
) )
class ViddlerIE(InfoExtractor): class ViddlerIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?viddler\.com/(?:v|embed|player)/(?P<id>[a-z0-9]+)' _VALID_URL = r'https?://(?:www\.)?viddler\.com/(?:v|embed|player)/(?P<id>[a-z0-9]+)(?:.+?\bsecret=(\d+))?'
_TESTS = [{ _TESTS = [{
'url': 'http://www.viddler.com/v/43903784', 'url': 'http://www.viddler.com/v/43903784',
'md5': '9eee21161d2c7f5b39690c3e325fab2f', 'md5': '9eee21161d2c7f5b39690c3e325fab2f',
@ -78,23 +75,18 @@ class ViddlerIE(InfoExtractor):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id, secret = re.match(self._VALID_URL, url).groups()
query = { query = {
'video_id': video_id, 'video_id': video_id,
'key': 'v0vhrt7bg2xq1vyxhkct', 'key': 'v0vhrt7bg2xq1vyxhkct',
} }
qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
secret = qs.get('secret', [None])[0]
if secret: if secret:
query['secret'] = secret query['secret'] = secret
headers = {'Referer': 'http://static.cdn-ec.viddler.com/js/arpeggio/v2/embed.html'} data = self._download_json(
request = sanitized_Request( 'http://api.viddler.com/api/v2/viddler.videos.getPlaybackDetails.json',
'http://api.viddler.com/api/v2/viddler.videos.getPlaybackDetails.json?%s' video_id, headers={'Referer': url}, query=query)['video']
% compat_urllib_parse_urlencode(query), None, headers)
data = self._download_json(request, video_id)['video']
formats = [] formats = []
for filed in data['files']: for filed in data['files']: