projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb6a5b9
)
[yahoo] improve thumbnail extraction
author
pulpe
<Pulpan3@gmail.com>
Wed, 4 Jun 2014 15:38:41 +0000
(17:38 +0200)
committer
pulpe
<Pulpan3@gmail.com>
Wed, 4 Jun 2014 15:38:41 +0000
(17:38 +0200)
youtube_dl/extractor/yahoo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/yahoo.py
b/youtube_dl/extractor/yahoo.py
index 1815224944987f6d110ef27a1a10b896143fb00b..d84be25620eecb944845b74299510067772c583f 100644
(file)
--- a/
youtube_dl/extractor/yahoo.py
+++ b/
youtube_dl/extractor/yahoo.py
@@
-70,9
+70,9
@@
class YahooIE(InfoExtractor):
# The 'meta' field is not always in the video webpage, we request it
# from another page
long_id = info['id']
# The 'meta' field is not always in the video webpage, we request it
# from another page
long_id = info['id']
- return self._get_info(long_id, video_id)
+ return self._get_info(long_id, video_id
, webpage
)
- def _get_info(self, long_id, video_id):
+ def _get_info(self, long_id, video_id
, webpage
):
query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
' AND plrs="86Gj0vCaSzV_Iuf6hNylf2" AND region="US"'
' AND protocol="http"' % long_id)
query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
' AND plrs="86Gj0vCaSzV_Iuf6hNylf2" AND region="US"'
' AND protocol="http"' % long_id)
@@
-115,7
+115,7
@@
class YahooIE(InfoExtractor):
'title': meta['title'],
'formats': formats,
'description': clean_html(meta['description']),
'title': meta['title'],
'formats': formats,
'description': clean_html(meta['description']),
- 'thumbnail': meta
.get('thumbnail'
),
+ 'thumbnail': meta
['thumbnail'] if meta.get('thumbnail') else self._og_search_thumbnail(webpage
),
}
}
@@
-139,7
+139,7
@@
class YahooNewsIE(YahooIE):
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
long_id = self._search_regex(r'contentId: \'(.+?)\',', webpage, 'long id')
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
long_id = self._search_regex(r'contentId: \'(.+?)\',', webpage, 'long id')
- return self._get_info(long_id, video_id)
+ return self._get_info(long_id, video_id
, webpage
)
class YahooSearchIE(SearchInfoExtractor):
class YahooSearchIE(SearchInfoExtractor):