X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Frte.py;h=47c8331fed6221ccba38874513cba90ed7d609db;hb=dc4fe5c6d713ac09cd35f8b8dbfbe46a67a67f10;hp=25abcee920f0a62c2cbac355047a7230f7edb394;hpb=896c7a23cd9fbfc589f26e9a7bbada38a325e2ad;p=youtube-dl.git

diff --git a/youtube_dl/extractor/rte.py b/youtube_dl/extractor/rte.py
index 25abcee92..47c8331fe 100644
--- a/youtube_dl/extractor/rte.py
+++ b/youtube_dl/extractor/rte.py
@@ -2,9 +2,9 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-
 from ..utils import (
     float_or_none,
+    parse_iso8601,
     unescapeHTML,
 )
 
@@ -58,7 +58,6 @@ class RteIE(InfoExtractor):
         }
 
 
-
 class RteRadioIE(InfoExtractor):
     IE_NAME = 'rte:radio'
     IE_DESC = 'Raidió Teilifís Éireann radio'
@@ -71,10 +70,12 @@ class RteRadioIE(InfoExtractor):
         'url': 'http://www.rte.ie/radio/utils/radioplayer/rteradioweb.html#!rii=16:10507902:2414:27-12-2015:',
         'info_dict': {
             'id': '10507902',
-            'ext': 'flv',
+            'ext': 'mp4',
             'title': 'Gloria',
             'thumbnail': 're:^https?://.*\.jpg$',
-            'description': 'Tim Thurston guides you through a millennium of sacred music featuring Gregorian chant, pure solo voices and choral masterpieces, framed around the glorious music of J.S. Bach.',
+            'description': 'md5:9ce124a7fb41559ec68f06387cabddf0',
+            'timestamp': 1451203200,
+            'upload_date': '20151227',
             'duration': 7230.0,
         },
         'params': {
@@ -84,8 +85,10 @@ class RteRadioIE(InfoExtractor):
 
     def _real_extract(self, url):
         item_id = self._match_id(url)
-        feeds_url = 'http://www.rte.ie/rteavgen/getplaylist/?type=web&format=json&id=' + item_id
-        json_string = self._download_json(feeds_url, item_id)
+
+        json_string = self._download_json(
+            'http://www.rte.ie/rteavgen/getplaylist/?type=web&format=json&id=' + item_id,
+            item_id)
 
         # NB the string values in the JSON are stored using XML escaping(!)
         show = json_string['shows'][0]
@@ -93,31 +96,33 @@ class RteRadioIE(InfoExtractor):
         description = unescapeHTML(show.get('description'))
         thumbnail = show.get('thumbnail')
         duration = float_or_none(show.get('duration'), 1000)
+        timestamp = parse_iso8601(show.get('published'))
 
         mg = show['media:group'][0]
 
         formats = []
 
         if mg.get('url') and not mg['url'].startswith('rtmpe:'):
-            formats.append({'url': mg.get('url')})
+            formats.append({'url': mg['url']})
 
         if mg.get('hls_server') and mg.get('hls_url'):
-            hls_url = mg['hls_server'] +  mg['hls_url']
-            hls_formats = self._extract_m3u8_formats(
-                    hls_url, item_id, 'mp4', m3u8_id='hls', fatal=False)
-            formats.extend(hls_formats)
+            formats.extend(self._extract_m3u8_formats(
+                mg['hls_server'] + mg['hls_url'], item_id, 'mp4',
+                entry_protocol='m3u8_native', m3u8_id='hls', fatal=False))
 
         if mg.get('hds_server') and mg.get('hds_url'):
-            f4m_url = mg['hds_server'] + mg['hds_url']
-            f4m_formats = self._extract_f4m_formats(
-                    f4m_url, item_id, f4m_id='hds', fatal=False)
-            formats.extend(f4m_formats)
+            formats.extend(self._extract_f4m_formats(
+                mg['hds_server'] + mg['hds_url'], item_id,
+                f4m_id='hds', fatal=False))
+
+        self._sort_formats(formats)
 
         return {
             'id': item_id,
             'title': title,
-            'formats': formats,
             'description': description,
             'thumbnail': thumbnail,
+            'timestamp': timestamp,
             'duration': duration,
+            'formats': formats,
         }