X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fchilloutzone.py;h=5aac212991f1625cde463936a94399e0b37ad8a9;hb=HEAD;hp=31618e4c90064f39026d48bd2c69daaee75e9c90;hpb=f2dffe55f8424b673905645cbd9cd132c0a0920a;p=youtube-dl

diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dl/extractor/chilloutzone.py
index 31618e4c9..5aac21299 100644
--- a/youtube_dl/extractor/chilloutzone.py
+++ b/youtube_dl/extractor/chilloutzone.py
@@ -1,100 +1,96 @@
+from __future__ import unicode_literals
+
 import re
-import base64
-import urllib
 import json
 
 from .common import InfoExtractor
+from .youtube import YoutubeIE
+from ..compat import compat_b64decode
+from ..utils import (
+    clean_html,
+    ExtractorError
+)
 
-video_container = ('.mp4', '.mkv', '.flv')
 
 class ChilloutzoneIE(InfoExtractor):
-    _VALID_URL = r'(?:https?://)?(?:www\.)?chilloutzone\.net/video/(?P<id>[\w|-]+).html'
-
-    _TEST = {
-    	u'url': u'http://www.chilloutzone.net/video/enemene-meck-alle-katzen-weg.html',
-    	u'file': u'18088-enemene-meck-alle-katzen-weg.mp4',
-    	u'md5': u'a76f3457e813ea0037e5244f509e66d1',
-    	u'info_dict': {
-        	u"id": u"18088",
-        	u"ext": u"mp4",
-        	u"title": u"Enemene Meck - Alle Katzen weg"
-    	}
-	}
+    _VALID_URL = r'https?://(?:www\.)?chilloutzone\.net/video/(?P<id>[\w|-]+)\.html'
+    _TESTS = [{
+        'url': 'http://www.chilloutzone.net/video/enemene-meck-alle-katzen-weg.html',
+        'md5': 'a76f3457e813ea0037e5244f509e66d1',
+        'info_dict': {
+            'id': 'enemene-meck-alle-katzen-weg',
+            'ext': 'mp4',
+            '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': 're:(?s)^Watch the making of - makingoficons.com.{300,}',
+            'uploader': 'Us',
+            'uploader_id': 'usfilms',
+            'upload_date': '20140131'
+        },
+    }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-    	video_id = mobj.group('id')
-
-    	webpage_url = 'http://www.chilloutzone.net/video/' + video_id + '.html'
-
-    	# Log that we are starting to download the page
-    	self.report_download_webpage(webpage_url)
-    	webpage = self._download_webpage(webpage_url, video_id)
-	
-
-
-    	# Log that we are starting to parse the page
-    	self.report_extraction(video_id)    	
-    	# Find base64 decoded file info
-    	base64_video_info = self._html_search_regex(r'var cozVidData = "(.+?)";', webpage, u'video Data')
-    	# decode string and find video file
-    	decoded_video_info = base64.b64decode(base64_video_info)
-    	video_info_dict = json.loads(decoded_video_info)
-    	# get video information from dict
-    	media_url = video_info_dict['mediaUrl']
-    	description = video_info_dict['description']
-    	title = video_info_dict['title']
-    	native_platform = video_info_dict['nativePlatform']
-    	native_video_id = video_info_dict['nativeVideoId']
-    	source_priority = video_info_dict['sourcePriority']
-
-
-    	# Start video extraction
-    	video_url = ''
-    	# If nativePlatform is None a fallback mechanism is used (i.e. youtube embed)
-    	if native_platform == None:
-    		# Look for other video urls
-    		video_url = self._html_search_regex(r'<iframe.* src="(.+?)".*', webpage, u'fallback Video URL')
-    		if 'youtube' in video_url:
-    			self.to_screen(u'Youtube video detected:')
-    			print video_url
-    			return self.url_result(video_url, ie='Youtube')
-
-    	# For debugging purposes
-    	#print video_info_dict
-    	#print native_platform
-    	#print native_video_id
-    	#print source_priority
-    	#print media_url
-
-    	# Non Fallback: Decide to use native source (e.g. youtube or vimeo) or
-    	# the own CDN
-    	if source_priority == 'native':
-    	    if native_platform == 'youtube':
-                self.to_screen(u'Youtube video detected:')
-                video_url = 'https://www.youtube.com/watch?v=' + native_video_id
-                print video_url
-                return self.url_result(video_url, ie='Youtube') 
+        video_id = mobj.group('id')
+
+        webpage = self._download_webpage(url, video_id)
+
+        base64_video_info = self._html_search_regex(
+            r'var cozVidData = "(.+?)";', webpage, 'video data')
+        decoded_video_info = compat_b64decode(base64_video_info).decode('utf-8')
+        video_info_dict = json.loads(decoded_video_info)
+
+        # get video information from dict
+        video_url = video_info_dict['mediaUrl']
+        description = clean_html(video_info_dict.get('description'))
+        title = video_info_dict['title']
+        native_platform = video_info_dict['nativePlatform']
+        native_video_id = video_info_dict['nativeVideoId']
+        source_priority = video_info_dict['sourcePriority']
+
+        # If nativePlatform is None a fallback mechanism is used (i.e. youtube embed)
+        if native_platform is None:
+            youtube_url = YoutubeIE._extract_url(webpage)
+            if youtube_url:
+                return self.url_result(youtube_url, ie=YoutubeIE.ie_key())
+
+        # Non Fallback: Decide to use native source (e.g. youtube or vimeo) or
+        # the own CDN
+        if source_priority == 'native':
+            if native_platform == 'youtube':
+                return self.url_result(native_video_id, ie='Youtube')
             if native_platform == 'vimeo':
-    	        self.to_screen(u'Vimeo video detected:')
-                video_url = 'http://vimeo.com/' + native_video_id
-                print video_url
-                return self.url_result(video_url, ie='Vimeo')
-
-        # No redirect, use coz media url
-        video_url = media_url
-        if video_url.endswith('.mp4') == False:
-			self.report_warning(u'Url does not contain a video container')
-			return []
-
-
-        return [{
-    		'id':        video_id,
-    		'url':       video_url,
-    		'ext':       'mp4',
-    		'title':     title,
-    		'description': description
-		}]
-
-
-
+                return self.url_result(
+                    'http://vimeo.com/' + native_video_id, ie='Vimeo')
+
+        if not video_url:
+            raise ExtractorError('No video found')
+
+        return {
+            'id': video_id,
+            'url': video_url,
+            'ext': 'mp4',
+            'title': title,
+            'description': description,
+        }