w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[vimple] Fix extraction (Closes #5448)

Browse source
This commit is contained in:
Sergey M․ 2015-04-17 22:56:26 +06:00
parent 08f2a92c9c
commit d8e7ef04dc
1 changed files with 25 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
youtube_dl/extractor/vimple.py
View file

@ -1,75 +1,54 @@
# coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import base64
import re
import xml.etree.ElementTree
import zlib
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import int_or_none from ..utils import int_or_none
class VimpleIE(InfoExtractor): class VimpleIE(InfoExtractor):
IE_DESC = 'Vimple.ru' IE_DESC = 'Vimple - one-click video hosting'
_VALID_URL = r'https?://(player.vimple.ru/iframe|vimple.ru)/(?P<id>[a-f0-9]{10,})' _VALID_URL = r'https?://(?:player\.vimple\.ru/iframe|vimple\.ru)/(?P<id>[\da-f-]{32,36})'
_TESTS = [ _TESTS = [
{ {
'url': 'http://vimple.ru/c0f6b1687dcd4000a97ebe70068039cf', 'url': 'http://vimple.ru/c0f6b1687dcd4000a97ebe70068039cf',
'md5': '2e750a330ed211d3fd41821c6ad9a279', 'md5': '2e750a330ed211d3fd41821c6ad9a279',
'info_dict': { 'info_dict': {
'id': 'c0f6b1687dcd4000a97ebe70068039cf', 'id': 'c0f6b168-7dcd-4000-a97e-be70068039cf',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Sunset', 'title': 'Sunset',
'duration': 20, 'duration': 20,
'thumbnail': 're:https?://.*?\.jpg', 'thumbnail': 're:https?://.*?\.jpg',
}, },
}, }, {
'url': 'http://player.vimple.ru/iframe/52e1beec-1314-4a83-aeac-c61562eadbf9',
'only_matching': True,
}
] ]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group('id')
iframe_url = 'http://player.vimple.ru/iframe/%s' % video_id webpage = self._download_webpage(
'http://player.vimple.ru/iframe/%s' % video_id, video_id)
iframe = self._download_webpage( playlist = self._parse_json(
iframe_url, video_id, self._search_regex(
note='Downloading iframe', errnote='unable to fetch iframe') r'sprutoData\s*:\s*({.+?}),\r\n', webpage, 'spruto data'),
player_url = self._html_search_regex( video_id)['playlist'][0]
r'"(http://player.vimple.ru/flash/.+?)"', iframe, 'player url')
player = self._request_webpage( title = playlist['title']
player_url, video_id, note='Downloading swf player').read() video_id = playlist.get('videoId') or video_id
thumbnail = playlist.get('posterUrl') or playlist.get('thumbnailUrl')
duration = int_or_none(playlist.get('duration'))
player = zlib.decompress(player[8:]) formats = [{
'url': f['url'],
xml_pieces = re.findall(b'([a-zA-Z0-9 =+/]{500})', player) } for f in playlist['video']]
xml_pieces = [piece[1:-1] for piece in xml_pieces] self._sort_formats(formats)
xml_data = b''.join(xml_pieces)
xml_data = base64.b64decode(xml_data)
xml_data = xml.etree.ElementTree.fromstring(xml_data)
video = xml_data.find('Video')
quality = video.get('quality')
q_tag = video.find(quality.capitalize())
formats = [
{
'url': q_tag.get('url'),
'tbr': int(q_tag.get('bitrate')),
'filesize': int(q_tag.get('filesize')),
'format_id': quality,
},
]
return { return {
'id': video_id, 'id': video_id,
'title': video.find('Title').text, 'title': title,
'thumbnail': thumbnail,
'duration': duration,
'formats': formats, 'formats': formats,
'thumbnail': video.find('Poster').get('url'),
'duration': int_or_none(video.get('duration')),
'webpage_url': video.find('Share').get('videoPageUrl'),
} }