xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-24 03:50:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[twitch] Update tests and minor improvements

Browse Source
This commit is contained in:
Sergey M․ 2014-10-17 23:46:53 +07:00 committed by Sergey M
parent 46fd0dd5a5
commit 013bfdd84c
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
youtube_dl/extractor/twitch.py
View File

@ -24,18 +24,28 @@ class TwitchIE(InfoExtractor):
""" """
_PAGE_LIMIT = 100 _PAGE_LIMIT = 100
_API_BASE = 'https://api.twitch.tv' _API_BASE = 'https://api.twitch.tv'
_TEST = { _TESTS = [{
'url': 'http://www.twitch.tv/thegamedevhub/b/296128360', 'url': 'http://www.twitch.tv/riotgames/b/577357806',
'md5': 'ecaa8a790c22a40770901460af191c9a',
'info_dict': { 'info_dict': {
'id': '296128360', 'id': 'a577357806',
'ext': 'flv', 'title': 'Worlds Semifinals - Star Horn Royal Club vs. OMG',
'upload_date': '20110927', },
'uploader_id': 25114803, 'playlist_mincount': 12,
'uploader': 'thegamedevhub', }, {
'title': 'Beginner Series - Scripting With Python Pt.1' 'url': 'http://www.twitch.tv/acracingleague/c/5285812',
} 'info_dict': {
} 'id': 'c5285812',
'title': 'ACRL Off Season - Sports Cars @ Nordschleife',
},
'playlist_mincount': 3,
}, {
'url': 'http://www.twitch.tv/vanillatv',
'info_dict': {
'id': 'vanillatv',
'title': 'VanillaTV',
},
'playlist_mincount': 412,
}]
def _handle_error(self, response): def _handle_error(self, response):
if not isinstance(response, dict): if not isinstance(response, dict):
@ -80,10 +90,11 @@ class TwitchIE(InfoExtractor):
formats.append(fmt) formats.append(fmt)
self._sort_formats(formats) self._sort_formats(formats)
entry = dict(info) entry = dict(info)
entry['id'] = '%s_%d' % (entry['id'], num),
entry['title'] = '%s part %d' % (entry['title'], num) entry['title'] = '%s part %d' % (entry['title'], num)
entry['formats'] = formats entry['formats'] = formats
entries.append(entry) entries.append(entry)
return entries return self.playlist_result(entries, info['id'], info['title'])
def _extract_info(self, info): def _extract_info(self, info):
return { return {