diff options
Diffstat (limited to 'hypervideo_dl/extractor/radiko.py')
-rw-r--r-- | hypervideo_dl/extractor/radiko.py | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/hypervideo_dl/extractor/radiko.py b/hypervideo_dl/extractor/radiko.py index f102922..cef68eb 100644 --- a/hypervideo_dl/extractor/radiko.py +++ b/hypervideo_dl/extractor/radiko.py @@ -1,5 +1,4 @@ import base64 -import re import urllib.parse from .common import InfoExtractor @@ -15,6 +14,23 @@ from ..utils import ( class RadikoBaseIE(InfoExtractor): _FULL_KEY = None + _HOSTS_FOR_TIME_FREE_FFMPEG_UNSUPPORTED = ( + 'https://c-rpaa.smartstream.ne.jp', + 'https://si-c-radiko.smartstream.ne.jp', + 'https://tf-f-rpaa-radiko.smartstream.ne.jp', + 'https://tf-c-rpaa-radiko.smartstream.ne.jp', + 'https://si-f-radiko.smartstream.ne.jp', + 'https://rpaa.smartstream.ne.jp', + ) + _HOSTS_FOR_TIME_FREE_FFMPEG_SUPPORTED = ( + 'https://rd-wowza-radiko.radiko-cf.com', + 'https://radiko.jp', + 'https://f-radiko.smartstream.ne.jp', + ) + # Following URL forcibly connects not Time Free but Live + _HOSTS_FOR_LIVE = ( + 'https://c-radiko.smartstream.ne.jp', + ) def _auth_client(self): _, auth1_handle = self._download_webpage_handle( @@ -25,7 +41,7 @@ class RadikoBaseIE(InfoExtractor): 'x-radiko-device': 'pc', 'x-radiko-user': 'dummy_user', }) - auth1_header = auth1_handle.info() + auth1_header = auth1_handle.headers auth_token = auth1_header['X-Radiko-AuthToken'] kl = int(auth1_header['X-Radiko-KeyLength']) @@ -92,9 +108,9 @@ class RadikoBaseIE(InfoExtractor): formats = [] found = set() for url_tag in m3u8_urls: - pcu = url_tag.find('playlist_create_url') + pcu = url_tag.find('playlist_create_url').text url_attrib = url_tag.attrib - playlist_url = update_url_query(pcu.text, { + playlist_url = update_url_query(pcu, { 'station_id': station, **query, 'l': '15', @@ -118,9 +134,10 @@ class RadikoBaseIE(InfoExtractor): 'X-Radiko-AuthToken': auth_token, }) for sf in subformats: - if re.fullmatch(r'[cf]-radiko\.smartstream\.ne\.jp', domain): - # Prioritize live radio vs playback based on extractor - sf['preference'] = 100 if is_onair else -100 + if (is_onair ^ pcu.startswith(self._HOSTS_FOR_LIVE)) or ( + not is_onair and pcu.startswith(self._HOSTS_FOR_TIME_FREE_FFMPEG_UNSUPPORTED)): + sf['preference'] = -100 + sf['format_note'] = 'not preferred' if not is_onair and url_attrib['timefree'] == '1' and time_to_skip: sf['downloader_options'] = {'ffmpeg_args': ['-ss', time_to_skip]} formats.extend(subformats) |