youtube-dl

commit e563c0d73b778a1c91007f8abe0e6b43b1f7b608
parent 491c42e690bd51687e43fd5178bebf99dcc2cc0c
Author: Remita Amine <remitamine@gmail.com>
Date:   Fri,  5 Aug 2016 21:01:16 +0100

[condenast] fallback to loader.js if video.js fail

Diffstat:
M
youtube_dl/extractor/condenast.py
 | 
14
+++++++++++---

1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/condenast.py b/youtube_dl/extractor/condenast.py
@@ -113,11 +113,19 @@ class CondeNastIE(InfoExtractor):
                 'target': params['id'],
             })
         video_id = query['videoId']
+        video_info = None
         info_page = self._download_webpage(
             'http://player.cnevids.com/player/video.js',
-            video_id, 'Downloading video info', query=query)
-        video_info = self._parse_json(self._search_regex(
-            r'loadCallback\(({.+})\)', info_page, 'video info'), video_id)['video']
+            video_id, 'Downloading video info', query=query, fatal=False)
+        if info_page:
+            video_info = self._parse_json(self._search_regex(
+                r'loadCallback\(({.+})\)', info_page, 'video info'), video_id)['video']
+        else:
+            info_page = self._download_webpage(
+                'http://player.cnevids.com/player/loader.js',
+                video_id, 'Downloading loader info', query=query)
+            video_info = self._parse_json(self._search_regex(
+                r'var\s+video\s*=\s*({.+?});', info_page, 'video info'), video_id)
         title = video_info['title']
 
         formats = []