fenix
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[twitch] Refactor API calls

This commit is contained in:
Sergey M․ 2016-08-21 22:09:29 +07:00
parent b1e676fde8
commit e3f6b56909
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
youtube_dl/extractor/twitch.py
View File

@ -41,7 +41,7 @@ class TwitchBaseIE(InfoExtractor):
'%s returned error: %s - %s' % (self.IE_NAME, error, response.get('message')), '%s returned error: %s - %s' % (self.IE_NAME, error, response.get('message')),
expected=True) expected=True)
def _download_json(self, url, video_id, note='Downloading JSON metadata'): def _call_api(self, path, item_id, note):
headers = { headers = {
'Referer': 'http://api.twitch.tv/crossdomain/receiver.html?v=2', 'Referer': 'http://api.twitch.tv/crossdomain/receiver.html?v=2',
'X-Requested-With': 'XMLHttpRequest', 'X-Requested-With': 'XMLHttpRequest',
@ -49,8 +49,8 @@ class TwitchBaseIE(InfoExtractor):
for cookie in self._downloader.cookiejar: for cookie in self._downloader.cookiejar:
if cookie.name == 'api_token': if cookie.name == 'api_token':
headers['Twitch-Api-Token'] = cookie.value headers['Twitch-Api-Token'] = cookie.value
response = super(TwitchBaseIE, self)._download_json( response = self._download_json(
url, video_id, note, headers=headers) '%s/%s' % (self._API_BASE, path), item_id, note)
self._handle_error(response) self._handle_error(response)
return response return response
@ -107,14 +107,14 @@ class TwitchBaseIE(InfoExtractor):
class TwitchItemBaseIE(TwitchBaseIE): class TwitchItemBaseIE(TwitchBaseIE):
def _download_info(self, item, item_id): def _download_info(self, item, item_id):
return self._extract_info(self._download_json( return self._extract_info(self._call_api(
'%s/kraken/videos/%s%s' % (self._API_BASE, item, item_id), item_id, 'kraken/videos/%s%s' % (item, item_id), item_id,
'Downloading %s info JSON' % self._ITEM_TYPE)) 'Downloading %s info JSON' % self._ITEM_TYPE))
def _extract_media(self, item_id): def _extract_media(self, item_id):
info = self._download_info(self._ITEM_SHORTCUT, item_id) info = self._download_info(self._ITEM_SHORTCUT, item_id)
response = self._download_json( response = self._call_api(
'%s/api/videos/%s%s' % (self._API_BASE, self._ITEM_SHORTCUT, item_id), item_id, 'api/videos/%s%s' % (self._ITEM_SHORTCUT, item_id), item_id,
'Downloading %s playlist JSON' % self._ITEM_TYPE) 'Downloading %s playlist JSON' % self._ITEM_TYPE)
entries = [] entries = []
chunks = response['chunks'] chunks = response['chunks']
@ -244,8 +244,8 @@ class TwitchVodIE(TwitchItemBaseIE):
item_id = self._match_id(url) item_id = self._match_id(url)
info = self._download_info(self._ITEM_SHORTCUT, item_id) info = self._download_info(self._ITEM_SHORTCUT, item_id)
access_token = self._download_json( access_token = self._call_api(
'%s/api/vods/%s/access_token' % (self._API_BASE, item_id), item_id, 'api/vods/%s/access_token' % item_id, item_id,
'Downloading %s access token' % self._ITEM_TYPE) 'Downloading %s access token' % self._ITEM_TYPE)
formats = self._extract_m3u8_formats( formats = self._extract_m3u8_formats(
@ -273,12 +273,12 @@ class TwitchVodIE(TwitchItemBaseIE):
class TwitchPlaylistBaseIE(TwitchBaseIE): class TwitchPlaylistBaseIE(TwitchBaseIE):
_PLAYLIST_URL = '%s/kraken/channels/%%s/videos/?offset=%%d&limit=%%d' % TwitchBaseIE._API_BASE _PLAYLIST_PATH = 'kraken/channels/%s/videos/?offset=%d&limit=%d'
_PAGE_LIMIT = 100 _PAGE_LIMIT = 100
def _extract_playlist(self, channel_id): def _extract_playlist(self, channel_id):
info = self._download_json( info = self._call_api(
'%s/kraken/channels/%s' % (self._API_BASE, channel_id), 'kraken/channels/%s' % channel_id,
channel_id, 'Downloading channel info JSON') channel_id, 'Downloading channel info JSON')
channel_name = info.get('display_name') or info.get('name') channel_name = info.get('display_name') or info.get('name')
entries = [] entries = []
@ -287,8 +287,8 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
broken_paging_detected = False broken_paging_detected = False
counter_override = None counter_override = None
for counter in itertools.count(1): for counter in itertools.count(1):
response = self._download_json( response = self._call_api(
self._PLAYLIST_URL % (channel_id, offset, limit), self._PLAYLIST_PATH % (channel_id, offset, limit),
channel_id, channel_id,
'Downloading %s videos JSON page %s' 'Downloading %s videos JSON page %s'
% (self._PLAYLIST_TYPE, counter_override or counter)) % (self._PLAYLIST_TYPE, counter_override or counter))
@ -343,7 +343,7 @@ class TwitchProfileIE(TwitchPlaylistBaseIE):
class TwitchPastBroadcastsIE(TwitchPlaylistBaseIE): class TwitchPastBroadcastsIE(TwitchPlaylistBaseIE):
IE_NAME = 'twitch:past_broadcasts' IE_NAME = 'twitch:past_broadcasts'
_VALID_URL = r'%s/(?P<id>[^/]+)/profile/past_broadcasts/?(?:\#.*)?$' % TwitchBaseIE._VALID_URL_BASE _VALID_URL = r'%s/(?P<id>[^/]+)/profile/past_broadcasts/?(?:\#.*)?$' % TwitchBaseIE._VALID_URL_BASE
_PLAYLIST_URL = TwitchPlaylistBaseIE._PLAYLIST_URL + '&broadcasts=true' _PLAYLIST_PATH = TwitchPlaylistBaseIE._PLAYLIST_PATH + '&broadcasts=true'
_PLAYLIST_TYPE = 'past broadcasts' _PLAYLIST_TYPE = 'past broadcasts'
_TEST = { _TEST = {
@ -387,8 +387,8 @@ class TwitchStreamIE(TwitchBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
channel_id = self._match_id(url) channel_id = self._match_id(url)
stream = self._download_json( stream = self._call_api(
'%s/kraken/streams/%s' % (self._API_BASE, channel_id), channel_id, 'kraken/streams/%s' % channel_id, channel_id,
'Downloading stream JSON').get('stream') 'Downloading stream JSON').get('stream')
# Fallback on profile extraction if stream is offline # Fallback on profile extraction if stream is offline
@ -403,8 +403,8 @@ class TwitchStreamIE(TwitchBaseIE):
# 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 = stream.get('channel', {}).get('name') or channel_id.lower()
access_token = self._download_json( access_token = self._call_api(
'%s/api/channels/%s/access_token' % (self._API_BASE, channel_id), channel_id, 'api/channels/%s/access_token' % channel_id, channel_id,
'Downloading channel access token') 'Downloading channel access token')
query = { query = {