Browse Source

[brightcove] Set the 'videoPlayer' value to the 'videoId' if it's missing in the parameters (fixes #1815)

Jaime Marquínez Ferrándiz 11 years ago
parent
commit
36de0a0e1a
1 changed files with 6 additions and 3 deletions
  1. 6 3
      youtube_dl/extractor/brightcove.py

+ 6 - 3
youtube_dl/extractor/brightcove.py

@@ -75,14 +75,17 @@ class BrightcoveIE(InfoExtractor):
         params = {'flashID': object_doc.attrib['id'],
         params = {'flashID': object_doc.attrib['id'],
                   'playerID': find_xpath_attr(object_doc, './param', 'name', 'playerID').attrib['value'],
                   'playerID': find_xpath_attr(object_doc, './param', 'name', 'playerID').attrib['value'],
                   }
                   }
-        playerKey = find_xpath_attr(object_doc, './param', 'name', 'playerKey')
+        def find_param(name):
+            return find_xpath_attr(object_doc, './param', 'name', name)
+        playerKey = find_param('playerKey')
         # Not all pages define this value
         # Not all pages define this value
         if playerKey is not None:
         if playerKey is not None:
             params['playerKey'] = playerKey.attrib['value']
             params['playerKey'] = playerKey.attrib['value']
-        videoPlayer = find_xpath_attr(object_doc, './param', 'name', '@videoPlayer')
+        # The three fields hold the id of the video
+        videoPlayer = find_param('@videoPlayer') or find_param('videoId') or find_param('videoID')
         if videoPlayer is not None:
         if videoPlayer is not None:
             params['@videoPlayer'] = videoPlayer.attrib['value']
             params['@videoPlayer'] = videoPlayer.attrib['value']
-        linkBase = find_xpath_attr(object_doc, './param', 'name', 'linkBaseURL')
+        linkBase = find_param('linkBaseURL')
         if linkBase is not None:
         if linkBase is not None:
             params['linkBaseURL'] = linkBase.attrib['value']
             params['linkBaseURL'] = linkBase.attrib['value']
         data = compat_urllib_parse.urlencode(params)
         data = compat_urllib_parse.urlencode(params)