From e94df37ad6da3a4690170af869e69e8a95c60226 Mon Sep 17 00:00:00 2001
From: John Hawkinson <jhawk@mit.edu>
Date: Sun, 12 Feb 2017 09:17:17 -0500
Subject: [PATCH] [Brightcove] Use extract_attributes, also handle
 data-video-id

Per @yan12125, use extract_attributes() since order may differ.

While preferring data-brightcove-video-id, use data-video-id if present,
to support #12005.
---
 youtube_dl/extractor/brightcove.py | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py
index f1eeda88a..7cef3657d 100644
--- a/youtube_dl/extractor/brightcove.py
+++ b/youtube_dl/extractor/brightcove.py
@@ -17,6 +17,7 @@ from ..compat import (
 from ..utils import (
     determine_ext,
     ExtractorError,
+    extract_attributes,
     find_xpath_attr,
     fix_xml_ampersands,
     float_or_none,
@@ -508,20 +509,22 @@ class BrightcoveNewIE(InfoExtractor):
                 'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s'
                 % (account_id, player_id, embed, video_id))
 
-# 	<video data-brightcove-video-id="5320421710001" data-account="245991542" data-player="SJWAiyYWg" data-embed="default" class="video-js" controls itemscope itemtype="http://schema.org/VideoObject">
-        for video_id, account_id, player_id, embed in re.findall(
-                r'''(?sx)
-                    <video[^>]+
-                        data-brightcove-video-id=["\'](\d+|ref:[^"\']+)["\'].*?
-                        data-account=["\'](\d+)["\'].*?
-                        data-player=["\'](\w+)["\'].*?
-                        data-embed=["\'](\w+)["\'].*?
-                    </video>
-                ''', webpage):
-            entries.append(
-                'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s'
-                % (account_id, player_id, embed, video_id))
+        # 	<video data-brightcove-video-id="5320421710001" data-account="245991542" data-player="SJWAiyYWg" data-embed="default" class="video-js" controls itemscope itemtype="http://schema.org/VideoObject">
+        for video in re.findall(r'(?i)(<video[^>]+>)', webpage):
+            attrs = extract_attributes(video)
+                
+            video_id    = attrs.get('data-brightcove-video-id')
+            if video_id is None:
+                video_id = attrs.get('data-video-id')
 
+            account_id  = attrs.get('data-account')
+            player_id   = attrs.get('data-player')
+            embed       = attrs.get('data-embed')
+
+            if video_id and account_id and player_id and embed:
+                entries.append(
+                    'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s'
+                    % (account_id, player_id, embed, video_id))
 
 	return entries