From: dinesh <dsdiscoverdinesh@gmail.com>
Date: Sun, 26 Oct 2014 19:38:51 +0000 (+0530)
Subject: [Rte] Improve extractor
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=0551a02b82b4209422e0734150e0186210cd0723;p=youtube-dl

[Rte] Improve extractor
---

diff --git a/youtube_dl/extractor/rte.py b/youtube_dl/extractor/rte.py
index ab12bb5fd..8d4e94e55 100644
--- a/youtube_dl/extractor/rte.py
+++ b/youtube_dl/extractor/rte.py
@@ -18,7 +18,7 @@ class RteIE(InfoExtractor):
             'title': 'Nine News',
             'thumbnail': 're:^https?://.*\.jpg$',
             'description': 'The One O\'Clock News followed by Weather.',
-            'duration': 1622963.0,
+            'duration': 1622.963,
         }
     }
     
@@ -29,7 +29,7 @@ class RteIE(InfoExtractor):
         title = self._og_search_title(webpage)
         
         description = self._search_regex(r'<meta name="description" content="(.*?)" />', webpage, 'description')
-        duration = float_or_none(self._html_search_meta('duration', webpage, 'duration'))
+        duration = float_or_none(self._html_search_meta('duration', webpage, 'duration'), 1000)
         
         thumbnail_id = self._search_regex(r'<meta name="thumbnail" content="uri:irus:(.*?)" />', webpage, 'thumbnail')
         thumbnail = 'http://img.rasset.ie/' + thumbnail_id + '.jpg' 
@@ -40,8 +40,13 @@ class RteIE(InfoExtractor):
         # f4m_url = server + relative_url
         f4m_url = json_string['shows'][0]['media:group'][0]['rte:server'] + json_string['shows'][0]['media:group'][0]['url']
         f4m_formats = self._extract_f4m_formats(f4m_url, video_id)
-        for f in f4m_formats:
-            del f['tbr']
+        f4m_formats = [{
+            'format_id': f['format_id'],
+            'url': f['url'],
+            'ext': 'mp4',
+            'width': f['width'],
+            'height': f['height'],
+        } for f in f4m_formats ]
         
         return {
             'id': video_id,