Merge tag 'upstream/2014.11.21'

[youtubedl] / youtube_dl / extractor / streamcloud.py

diff --git a/youtube_dl/extractor/streamcloud.py b/youtube_dl/extractor/streamcloud.py
index 9faf3a5e3f677ae8b00454c492f6ef2bf129d329..c1178f26de0b961ad68eb6d1ddb89550746f4dd7 100644 (file)
--- a/youtube_dl/extractor/streamcloud.py
+++ b/youtube_dl/extractor/streamcloud.py
@@ -1,4 +1,6 @@
 # coding: utf-8
 # coding: utf-8

+from __future__ import unicode_literals
+

 import re
 import time
 
 import re
 import time
 


@@ -10,23 +12,23 @@ from ..utils import (
 
 
 class StreamcloudIE(InfoExtractor):
 
 
 class StreamcloudIE(InfoExtractor):

-    IE_NAME = u'streamcloud.eu'
-    _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)/(?P<fname>[^#?]*)\.html'
+    IE_NAME = 'streamcloud.eu'
+    _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)(?:/(?P<fname>[^#?]*)\.html)?'

 
     _TEST = {
 
     _TEST = {

-        u'url': u'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html',
-        u'file': u'skp9j99s4bpz.mp4',
-        u'md5': u'6bea4c7fa5daaacc2a946b7146286686',
-        u'info_dict': {
-            u'title': u'youtube-dl test video  \'/\\ ä ↭',
-            u'duration': 9,
+        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html',
+        'md5': '6bea4c7fa5daaacc2a946b7146286686',
+        'info_dict': {
+            'id': 'skp9j99s4bpz',
+            'ext': 'mp4',
+            'title': 'youtube-dl test video  \'/\\ ä ↭',

         },
         },

-        u'skip': u'Only available from the EU'
+        'skip': 'Only available from the EU'

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)
+        url = 'http://streamcloud.eu/%s' % video_id

 
         orig_webpage = self._download_webpage(url, video_id)
 
 
         orig_webpage = self._download_webpage(url, video_id)
 


@@ -46,21 +48,17 @@ class StreamcloudIE(InfoExtractor):
         req = compat_urllib_request.Request(url, post, headers)
 
         webpage = self._download_webpage(
         req = compat_urllib_request.Request(url, post, headers)
 
         webpage = self._download_webpage(

-            req, video_id, note=u'Downloading video page ...')
+            req, video_id, note='Downloading video page ...')

         title = self._html_search_regex(
         title = self._html_search_regex(

-            r'<h1[^>]*>([^<]+)<', webpage, u'title')
+            r'<h1[^>]*>([^<]+)<', webpage, 'title')

         video_url = self._search_regex(
         video_url = self._search_regex(

-            r'file:\s*"([^"]+)"', webpage, u'video URL')
-        duration_str = self._search_regex(
-            r'duration:\s*"?([0-9]+)"?', webpage, u'duration', fatal=False)
-        duration = None if duration_str is None else int(duration_str)
+            r'file:\s*"([^"]+)"', webpage, 'video URL')

         thumbnail = self._search_regex(
         thumbnail = self._search_regex(

-            r'image:\s*"([^"]+)"', webpage, u'thumbnail URL', fatal=False)
+            r'image:\s*"([^"]+)"', webpage, 'thumbnail URL', fatal=False)

 
         return {
             'id': video_id,
             'title': title,
             'url': video_url,
 
         return {
             'id': video_id,
             'title': title,
             'url': video_url,

-            'duration': duration,

             'thumbnail': thumbnail,
         }
             'thumbnail': thumbnail,
         }