Merge tag 'upstream/2014.12.01'

[youtubedl] / youtube_dl / extractor / vice.py

diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py
index 6b93afa50f765a0be24265b3154ee8f670f68312..71f520fb525a5bef424061be1ff881408b762624 100644 (file)
--- a/youtube_dl/extractor/vice.py
+++ b/youtube_dl/extractor/vice.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals

 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor


@@ -6,17 +7,18 @@ from ..utils import ExtractorError
 
 
 class ViceIE(InfoExtractor):
 
 
 class ViceIE(InfoExtractor):

-    _VALID_URL = r'http://www.vice.com/.*?/(?P<name>.+)'
+    _VALID_URL = r'http://www\.vice\.com/.*?/(?P<name>.+)'

 
     _TEST = {
 
     _TEST = {

-        u'url': u'http://www.vice.com/Fringes/cowboy-capitalists-part-1',
-        u'file': u'43cW1mYzpia9IlestBjVpd23Yu3afAfp.mp4',
-        u'info_dict': {
-            u'title': u'VICE_COWBOYCAPITALISTS_PART01_v1_VICE_WM_1080p.mov',
+        'url': 'http://www.vice.com/Fringes/cowboy-capitalists-part-1',
+        'info_dict': {
+            'id': '43cW1mYzpia9IlestBjVpd23Yu3afAfp',
+            'ext': 'mp4',
+            'title': 'VICE_COWBOYCAPITALISTS_PART01_v1_VICE_WM_1080p.mov',

         },
         },

-        u'params': {
+        'params': {

             # Requires ffmpeg (m3u8 manifest)
             # Requires ffmpeg (m3u8 manifest)

-            u'skip_download': True,
+            'skip_download': True,

         },
     }
 
         },
     }
 


@@ -25,14 +27,11 @@ class ViceIE(InfoExtractor):
         name = mobj.group('name')
         webpage = self._download_webpage(url, name)
         try:
         name = mobj.group('name')
         webpage = self._download_webpage(url, name)
         try:

-            ooyala_url = self._og_search_video_url(webpage)
+            embed_code = self._search_regex(
+                r'embedCode=([^&\'"]+)', webpage,
+                'ooyala embed code')
+            ooyala_url = OoyalaIE._url_for_embed_code(embed_code)
+            print(ooyala_url)

         except ExtractorError:
         except ExtractorError:

-            try:
-                embed_code = self._search_regex(
-                    r'OO.Player.create\(\'ooyalaplayer\', \'(.+?)\'', webpage,
-                    u'ooyala embed code')
-                ooyala_url = OoyalaIE._url_for_embed_code(embed_code)
-            except ExtractorError:
-                raise ExtractorError(u'The page doesn\'t contain a video', expected=True)
+            raise ExtractorError('The page doesn\'t contain a video', expected=True)

         return self.url_result(ooyala_url, ie='Ooyala')
         return self.url_result(ooyala_url, ie='Ooyala')

-