]> asedeno.scripts.mit.edu Git - youtube-dl.git/commitdiff
[ted] Prefer own formats over external sources (closes #29142)
authorSergey M․ <dstftw@gmail.com>
Sat, 29 May 2021 20:05:22 +0000 (03:05 +0700)
committerSergey M․ <dstftw@gmail.com>
Sat, 29 May 2021 20:05:22 +0000 (03:05 +0700)
youtube_dl/extractor/ted.py

index 63e2455b20b2a4f3fc639b14c9b04e2c122f505f..f09f1a3f95f8a7d3b7d457e0ef0c8bd4b2e790da 100644 (file)
@@ -123,6 +123,10 @@ class TEDIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
+    }, {
+        # with own formats and private Youtube external
+        'url': 'https://www.ted.com/talks/spencer_wells_a_family_tree_for_humanity',
+        'only_matching': True,
     }]
 
     _NATIVE_FORMATS = {
@@ -210,16 +214,6 @@ class TEDIE(InfoExtractor):
 
         player_talk = talk_info['player_talks'][0]
 
-        external = player_talk.get('external')
-        if isinstance(external, dict):
-            service = external.get('service')
-            if isinstance(service, compat_str):
-                ext_url = None
-                if service.lower() == 'youtube':
-                    ext_url = external.get('code')
-
-                return self.url_result(ext_url or external['uri'])
-
         resources_ = player_talk.get('resources') or talk_info.get('resources')
 
         http_url = None
@@ -294,6 +288,16 @@ class TEDIE(InfoExtractor):
                 'vcodec': 'none',
             })
 
+        if not formats:
+            external = player_talk.get('external')
+            if isinstance(external, dict):
+                service = external.get('service')
+                if isinstance(service, compat_str):
+                    ext_url = None
+                    if service.lower() == 'youtube':
+                        ext_url = external.get('code')
+                    return self.url_result(ext_url or external['uri'])
+
         self._sort_formats(formats)
 
         video_id = compat_str(talk_info['id'])