Merge branch 'chilloutzone'

youtube_dl/extractor/chilloutzone.py

@@ -9,16 +9,14 @@ 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"
-    	}
+        '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',
+        },
     }
 
     def _real_extract(self, url):
@@ -31,14 +29,12 @@ class ChilloutzoneIE(InfoExtractor):
         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)
+        decoded_video_info = base64.b64decode(base64_video_info).decode("utf-8")
         video_info_dict = json.loads(decoded_video_info)
         # get video information from dict
         media_url = video_info_dict['mediaUrl']
@@ -57,7 +53,6 @@ class ChilloutzoneIE(InfoExtractor):
             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
@@ -73,12 +68,10 @@ class ChilloutzoneIE(InfoExtractor):
             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') 
             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
@@ -93,7 +86,7 @@ class ChilloutzoneIE(InfoExtractor):
             'url':       video_url,
             'ext':       'mp4',
             'title':     title,
-    		'description': description
+            'description': description,
         }]