X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fviddler.py;h=8d92aee878d3ad0c0d5725db755451c88e527f66;hb=369ff750812ff874a0f4b4ceebb15a024e2f0a9d;hp=8ba54ad39560d46c080c1c67e6843877de8673cf;hpb=9c15869c2846d955f4a5968924feed81121cffbb;p=youtube-dl diff --git a/youtube_dl/extractor/viddler.py b/youtube_dl/extractor/viddler.py index 8ba54ad39..8d92aee87 100644 --- a/youtube_dl/extractor/viddler.py +++ b/youtube_dl/extractor/viddler.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import ( - compat_urllib_parse, + compat_urllib_parse_urlencode, compat_urlparse, ) from ..utils import ( @@ -16,10 +16,10 @@ class ViddlerIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?viddler\.com/(?:v|embed|player)/(?P[a-z0-9]+)' _TESTS = [{ 'url': 'http://www.viddler.com/v/43903784', - 'md5': 'ae43ad7cb59431ce043f0ff7fa13cbf4', + 'md5': '9eee21161d2c7f5b39690c3e325fab2f', 'info_dict': { 'id': '43903784', - 'ext': 'mp4', + 'ext': 'mov', 'title': 'Video Made Easy', 'description': 'md5:6a697ebd844ff3093bd2e82c37b409cd', 'uploader': 'viddler', @@ -33,10 +33,10 @@ class ViddlerIE(InfoExtractor): } }, { 'url': 'http://www.viddler.com/v/4d03aad9/', - 'md5': 'faa71fbf70c0bee7ab93076fd007f4b0', + 'md5': 'f12c5a7fa839c47a79363bfdf69404fb', 'info_dict': { 'id': '4d03aad9', - 'ext': 'mp4', + 'ext': 'ts', 'title': 'WALL-TO-GORTAT', 'upload_date': '20150126', 'uploader': 'deadspin', @@ -46,10 +46,10 @@ class ViddlerIE(InfoExtractor): } }, { 'url': 'http://www.viddler.com/player/221ebbbd/0/', - 'md5': '0defa2bd0ea613d14a6e9bd1db6be326', + 'md5': '740511f61d3d1bb71dc14a0fe01a1c10', 'info_dict': { 'id': '221ebbbd', - 'ext': 'mp4', + 'ext': 'mov', 'title': 'LETeens-Grammar-snack-third-conditional', 'description': ' ', 'upload_date': '20140929', @@ -93,7 +93,7 @@ class ViddlerIE(InfoExtractor): headers = {'Referer': 'http://static.cdn-ec.viddler.com/js/arpeggio/v2/embed.html'} request = sanitized_Request( 'http://api.viddler.com/api/v2/viddler.videos.getPlaybackDetails.json?%s' - % compat_urllib_parse.urlencode(query), None, headers) + % compat_urllib_parse_urlencode(query), None, headers) data = self._download_json(request, video_id)['video'] formats = []