summary refs log tree commit diff
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-04-14 12:45:43 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-04-14 12:45:43 +0800
commitedfcf7abe2f31bb8309ca032e738c90dc3a5722e (patch)
tree24ff2ba7ccbc4846b3136dfeef7001a259f340e1
parent37b44fe7c1e462b748171c4af743f30c01c95fe1 (diff)
downloadyoutube-dl-edfcf7abe2f31bb8309ca032e738c90dc3a5722e.tar.gz
youtube-dl-edfcf7abe2f31bb8309ca032e738c90dc3a5722e.tar.xz
youtube-dl-edfcf7abe2f31bb8309ca032e738c90dc3a5722e.zip
[generic] Support another type of Ooyala embedded video
-rw-r--r--youtube_dl/extractor/generic.py17
1 files changed, 16 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 7ad555e9f..92a62e866 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -688,6 +688,20 @@ class GenericIE(InfoExtractor):
                 'title': '生物老師男變女 全校挺"做自己"',
                 'thumbnail': 're:^https?://.*\.jpg$',
             }
+        },
+        # Ooyala embed
+        {
+            'url': 'http://www.businessinsider.com/excel-index-match-vlookup-video-how-to-2015-2?IR=T',
+            'info_dict': {
+                'id': '50YnY4czr4ms1vJ7yz3xzq0excz_pUMs',
+                'ext': 'mp4',
+                'description': 'VIDEO: Index/Match versus VLOOKUP.',
+                'title': 'This is what separates the Excel masters from the wannabes',
+            },
+            'params': {
+                # m3u8 downloads
+                'skip_download': True,
+            }
         }
     ]
 
@@ -1092,7 +1106,8 @@ class GenericIE(InfoExtractor):
         # Look for Ooyala videos
         mobj = (re.search(r'player\.ooyala\.com/[^"?]+\?[^"]*?(?:embedCode|ec)=(?P<ec>[^"&]+)', webpage) or
                 re.search(r'OO\.Player\.create\([\'"].*?[\'"],\s*[\'"](?P<ec>.{32})[\'"]', webpage) or
-                re.search(r'SBN\.VideoLinkset\.ooyala\([\'"](?P<ec>.{32})[\'"]\)', webpage))
+                re.search(r'SBN\.VideoLinkset\.ooyala\([\'"](?P<ec>.{32})[\'"]\)', webpage) or
+                re.search(r'data-ooyala-video-id\s*=\s*[\'"](?P<ec>.{32})[\'"]', webpage))
         if mobj is not None:
             return OoyalaIE._build_url_result(mobj.group('ec'))