aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--youtube_dl/extractor/vimple.py49
1 files changed, 30 insertions, 19 deletions
diff --git a/youtube_dl/extractor/vimple.py b/youtube_dl/extractor/vimple.py
index a2f93afe3..f3a807cd3 100644
--- a/youtube_dl/extractor/vimple.py
+++ b/youtube_dl/extractor/vimple.py
@@ -1,53 +1,66 @@
# coding: utf-8
from __future__ import unicode_literals
-import re, zlib, base64
-import xml.etree.ElementTree
+import re
+import zlib
+import base64
+import xml.etree.ElementTree
from .common import InfoExtractor
+
class VimpleIE(InfoExtractor):
IE_DESC = 'Vimple.ru'
- _VALID_URL = r'https?://player.vimple.ru/iframe/(?P<id>[a-f0-9]+)'
+ _VALID_URL = r'https?://(player.vimple.ru/iframe|vimple.ru)/(?P<id>[a-f0-9]{10,})'
_TESTS = [
+ # Quality: Large, from iframe
{
- # Quality: Large, from iframe
'url': 'http://player.vimple.ru/iframe/b132bdfd71b546d3972f9ab9a25f201c',
'info_dict': {
'id': 'b132bdfd71b546d3972f9ab9a25f201c',
'title': 'great-escape-minecraft.flv',
- 'ext':'mp4',
+ 'ext': 'mp4',
'duration': 352,
'webpage_url': 'http://vimple.ru/b132bdfd71b546d3972f9ab9a25f201c',
- },
- }
+ },
+ },
+ # Quality: Medium, from mainpage
+ {
+ 'url': 'http://vimple.ru/a15950562888453b8e6f9572dc8600cd',
+ 'info_dict': {
+ 'id': 'a15950562888453b8e6f9572dc8600cd',
+ 'title': 'DB 01',
+ 'ext': 'flv',
+ 'duration': 1484,
+ 'webpage_url': 'http://vimple.ru/a15950562888453b8e6f9572dc8600cd',
+ }
+ },
]
-
- #http://jsunpack-n.googlecode.com/svn-history/r63/trunk/swf.py
+
+ # http://jsunpack-n.googlecode.com/svn-history/r63/trunk/swf.py
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
-
+
iframe_url = 'http://player.vimple.ru/iframe/%s' % video_id
iframe = self._download_webpage(iframe_url, video_id, note='Downloading iframe', errnote='unable to fetch iframe')
player_url = self._html_search_regex(r'"(http://player.vimple.ru/flash/.+?)"', iframe, 'player url')
-
+
player = self._request_webpage(player_url, video_id, note='Downloading swf player').read()
- #http://stackoverflow.com/a/6804758
- #http://stackoverflow.com/a/12073686
+ # http://stackoverflow.com/a/6804758
+ # http://stackoverflow.com/a/12073686
player = zlib.decompress(player[8:])
-
xml_pieces = re.findall(b'([a-zA-Z0-9 =+/]{500})', player)
xml_pieces = [piece[1:-1] for piece in xml_pieces]
-
+
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())
@@ -69,5 +82,3 @@ class VimpleIE(InfoExtractor):
'duration': int(video.get('duration')),
'webpage_url': video.find('Share').get('videoPageUrl'),
}
-
-