R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Twitch livestreams Error 410: Gone (closes #25528)

Browse Source
This commit is contained in:
p1131 2020-06-05 14:39:54 +03:00
parent d5147b65ac
commit ef41d07386
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/extractor/twitch.py
View File

@ -36,6 +36,7 @@ class TwitchBaseIE(InfoExtractor):
_USHER_BASE = 'https://usher.ttvnw.net' _USHER_BASE = 'https://usher.ttvnw.net'
_LOGIN_FORM_URL = 'https://www.twitch.tv/login' _LOGIN_FORM_URL = 'https://www.twitch.tv/login'
_LOGIN_POST_URL = 'https://passport.twitch.tv/login' _LOGIN_POST_URL = 'https://passport.twitch.tv/login'
_ACCEPT = 'application/vnd.twitchtv.v5+json'
_CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko' _CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko'
_NETRC_MACHINE = 'twitch' _NETRC_MACHINE = 'twitch'
@ -51,6 +52,7 @@ class TwitchBaseIE(InfoExtractor):
def _call_api(self, path, item_id, *args, **kwargs): def _call_api(self, path, item_id, *args, **kwargs):
headers = kwargs.get('headers', {}).copy() headers = kwargs.get('headers', {}).copy()
headers['Client-ID'] = self._CLIENT_ID headers['Client-ID'] = self._CLIENT_ID
headers['Accept'] = self._ACCEPT
kwargs['headers'] = headers kwargs['headers'] = headers
response = self._download_json( response = self._download_json(
'%s/%s' % (self._API_BASE, path), item_id, '%s/%s' % (self._API_BASE, path), item_id,
@ -572,20 +574,29 @@ class TwitchStreamIE(TwitchBaseIE):
else super(TwitchStreamIE, cls).suitable(url)) else super(TwitchStreamIE, cls).suitable(url))
def _real_extract(self, url): def _real_extract(self, url):
channel_id = self._match_id(url) channel_name = self._match_id(url).lower()
try:
# the kraken api (v5) accepts only channel IDS.
# kraken/users?login=CHANNELNAME returns a channel's ID from its name
channel_id = self._call_api(
'kraken/users?login=%s' % channel_name,
channel_name, 'Getting channel ID').get('users')[0].get('_id')
assert channel_id is not None
stream = self._call_api( stream = self._call_api(
'kraken/streams/%s?stream_type=all' % channel_id.lower(), 'kraken/streams/%s?stream_type=all' % channel_id.lower(),
channel_id, 'Downloading stream JSON').get('stream') channel_name, 'Downloading stream JSON').get('stream')
assert stream is not None
if not stream: # IndexError is there because the first JSON contains a list
raise ExtractorError('%s is offline' % channel_id, expected=True) except (IndexError, AssertionError) as e:
raise ExtractorError('%s is offline' % channel_name, expected=True)
# Channel name may be typed if different case than the original channel name # Channel name may be typed if different case than the original channel name
# (e.g. http://www.twitch.tv/TWITCHPLAYSPOKEMON) that will lead to constructing # (e.g. http://www.twitch.tv/TWITCHPLAYSPOKEMON) that will lead to constructing
# an invalid m3u8 URL. Working around by use of original channel name from stream # an invalid m3u8 URL. Working around by use of original channel name from stream
# JSON and fallback to lowercase if it's not available. # JSON and fallback to lowercase if it's not available.
channel_id = stream.get('channel', {}).get('name') or channel_id.lower() channel_id = channel_name # XXX
access_token = self._call_api( access_token = self._call_api(
'api/channels/%s/access_token' % channel_id, channel_id, 'api/channels/%s/access_token' % channel_id, channel_id,