From e5da4021eb75b0ea409d7ca1d8ec4b5f585ce762 Mon Sep 17 00:00:00 2001 From: pulpe Date: Mon, 16 Jun 2014 16:17:49 +0200 Subject: [PATCH 1/2] [ARDIE] fix formats extraction (fixes #3087) --- youtube_dl/extractor/ard.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index c6d22c029..de8811f23 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -56,7 +56,19 @@ class ARDIE(InfoExtractor): raise ExtractorError('This video is only available after 20:00') formats = [] + for s in streams: + if type(s['_stream']) == list: + reverse = s['_stream'][::-1] + for i in reverse: + quality = s['_quality'] + reverse.index(i) + formats.append({ + 'quality': quality, + 'url': i, + 'format_id': '%s-%s' % (determine_ext(i), quality) + }) + continue + format = { 'quality': s['_quality'], 'url': s['_stream'], From 895ce482b1f3732a5f96014957dac84ec6ca069f Mon Sep 17 00:00:00 2001 From: pulpe Date: Mon, 16 Jun 2014 18:14:58 +0200 Subject: [PATCH 2/2] [ARDIE] adjustments suggested by @jaimeMF --- youtube_dl/extractor/ard.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index de8811f23..b36a4d46a 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -59,13 +59,12 @@ class ARDIE(InfoExtractor): for s in streams: if type(s['_stream']) == list: - reverse = s['_stream'][::-1] - for i in reverse: - quality = s['_quality'] + reverse.index(i) + for index, url in enumerate(s['_stream'][::-1]): + quality = s['_quality'] + index formats.append({ 'quality': quality, - 'url': i, - 'format_id': '%s-%s' % (determine_ext(i), quality) + 'url': url, + 'format_id': '%s-%s' % (determine_ext(url), quality) }) continue