Merge branch 'ceskatelevizesrt' of https://github.com/oskar456/youtube-dl into oskar4...

[youtube-dl] / youtube_dl / extractor / vimple.py

diff --git a/youtube_dl/extractor/vimple.py b/youtube_dl/extractor/vimple.py
index 0f69e7126c727f0e12ec53b79cac11e99abdc228..ee3d86117e625cca66303aeeee229f1a091b4602 100644 (file)
--- a/youtube_dl/extractor/vimple.py
+++ b/youtube_dl/extractor/vimple.py
@@ -1,53 +1,57 @@
 # coding: utf-8
 from __future__ import unicode_literals
-import re, zlib, base64
-import xml.etree.ElementTree 
+
+import base64
+import re
+import xml.etree.ElementTree
+import zlib
 
 from .common import InfoExtractor
+from ..utils import int_or_none
+
 
 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
-            'url': 'http://player.vimple.ru/iframe/b132bdfd71b546d3972f9ab9a25f201c',
+            'url': 'http://vimple.ru/c0f6b1687dcd4000a97ebe70068039cf',
+            'md5': '2e750a330ed211d3fd41821c6ad9a279',
             'info_dict': {
-                'id': 'b132bdfd71b546d3972f9ab9a25f201c',
-                'title': 'great-escape-minecraft.flv',
-                'ext':'mp4',
-                'duration': 352,
-                'webpage_url': 'http://vimple.ru/b132bdfd71b546d3972f9ab9a25f201c',
-                },
-         }
+                'id': 'c0f6b1687dcd4000a97ebe70068039cf',
+                'ext': 'mp4',
+                'title': 'Sunset',
+                'duration': 20,
+                'thumbnail': 're:https?://.*?\.jpg',
+            },
+        },
     ]
-    
-    #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()
+        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')
 
-        #http://stackoverflow.com/a/6804758
-        #http://stackoverflow.com/a/12073686
-        player = zlib.decompress(player[8:])
+        player = self._request_webpage(
+            player_url, video_id, note='Downloading swf player').read()
 
+        player = zlib.decompress(player[8:])
 
-        xml_pieces = re.findall(b'([a-zA-Z0-9 =\\+/]{500})', player)
+        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())
@@ -66,8 +70,6 @@ class VimpleIE(InfoExtractor):
             'title': video.find('Title').text,
             'formats': formats,
             'thumbnail': video.find('Poster').get('url'),
-            'duration': int(video.get('duration')),
+            'duration': int_or_none(video.get('duration')),
             'webpage_url': video.find('Share').get('videoPageUrl'),
         }
-
-