New upstream version 2020.06.16.1

[youtubedl] / youtube_dl / extractor / amp.py

diff --git a/youtube_dl/extractor/amp.py b/youtube_dl/extractor/amp.py
index fde1a8ff74d8d6bcc85eb2520947e96d4205b176..7ff098cfa0c9789122dab4787f877a1a9bf45352 100644 (file)
--- a/youtube_dl/extractor/amp.py
+++ b/youtube_dl/extractor/amp.py
@@ -3,11 +3,12 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
 
 from .common import InfoExtractor
 from ..utils import (

-    int_or_none,
-    parse_iso8601,
-    mimetype2ext,

     determine_ext,
     ExtractorError,
     determine_ext,
     ExtractorError,

+    int_or_none,
+    mimetype2ext,
+    parse_iso8601,
+    url_or_none,

 )
 
 
 )
 
 


@@ -35,7 +36,7 @@ class AMPIE(InfoExtractor):
                 media_thumbnail = [media_thumbnail]
             for thumbnail_data in media_thumbnail:
                 thumbnail = thumbnail_data.get('@attributes', {})
                 media_thumbnail = [media_thumbnail]
             for thumbnail_data in media_thumbnail:
                 thumbnail = thumbnail_data.get('@attributes', {})

-                thumbnail_url = thumbnail.get('url')
+                thumbnail_url = url_or_none(thumbnail.get('url'))

                 if not thumbnail_url:
                     continue
                 thumbnails.append({
                 if not thumbnail_url:
                     continue
                 thumbnails.append({


@@ -51,7 +52,7 @@ class AMPIE(InfoExtractor):
                 media_subtitle = [media_subtitle]
             for subtitle_data in media_subtitle:
                 subtitle = subtitle_data.get('@attributes', {})
                 media_subtitle = [media_subtitle]
             for subtitle_data in media_subtitle:
                 subtitle = subtitle_data.get('@attributes', {})

-                subtitle_href = subtitle.get('href')
+                subtitle_href = url_or_none(subtitle.get('href'))

                 if not subtitle_href:
                     continue
                 subtitles.setdefault(subtitle.get('lang') or 'en', []).append({
                 if not subtitle_href:
                     continue
                 subtitles.setdefault(subtitle.get('lang') or 'en', []).append({


@@ -65,7 +66,7 @@ class AMPIE(InfoExtractor):
             media_content = [media_content]
         for media_data in media_content:
             media = media_data.get('@attributes', {})
             media_content = [media_content]
         for media_data in media_content:
             media = media_data.get('@attributes', {})

-            media_url = media.get('url')
+            media_url = url_or_none(media.get('url'))

             if not media_url:
                 continue
             ext = mimetype2ext(media.get('type')) or determine_ext(media_url)
             if not media_url:
                 continue
             ext = mimetype2ext(media.get('type')) or determine_ext(media_url)


@@ -79,7 +80,7 @@ class AMPIE(InfoExtractor):
             else:
                 formats.append({
                     'format_id': media_data.get('media-category', {}).get('@attributes', {}).get('label'),
             else:
                 formats.append({
                     'format_id': media_data.get('media-category', {}).get('@attributes', {}).get('label'),

-                    'url': media['url'],
+                    'url': media_url,

                     'tbr': int_or_none(media.get('bitrate')),
                     'filesize': int_or_none(media.get('fileSize')),
                     'ext': ext,
                     'tbr': int_or_none(media.get('bitrate')),
                     'filesize': int_or_none(media.get('fileSize')),
                     'ext': ext,