]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[extractor/common] Improve m3u format IDs (#5143)
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 6 Mar 2015 09:49:42 +0000 (10:49 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 6 Mar 2015 09:49:42 +0000 (10:49 +0100)
youtube_dl/extractor/common.py

index cf39c0c21ee570f7277aacc7ca560a1509afe855..8ff76342fec703b5cae6683cf34f761698c8cba6 100644 (file)
@@ -883,8 +883,12 @@ class InfoExtractor(object):
                     formats.append({'url': format_url(line)})
                     continue
                 tbr = int_or_none(last_info.get('BANDWIDTH'), scale=1000)
+                format_id = last_media.get('NAME')
+                if not format_id:
+                    format_id = '-'.join(filter(None, [
+                        m3u8_id, 'm3u8-%d' % (tbr if tbr else len(formats))]))
                 f = {
-                    'format_id': '-'.join(filter(None, [m3u8_id, 'm3u8-%d' % (tbr if tbr else len(formats))])),
+                    'format_id': format_id,
                     'url': format_url(line.strip()),
                     'tbr': tbr,
                     'ext': ext,