X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnfb.py;h=ba7b77a467e8e7ba969fb9d4555e47fad6ed7196;hb=0138968a6a5d18e5aca23b52819cd10015997831;hp=e88566c693c9139ae725604427fb8cd3894e7e3b;hpb=00cf938aa54af446d20d01f5184d09880af803f3;p=youtube-dl diff --git a/youtube_dl/extractor/nfb.py b/youtube_dl/extractor/nfb.py index e88566c69..ba7b77a46 100644 --- a/youtube_dl/extractor/nfb.py +++ b/youtube_dl/extractor/nfb.py @@ -73,14 +73,16 @@ class NFBIE(InfoExtractor): title = media.find('title').text description = media.find('description').text # It seems assets always go from lower to better quality, so no need to sort - formats = [{ - 'url': x.find('default/streamerURI').text, - 'app': x.find('default/streamerURI').text.split('/', 3)[3], - 'play_path': x.find('default/url').text, - 'rtmp_live': False, - 'ext': 'mp4', - 'format_id': x.get('quality'), - } for x in media.findall('assets/asset')] + for asset in media.findall('assets/asset'): + for x in asset: + formats.append({ + 'url': x.find('streamerURI').text, + 'app': x.find('streamerURI').text.split('/', 3)[3], + 'play_path': x.find('url').text, + 'rtmp_live': False, + 'ext': 'mp4', + 'format_id': '%s-%s' % (x.tag, asset.get('quality')), + }) return { 'id': video_id,