X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Famp.py;h=138fa08086ee2d4e7c446c09ce85b8726e4ff255;hb=0f56bd2178d887adb2d5c61da44343d228eed504;hp=b573b928082b0b9f8f479d976f91a490cc671c1e;hpb=3793090b1b1c1e3462b80dd3045a3573545cfb29;p=youtube-dl

diff --git a/youtube_dl/extractor/amp.py b/youtube_dl/extractor/amp.py
index b573b9280..138fa0808 100644
--- a/youtube_dl/extractor/amp.py
+++ b/youtube_dl/extractor/amp.py
@@ -9,23 +9,21 @@ from ..utils import (
 
 
 class AMPIE(InfoExtractor):
-    def _get_media_node(self, item, name, default=None):
-        media_name = 'media-%s' % name
-        media_group = item.get('media-group') or item
-        return media_group.get(media_name) or item.get(media_name) or item.get(name, default)
-
     # parse Akamai Adaptive Media Player feed
     def _extract_feed_info(self, url):
         item = self._download_json(
-            url, None,
-            'Downloading Akamai AMP feed',
-            'Unable to download Akamai AMP feed'
-            )['channel']['item']
+            url, None, 'Downloading Akamai AMP feed',
+            'Unable to download Akamai AMP feed')['channel']['item']
 
         video_id = item['guid']
-        
+
+        def get_media_node(name, default=None):
+            media_name = 'media-%s' % name
+            media_group = item.get('media-group') or item
+            return media_group.get(media_name) or item.get(media_name) or item.get(name, default)
+
         thumbnails = []
-        media_thumbnail = self._get_media_node(item, 'thumbnail')
+        media_thumbnail = get_media_node('thumbnail')
         if media_thumbnail:
             if isinstance(media_thumbnail, dict):
                 media_thumbnail = [media_thumbnail]
@@ -38,7 +36,7 @@ class AMPIE(InfoExtractor):
                 })
 
         subtitles = {}
-        media_subtitle = self._get_media_node(item, 'subTitle')
+        media_subtitle = get_media_node('subTitle')
         if media_subtitle:
             if isinstance(media_subtitle, dict):
                 media_subtitle = [media_subtitle]
@@ -48,37 +46,38 @@ class AMPIE(InfoExtractor):
                 subtitles[lang] = [{'url': subtitle['href']}]
 
         formats = []
-        media_content = self._get_media_node(item, 'content')
+        media_content = get_media_node('content')
         if isinstance(media_content, dict):
             media_content = [media_content]
         for media_data in media_content:
             media = media_data['@attributes']
             media_type = media['type']
             if media_type == 'video/f4m':
-                f4m_formats = self._extract_f4m_formats(media['url'] + '?hdcore=3.4.0&plugin=aasp-3.4.0.132.124', video_id, f4m_id='hds', fatal=False)
-                if f4m_formats:
-                    formats.extend(f4m_formats)
+                formats.extend(self._extract_f4m_formats(
+                    media['url'] + '?hdcore=3.4.0&plugin=aasp-3.4.0.132.124',
+                    video_id, f4m_id='hds', fatal=False))
             elif media_type == 'application/x-mpegURL':
-                m3u8_formats = self._extract_m3u8_formats(media['url'], video_id, m3u8_id='hls', fatal=False)
-                if m3u8_formats:
-                    formats.extend(m3u8_formats)
+                formats.extend(self._extract_m3u8_formats(
+                    media['url'], video_id, 'mp4', m3u8_id='hls', fatal=False))
             else:
                 formats.append({
                     'format_id': media_data['media-category']['@attributes']['label'],
                     'url': media['url'],
-                    'preference': 1,
-                    'vbr': int_or_none(media.get('bitrate')),
+                    'tbr': int_or_none(media.get('bitrate')),
                     'filesize': int_or_none(media.get('fileSize')),
                 })
 
         self._sort_formats(formats)
 
+        timestamp = parse_iso8601(item.get('pubDate'), ' ') or parse_iso8601(item.get('dc-date'))
+
         return {
             'id': video_id,
-            'title': self._get_media_node(item, 'title'),
-            'description': self._get_media_node(item, 'description'),
+            'title': get_media_node('title'),
+            'description': get_media_node('description'),
             'thumbnails': thumbnails,
-            'timestamp': parse_iso8601(item.get('pubDate'), ' '),
+            'timestamp': timestamp,
             'duration': int_or_none(media_content[0].get('@attributes', {}).get('duration')),
+            'subtitles': subtitles,
             'formats': formats,
         }