Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-02-18 10:07:55 +01:00
Code Issues Releases Wiki Activity

do nothing

Browse Source 
i tried to do two different pull requests on my master branch, whoops
This commit is contained in:
geauxlo 2020-06-10 06:47:32 +00:00 committed by GitHub
parent 33afd662d9
commit ad6b8f8e58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/twitch.py
View File

@ -380,13 +380,11 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
_PLAYLIST_PATH = 'kraken/channels/%s/videos/?offset=%d&limit=%d' _PLAYLIST_PATH = 'kraken/channels/%s/videos/?offset=%d&limit=%d'
_PAGE_LIMIT = 100 _PAGE_LIMIT = 100
def _extract_playlist(self, channel_name): def _extract_playlist(self, channel_id):
info = self._call_api( info = self._call_api(
'kraken/users?login=%s' % channel_name, 'kraken/channels/%s' % channel_id,
channel_name, 'Downloading channel info JSON') channel_id, 'Downloading channel info JSON')
info = info['users'][0] channel_name = info.get('display_name') or info.get('name')
channel_id = info['_id']
channel_name = info.get('display_name') or info.get('name') or channel_name
entries = [] entries = []
offset = 0 offset = 0
limit = self._PAGE_LIMIT limit = self._PAGE_LIMIT
@ -446,7 +444,7 @@ class TwitchProfileIE(TwitchPlaylistBaseIE):
_TESTS = [{ _TESTS = [{
'url': 'http://www.twitch.tv/vanillatv/profile', 'url': 'http://www.twitch.tv/vanillatv/profile',
'info_dict': { 'info_dict': {
'id': '22744919', 'id': 'vanillatv',
'title': 'VanillaTV', 'title': 'VanillaTV',
}, },
'playlist_mincount': 412, 'playlist_mincount': 412,
@ -470,7 +468,7 @@ class TwitchAllVideosIE(TwitchVideosBaseIE):
_TESTS = [{ _TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/all', 'url': 'https://www.twitch.tv/spamfish/videos/all',
'info_dict': { 'info_dict': {
'id': '497952', 'id': 'spamfish',
'title': 'Spamfish', 'title': 'Spamfish',
}, },
'playlist_mincount': 869, 'playlist_mincount': 869,
@ -489,7 +487,7 @@ class TwitchUploadsIE(TwitchVideosBaseIE):
_TESTS = [{ _TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/uploads', 'url': 'https://www.twitch.tv/spamfish/videos/uploads',
'info_dict': { 'info_dict': {
'id': '497952', 'id': 'spamfish',
'title': 'Spamfish', 'title': 'Spamfish',
}, },
'playlist_mincount': 0, 'playlist_mincount': 0,
@ -508,7 +506,7 @@ class TwitchPastBroadcastsIE(TwitchVideosBaseIE):
_TESTS = [{ _TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/past-broadcasts', 'url': 'https://www.twitch.tv/spamfish/videos/past-broadcasts',
'info_dict': { 'info_dict': {
'id': '497952', 'id': 'spamfish',
'title': 'Spamfish', 'title': 'Spamfish',
}, },
'playlist_mincount': 0, 'playlist_mincount': 0,
@ -527,7 +525,7 @@ class TwitchHighlightsIE(TwitchVideosBaseIE):
_TESTS = [{ _TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/highlights', 'url': 'https://www.twitch.tv/spamfish/videos/highlights',
'info_dict': { 'info_dict': {
'id': '497952', 'id': 'spamfish',
'title': 'Spamfish', 'title': 'Spamfish',
}, },
'playlist_mincount': 805, 'playlist_mincount': 805,