Merge tag 'upstream/2015.05.15'

[youtubedl] / youtube_dl / extractor / tunein.py

diff --git a/youtube_dl/extractor/tunein.py b/youtube_dl/extractor/tunein.py
index 4ce5aeeba242b94b78d71e3c9d033aa318b588fb..b6b1f2568f23a6ea9fe8e12c86deb6b30d44a809 100644 (file)
--- a/youtube_dl/extractor/tunein.py
+++ b/youtube_dl/extractor/tunein.py
@@ -24,7 +24,7 @@ class TuneInIE(InfoExtractor):
     _INFO_DICT = {
         'id': '34682',
         'title': 'Jazz 24 on 88.5 Jazz24 - KPLU-HD2',
     _INFO_DICT = {
         'id': '34682',
         'title': 'Jazz 24 on 88.5 Jazz24 - KPLU-HD2',

-        'ext': 'AAC',
+        'ext': 'aac',

         'thumbnail': 're:^https?://.*\.png$',
         'location': 'Tacoma, WA',
     }
         'thumbnail': 're:^https?://.*\.png$',
         'location': 'Tacoma, WA',
     }


@@ -78,14 +78,21 @@ class TuneInIE(InfoExtractor):
         for stream in streams:
             if stream.get('Type') == 'Live':
                 is_live = True
         for stream in streams:
             if stream.get('Type') == 'Live':
                 is_live = True

+            reliability = stream.get('Reliability')
+            format_note = (
+                'Reliability: %d%%' % reliability
+                if reliability is not None else None)

             formats.append({
             formats.append({

+                'preference': (
+                    0 if reliability is None or reliability > 90
+                    else 1),

                 'abr': stream.get('Bandwidth'),
                 'abr': stream.get('Bandwidth'),

-                'ext': stream.get('MediaType'),
+                'ext': stream.get('MediaType').lower(),

                 'acodec': stream.get('MediaType'),
                 'vcodec': 'none',
                 'url': stream.get('Url'),
                 'acodec': stream.get('MediaType'),
                 'vcodec': 'none',
                 'url': stream.get('Url'),

-                # Sometimes streams with the highest quality do not exist
-                'preference': stream.get('Reliability'),
+                'source_preference': reliability,
+                'format_note': format_note,

             })
         self._sort_formats(formats)
 
             })
         self._sort_formats(formats)