aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/amp.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-21 11:12:58 +0100
committerremitamine <remitamine@gmail.com>2015-12-21 11:12:58 +0100
commitc7fa5fa42cb91aa32c5b21c6821f6d190ec047a2 (patch)
tree66c95508edb298a3909b5c4e63f4bf8d9780f888 /youtube_dl/extractor/amp.py
parent63b728f06f00c2f1a45a67eddebd18bcdc36a753 (diff)
[bleacherreport] fix style issues and simplify
Diffstat (limited to 'youtube_dl/extractor/amp.py')
-rw-r--r--youtube_dl/extractor/amp.py38
1 files changed, 19 insertions, 19 deletions
diff --git a/youtube_dl/extractor/amp.py b/youtube_dl/extractor/amp.py
index b573b9280..dcc3c97f1 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,26 +46,28 @@ 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)
+ 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)
elif media_type == 'application/x-mpegURL':
- m3u8_formats = self._extract_m3u8_formats(media['url'], video_id, m3u8_id='hls', fatal=False)
+ m3u8_formats = self._extract_m3u8_formats(
+ media['url'], video_id, 'mp4', m3u8_id='hls', fatal=False)
if m3u8_formats:
formats.extend(m3u8_formats)
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')),
})
@@ -75,8 +75,8 @@ class AMPIE(InfoExtractor):
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'), ' '),
'duration': int_or_none(media_content[0].get('@attributes', {}).get('duration')),