X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnpr.py;h=53acc6e574c0743a223d552d95d8806dc071ed41;hb=HEAD;hp=a823bc096ff29e49d2184e46497ada12af7192af;hpb=76048b23e8a4aac93a33a96356fe64a9bcf78421;p=youtube-dl diff --git a/youtube_dl/extractor/npr.py b/youtube_dl/extractor/npr.py index a823bc096..53acc6e57 100644 --- a/youtube_dl/extractor/npr.py +++ b/youtube_dl/extractor/npr.py @@ -1,71 +1,124 @@ -# coding: utf-8 from __future__ import unicode_literals -import os.path -import re - -from ..compat import compat_urllib_parse_unquote -from ..utils import url_basename from .common import InfoExtractor +from ..utils import ( + int_or_none, + qualities, + url_or_none, +) -class NprIE(InfoExtractor): - _VALID_URL = r'http://(?:www\.)?npr\.org/player/v2/mediaPlayer.html?.*id=(?P[0-9]+)' - _TEST = { - 'url': 'http://www.npr.org/player/v2/mediaPlayer.html?id=449974205', - 'info_dict': { - 'id': '449974205', - 'ext': 'mp4', - 'title': 'New Music From Beach House, Chairlift, CMJ Discoveries And More' - } -} +class NprIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)?npr\.org/(?:sections/[^/]+/)?\d{4}/\d{2}/\d{2}/(?P\d+)' + _TESTS = [{ + 'url': 'https://www.npr.org/sections/allsongs/2015/10/21/449974205/new-music-from-beach-house-chairlift-cmj-discoveries-and-more', + 'info_dict': { + 'id': '449974205', + 'title': 'New Music From Beach House, Chairlift, CMJ Discoveries And More' + }, + 'playlist_count': 7, + }, { + 'url': 'https://www.npr.org/sections/deceptivecadence/2015/10/09/446928052/music-from-the-shadows-ancient-armenian-hymns-and-piano-jazz', + 'info_dict': { + 'id': '446928052', + 'title': "Songs We Love: Tigran Hamasyan, 'Your Mercy is Boundless'" + }, + 'playlist': [{ + 'md5': '12fa60cb2d3ed932f53609d4aeceabf1', + 'info_dict': { + 'id': '446929930', + 'ext': 'mp3', + 'title': 'Your Mercy is Boundless (Bazum en Qo gtutyunqd)', + 'duration': 402, + }, + }], + }, { + # mutlimedia, not media title + 'url': 'https://www.npr.org/2017/06/19/533198237/tigers-jaw-tiny-desk-concert', + 'info_dict': { + 'id': '533198237', + 'title': 'Tigers Jaw: Tiny Desk Concert', + }, + 'playlist': [{ + 'md5': '12fa60cb2d3ed932f53609d4aeceabf1', + 'info_dict': { + 'id': '533201718', + 'ext': 'mp4', + 'title': 'Tigers Jaw: Tiny Desk Concert', + 'duration': 402, + }, + }], + 'expected_warnings': ['Failed to download m3u8 information'], + }, { + # multimedia, no formats, stream + 'url': 'https://www.npr.org/2020/02/14/805476846/laura-stevenson-tiny-desk-concert', + 'only_matching': True, + }] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - webpage_url = 'http://www.npr.org/player/v2/mediaPlayer.html?id=' + video_id - webpage = self._download_webpage(webpage_url, video_id) - key = 'MDAzMzQ2MjAyMDEyMzk4MTU1MDg3ZmM3MQ010' - xml_url = 'http://api.npr.org/query?id=%s&apiKey=%s' % (video_id, key) - json_url = 'http://api.npr.org/query?id=%s&apiKey=%s&format=json' % (video_id, key) + playlist_id = self._match_id(url) - formats = [] - entries = [] + story = self._download_json( + 'http://api.npr.org/query', playlist_id, query={ + 'id': playlist_id, + 'fields': 'audio,multimedia,title', + 'format': 'json', + 'apiKey': 'MDAzMzQ2MjAyMDEyMzk4MTU1MDg3ZmM3MQ010', + })['list']['story'][0] + playlist_title = story.get('title', {}).get('$text') - config = self._download_json(json_url, video_id) + KNOWN_FORMATS = ('threegp', 'm3u8', 'smil', 'mp4', 'mp3') + quality = qualities(KNOWN_FORMATS) - content = config["list"]["story"] - - album_title = config["list"]["story"][0]['song'][0]['album']['albumTitle'] - print album_title['$text'] - - for key in content: - if "audio" in key: - for x in key['audio']: - if x['type'] == 'standard': - playlist = True - song_duration = x["duration"]['$text'] - song_title = x["title"]["$text"] - song_id = x["id"] + entries = [] + for media in story.get('audio', []) + story.get('multimedia', []): + media_id = media['id'] - for k in x["format"]: - if type(x["format"][k]) is list: - for z in x["format"][k]: - formats.append({ 'format': z['type'], - 'url' : z['$text'] - }) - else: - formats.append({ 'format': k, - 'url' : x["format"][k]['$text'] - }) + formats = [] + for format_id, formats_entry in media.get('format', {}).items(): + if not formats_entry: + continue + if isinstance(formats_entry, list): + formats_entry = formats_entry[0] + format_url = formats_entry.get('$text') + if not format_url: + continue + if format_id in KNOWN_FORMATS: + if format_id == 'm3u8': + formats.extend(self._extract_m3u8_formats( + format_url, media_id, 'mp4', 'm3u8_native', + m3u8_id='hls', fatal=False)) + elif format_id == 'smil': + smil_formats = self._extract_smil_formats( + format_url, media_id, transform_source=lambda s: s.replace( + 'rtmp://flash.npr.org/ondemand/', 'https://ondemand.npr.org/')) + self._check_formats(smil_formats, media_id) + formats.extend(smil_formats) + else: + formats.append({ + 'url': format_url, + 'format_id': format_id, + 'quality': quality(format_id), + }) + for stream_id, stream_entry in media.get('stream', {}).items(): + if not isinstance(stream_entry, dict): + continue + if stream_id != 'hlsUrl': + continue + stream_url = url_or_none(stream_entry.get('$text')) + if not stream_url: + continue + formats.extend(self._extract_m3u8_formats( + stream_url, stream_id, 'mp4', 'm3u8_native', + m3u8_id='hls', fatal=False)) + self._sort_formats(formats) - entries.append({ "title":song_title, - "id":song_id, - "duration": song_duration , - "formats":formats}) - formats = [] + entries.append({ + 'id': media_id, + 'title': media.get('title', {}).get('$text') or playlist_title, + 'thumbnail': media.get('altImageUrl', {}).get('$text'), + 'duration': int_or_none(media.get('duration', {}).get('$text')), + 'formats': formats, + }) - return { '_type': 'playlist', - 'id' : video_id, - 'title' : album_title, - 'entries': entries } + return self.playlist_result(entries, playlist_id, playlist_title)