debian/control: Add recommends on aria2 | wget | curl to use external downloaders.

[youtubedl] / youtube_dl / extractor / brightcove.py

diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py
index 2db7f9fef4f50f4f7f95b812d5245c224dc7ed20..ea0969d4d259a99653bebbcabcebb0e1f87719f3 100644 (file)
--- a/youtube_dl/extractor/brightcove.py
+++ b/youtube_dl/extractor/brightcove.py
@@ -6,25 +6,26 @@ import json
 import xml.etree.ElementTree
 
 from .common import InfoExtractor
 import xml.etree.ElementTree
 
 from .common import InfoExtractor

-from ..utils import (
-    compat_urllib_parse,
-    find_xpath_attr,
-    fix_xml_ampersands,
-    compat_urlparse,
-    compat_str,
-    compat_urllib_request,
+from ..compat import (

     compat_parse_qs,
     compat_parse_qs,

+    compat_str,
+    compat_urllib_parse,

     compat_urllib_parse_urlparse,
     compat_urllib_parse_urlparse,

-
+    compat_urllib_request,
+    compat_urlparse,
+)
+from ..utils import (

     determine_ext,
     ExtractorError,
     determine_ext,
     ExtractorError,

-    unsmuggle_url,
+    find_xpath_attr,
+    fix_xml_ampersands,

     unescapeHTML,
     unescapeHTML,

+    unsmuggle_url,

 )
 
 
 class BrightcoveIE(InfoExtractor):
 )
 
 
 class BrightcoveIE(InfoExtractor):

-    _VALID_URL = r'https?://.*brightcove\.com/(services|viewer).*?\?(?P<query>.*)'
+    _VALID_URL = r'(?:https?://.*brightcove\.com/(services|viewer).*?\?|brightcove:)(?P<query>.*)'

     _FEDERATED_URL_TEMPLATE = 'http://c.brightcove.com/services/viewer/htmlFederated?%s'
 
     _TESTS = [
     _FEDERATED_URL_TEMPLATE = 'http://c.brightcove.com/services/viewer/htmlFederated?%s'
 
     _TESTS = [


@@ -107,7 +108,7 @@ class BrightcoveIE(InfoExtractor):
         """
 
         # Fix up some stupid HTML, see https://github.com/rg3/youtube-dl/issues/1553
         """
 
         # Fix up some stupid HTML, see https://github.com/rg3/youtube-dl/issues/1553

-        object_str = re.sub(r'(<param name="[^"]+" value="[^"]+")>',
+        object_str = re.sub(r'(<param(?:\s+[a-zA-Z0-9_]+="[^"]*")*)>',

                             lambda m: m.group(1) + '/>', object_str)
         # Fix up some stupid XML, see https://github.com/rg3/youtube-dl/issues/1608
         object_str = object_str.replace('<--', '<!--')
                             lambda m: m.group(1) + '/>', object_str)
         # Fix up some stupid XML, see https://github.com/rg3/youtube-dl/issues/1608
         object_str = object_str.replace('<--', '<!--')


@@ -265,6 +266,7 @@ class BrightcoveIE(InfoExtractor):
                 url = rend['defaultURL']
                 if not url:
                     continue
                 url = rend['defaultURL']
                 if not url:
                     continue

+                ext = None

                 if rend['remote']:
                     url_comp = compat_urllib_parse_urlparse(url)
                     if url_comp.path.endswith('.m3u8'):
                 if rend['remote']:
                     url_comp = compat_urllib_parse_urlparse(url)
                     if url_comp.path.endswith('.m3u8'):


@@ -276,7 +278,7 @@ class BrightcoveIE(InfoExtractor):
                         # akamaihd.net, but they don't use f4m manifests
                         url = url.replace('control/', '') + '?&v=3.3.0&fp=13&r=FEEFJ&g=RTSJIMBMPFPB'
                         ext = 'flv'
                         # akamaihd.net, but they don't use f4m manifests
                         url = url.replace('control/', '') + '?&v=3.3.0&fp=13&r=FEEFJ&g=RTSJIMBMPFPB'
                         ext = 'flv'

-                else:
+                if ext is None:

                     ext = determine_ext(url)
                 size = rend.get('size')
                 formats.append({
                     ext = determine_ext(url)
                 size = rend.get('size')
                 formats.append({