projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction (closes #20758, closes #20759, closes #20761, closes #20762...
[youtube-dl]
/
youtube_dl
/
extractor
/
yahoo.py
diff --git
a/youtube_dl/extractor/yahoo.py
b/youtube_dl/extractor/yahoo.py
index 730f69b09a20622d61d6456718f59082b650e114..86ba7d3c9228961a366f1728b642a3d5b6825515 100644
(file)
--- a/
youtube_dl/extractor/yahoo.py
+++ b/
youtube_dl/extractor/yahoo.py
@@
-481,7
+481,7
@@
class YahooSearchIE(SearchInfoExtractor):
class YahooGyaOPlayerIE(InfoExtractor):
IE_NAME = 'yahoo:gyao:player'
class YahooGyaOPlayerIE(InfoExtractor):
IE_NAME = 'yahoo:gyao:player'
- _VALID_URL = r'https?://(?:gyao\.yahoo\.co\.jp/
player|streaming\.yahoo\.co\.jp/c/y)/(?P<id>\d+/v\d+/v\d+
)'
+ _VALID_URL = r'https?://(?:gyao\.yahoo\.co\.jp/
(?:player|episode/[^/]+)|streaming\.yahoo\.co\.jp/c/y)/(?P<id>\d+/v\d+/v\d+|[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}
)'
_TESTS = [{
'url': 'https://gyao.yahoo.co.jp/player/00998/v00818/v0000000000000008564/',
'info_dict': {
_TESTS = [{
'url': 'https://gyao.yahoo.co.jp/player/00998/v00818/v0000000000000008564/',
'info_dict': {
@@
-500,6
+500,9
@@
class YahooGyaOPlayerIE(InfoExtractor):
}, {
'url': 'https://streaming.yahoo.co.jp/c/y/01034/v00133/v0000000000000000706/',
'only_matching': True,
}, {
'url': 'https://streaming.yahoo.co.jp/c/y/01034/v00133/v0000000000000000706/',
'only_matching': True,
+ }, {
+ 'url': 'https://gyao.yahoo.co.jp/episode/%E3%81%8D%E3%81%AE%E3%81%86%E4%BD%95%E9%A3%9F%E3%81%B9%E3%81%9F%EF%BC%9F%20%E7%AC%AC2%E8%A9%B1%202019%2F4%2F12%E6%94%BE%E9%80%81%E5%88%86/5cb02352-b725-409e-9f8d-88f947a9f682',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-513,7
+516,9
@@
class YahooGyaOPlayerIE(InfoExtractor):
'_type': 'url_transparent',
'id': video_id,
'title': video['title'],
'_type': 'url_transparent',
'id': video_id,
'title': video['title'],
- 'url': 'http://players.brightcove.net/4235717419001/default_default/index.html?videoId=' + video['videoId'],
+ 'url': smuggle_url(
+ 'http://players.brightcove.net/4235717419001/default_default/index.html?videoId=' + video['videoId'],
+ {'geo_countries': ['JP']}),
'description': video.get('longDescription'),
'ie_key': BrightcoveNewIE.ie_key(),
}
'description': video.get('longDescription'),
'ie_key': BrightcoveNewIE.ie_key(),
}
@@
-543,6
+548,6
@@
class YahooGyaOIE(InfoExtractor):
if not video_id:
continue
entries.append(self.url_result(
if not video_id:
continue
entries.append(self.url_result(
- 'https://gyao.yahoo.co.jp/player/%s/' %
'/'.join(video_id.split(':')
),
+ 'https://gyao.yahoo.co.jp/player/%s/' %
video_id.replace(':', '/'
),
YahooGyaOPlayerIE.ie_key(), video_id))
return self.playlist_result(entries, program_id)
YahooGyaOPlayerIE.ie_key(), video_id))
return self.playlist_result(entries, program_id)