projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6fe5a7
)
[amp] imporove thumbnail and subtitle extraction
author
Remita Amine
<remitamine@gmail.com>
Mon, 1 May 2017 23:06:19 +0000
(
00:06
+0100)
committer
Remita Amine
<remitamine@gmail.com>
Mon, 1 May 2017 23:06:58 +0000
(
00:06
+0100)
youtube_dl/extractor/amp.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/amp.py
b/youtube_dl/extractor/amp.py
index 98f8e69cdc7780da950c2b0d0f46a498d2883d33..fde1a8ff74d8d6bcc85eb2520947e96d4205b176 100644
(file)
--- a/
youtube_dl/extractor/amp.py
+++ b/
youtube_dl/extractor/amp.py
@@
-34,9
+34,12
@@
class AMPIE(InfoExtractor):
if isinstance(media_thumbnail, dict):
media_thumbnail = [media_thumbnail]
for thumbnail_data in media_thumbnail:
if isinstance(media_thumbnail, dict):
media_thumbnail = [media_thumbnail]
for thumbnail_data in media_thumbnail:
- thumbnail = thumbnail_data['@attributes']
+ thumbnail = thumbnail_data.get('@attributes', {})
+ thumbnail_url = thumbnail.get('url')
+ if not thumbnail_url:
+ continue
thumbnails.append({
thumbnails.append({
- 'url': self._proto_relative_url(thumbnail
['url']
, 'http:'),
+ 'url': self._proto_relative_url(thumbnail
_url
, 'http:'),
'width': int_or_none(thumbnail.get('width')),
'height': int_or_none(thumbnail.get('height')),
})
'width': int_or_none(thumbnail.get('width')),
'height': int_or_none(thumbnail.get('height')),
})
@@
-47,9
+50,14
@@
class AMPIE(InfoExtractor):
if isinstance(media_subtitle, dict):
media_subtitle = [media_subtitle]
for subtitle_data in media_subtitle:
if isinstance(media_subtitle, dict):
media_subtitle = [media_subtitle]
for subtitle_data in media_subtitle:
- subtitle = subtitle_data['@attributes']
- lang = subtitle.get('lang') or 'en'
- subtitles[lang] = [{'url': subtitle['href']}]
+ subtitle = subtitle_data.get('@attributes', {})
+ subtitle_href = subtitle.get('href')
+ if not subtitle_href:
+ continue
+ subtitles.setdefault(subtitle.get('lang') or 'en', []).append({
+ 'url': subtitle_href,
+ 'ext': mimetype2ext(subtitle.get('type')) or determine_ext(subtitle_href),
+ })
formats = []
media_content = get_media_node('content')
formats = []
media_content = get_media_node('content')