From 3534b6329aebaad0f27d389d96fed2b5738585e2 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Sun, 14 Apr 2019 14:39:20 +0100 Subject: [PATCH] [yahoo] add support for streaming.yahoo.co.jp(closes #5811)(closes #7098) --- youtube_dl/extractor/yahoo.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index 955e12d2ff..730f69b09a 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -481,8 +481,8 @@ def _get_n_results(self, query, n): class YahooGyaOPlayerIE(InfoExtractor): IE_NAME = 'yahoo:gyao:player' - _VALID_URL = r'https?://gyao\.yahoo\.co\.jp/player/(?P\d+/v\d+/v\d+)' - _TEST = { + _VALID_URL = r'https?://(?:gyao\.yahoo\.co\.jp/player|streaming\.yahoo\.co\.jp/c/y)/(?P\d+/v\d+/v\d+)' + _TESTS = [{ 'url': 'https://gyao.yahoo.co.jp/player/00998/v00818/v0000000000000008564/', 'info_dict': { 'id': '5993125228001', @@ -497,7 +497,10 @@ class YahooGyaOPlayerIE(InfoExtractor): # m3u8 download 'skip_download': True, }, - } + }, { + 'url': 'https://streaming.yahoo.co.jp/c/y/01034/v00133/v0000000000000000706/', + 'only_matching': True, + }] def _real_extract(self, url): video_id = self._match_id(url).replace('/', ':') @@ -518,14 +521,17 @@ def _real_extract(self, url): class YahooGyaOIE(InfoExtractor): IE_NAME = 'yahoo:gyao' - _VALID_URL = r'https?://gyao\.yahoo\.co\.jp/p/(?P\d+/v\d+)' - _TEST = { + _VALID_URL = r'https?://(?:gyao\.yahoo\.co\.jp/p|streaming\.yahoo\.co\.jp/p/y)/(?P\d+/v\d+)' + _TESTS = [{ 'url': 'https://gyao.yahoo.co.jp/p/00449/v03102/', 'info_dict': { 'id': '00449:v03102', }, 'playlist_count': 2, - } + }, { + 'url': 'https://streaming.yahoo.co.jp/p/y/01034/v00133/', + 'only_matching': True, + }] def _real_extract(self, url): program_id = self._match_id(url).replace('/', ':')