projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[krasview] Fix extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
yahoo.py
diff --git
a/youtube_dl/extractor/yahoo.py
b/youtube_dl/extractor/yahoo.py
index 2d9e311b0188cb23db059a391850ee6dec822e4c..f8e7041a08d042ac44c13338439b5568bf4caac6 100644
(file)
--- a/
youtube_dl/extractor/yahoo.py
+++ b/
youtube_dl/extractor/yahoo.py
@@
-56,14
+56,14
@@
class YahooIE(InfoExtractor):
}
},
{
}
},
{
- 'url': 'https://tw.screen.yahoo.com/
taipei-opinion-poll/選情站報-街頭民調-台北市篇-102823042
.html',
- 'md5': '
92a7fdd8a08783c68a174d7aa067dde8
',
+ 'url': 'https://tw.screen.yahoo.com/
election-2014-askmayor/敢問市長-黃秀霜批賴清德-非常高傲-033009720
.html',
+ 'md5': '
3a09cf59349cfaddae1797acc3c087fc
',
'info_dict': {
'info_dict': {
- 'id': '
7a23b569-7bea-36cb-85b9-bd5301a0a1fb
',
+ 'id': '
cac903b3-fcf4-3c14-b632-643ab541712f
',
'ext': 'mp4',
'ext': 'mp4',
- 'title': '
選情站報 街頭民調 台北市篇
',
- 'description': '
選情站報 街頭民調 台北市篇
',
- 'duration':
429
,
+ 'title': '
敢問市長/黃秀霜批賴清德「非常高傲」
',
+ 'description': '
直言台南沒捷運 交通居五都之末
',
+ 'duration':
396
,
}
},
{
}
},
{
@@
-88,14
+88,14
@@
class YahooIE(InfoExtractor):
'duration': 121,
}
}, {
'duration': 121,
}
}, {
- 'url': 'https://ca.finance.yahoo.com/news/
20-most-valuable-brands-world-1126007
75.html',
- 'md5': '
3e401e4eed6325aa29d9b96125fd5b4f
',
+ 'url': 'https://ca.finance.yahoo.com/news/
hackers-sony-more-trouble-well-1546090
75.html',
+ 'md5': '
226a895aae7e21b0129e2a2006fe9690
',
'info_dict': {
'info_dict': {
- 'id': '
c1b4c09c-8ed8-3b65-8b05-169c55358a83
',
+ 'id': '
e624c4bc-3389-34de-9dfc-025f74943409
',
'ext': 'mp4',
'ext': 'mp4',
- 'title':
"Apple Is The World's Most Valuable Brand"
,
- 'description': '
md5:73eabc1a11c6f59752593b2ceefa1262
',
- 'duration':
21
,
+ 'title':
'\'The Interview\' TV Spot: War'
,
+ 'description': '
The Interview
',
+ 'duration':
30
,
}
}, {
'url': 'http://news.yahoo.com/video/china-moses-crazy-blues-104538833.html',
}
}, {
'url': 'http://news.yahoo.com/video/china-moses-crazy-blues-104538833.html',
@@
-176,17
+176,15
@@
class YahooIE(InfoExtractor):
region = self._search_regex(
r'\\?"region\\?"\s*:\s*\\?"([^"]+?)\\?"',
webpage, 'region', fatal=False, default='US')
region = self._search_regex(
r'\\?"region\\?"\s*:\s*\\?"([^"]+?)\\?"',
webpage, 'region', fatal=False, default='US')
- query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
- ' AND plrs="86Gj0vCaSzV_Iuf6hNylf2" AND region="%s"'
- ' AND protocol="http"' % (video_id, region))
data = compat_urllib_parse.urlencode({
data = compat_urllib_parse.urlencode({
- 'q': query,
- 'env': 'prod',
- 'format': 'json',
+ 'protocol': 'http',
+ 'region': region,
})
})
+ query_url = (
+ 'https://video.media.yql.yahoo.com/v1/video/sapi/streams/'
+ '{id}?{data}'.format(id=video_id, data=data))
query_result = self._download_json(
query_result = self._download_json(
- 'http://video.query.yahoo.com/v1/public/yql?' + data,
- display_id, 'Downloading video info')
+ query_url, display_id, 'Downloading video info')
info = query_result['query']['results']['mediaObj'][0]
meta = info.get('meta')
info = query_result['query']['results']['mediaObj'][0]
meta = info.get('meta')