Merge branch 'vgtv' of https://github.com/mrkolby/youtube-dl into mrkolby-vgtv

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

diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dl/extractor/chilloutzone.py
index 39e9d962fcc85cd0273f4a2b9c07c64c40894982..a62395d4b727ce917f1ea946b63940b3f52b6bdd 100644 (file)
--- a/youtube_dl/extractor/chilloutzone.py
+++ b/youtube_dl/extractor/chilloutzone.py
@@ -5,12 +5,15 @@ import base64
 import json
 
 from .common import InfoExtractor
-from ..utils import clean_html
+from ..utils import (
+    clean_html,
+    ExtractorError
+)
 
 
 class ChilloutzoneIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?chilloutzone\.net/video/(?P<id>[\w|-]+)\.html'
-    _TEST = {
+    _TESTS = [{
         'url': 'http://www.chilloutzone.net/video/enemene-meck-alle-katzen-weg.html',
         'md5': 'a76f3457e813ea0037e5244f509e66d1',
         'info_dict': {
@@ -19,7 +22,32 @@ class ChilloutzoneIE(InfoExtractor):
             'title': 'Enemene Meck - Alle Katzen weg',
             'description': 'Ist das der Umkehrschluss des Niesenden Panda-Babys?',
         },
-    }
+    }, {
+        'note': 'Video hosted at YouTube',
+        'url': 'http://www.chilloutzone.net/video/eine-sekunde-bevor.html',
+        'info_dict': {
+            'id': '1YVQaAgHyRU',
+            'ext': 'mp4',
+            'title': '16 Photos Taken 1 Second Before Disaster',
+            'description': 'md5:58a8fcf6a459fe0a08f54140f0ad1814',
+            'uploader': 'BuzzFeedVideo',
+            'uploader_id': 'BuzzFeedVideo',
+            'upload_date': '20131105',
+        },
+    }, {
+        'note': 'Video hosted at Vimeo',
+        'url': 'http://www.chilloutzone.net/video/icon-blending.html',
+        'md5': '2645c678b8dc4fefcc0e1b60db18dac1',
+        'info_dict': {
+            'id': '85523671',
+            'ext': 'mp4',
+            'title': 'The Sunday Times - Icons',
+            'description': 'md5:a5f7ff82e2f7a9ed77473fe666954e84',
+            'uploader': 'Us',
+            'uploader_id': 'usfilms',
+            'upload_date': '20140131'
+        },
+    }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
@@ -52,7 +80,7 @@ class ChilloutzoneIE(InfoExtractor):
         # the own CDN
         if source_priority == 'native':
             if native_platform == 'youtube':
-                return self.url_result(video_id, ie='Youtube')
+                return self.url_result(native_video_id, ie='Youtube')
             if native_platform == 'vimeo':
                 return self.url_result(
                     'http://vimeo.com/' + native_video_id, ie='Vimeo')