projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #8739 from remitamine/update_url_params
[youtube-dl]
/
youtube_dl
/
extractor
/
twitch.py
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index d92d2fd4071ce7158ff4d27f58840342e6063ef1..8639293e35a79875c40b3933b5531381c2b3d077 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-17,6
+17,7
@@
from ..utils import (
encode_dict,
ExtractorError,
int_or_none,
encode_dict,
ExtractorError,
int_or_none,
+ orderedSet,
parse_duration,
parse_iso8601,
sanitized_Request,
parse_duration,
parse_iso8601,
sanitized_Request,
@@
-271,7
+272,7
@@
class TwitchVodIE(TwitchItemBaseIE):
class TwitchPlaylistBaseIE(TwitchBaseIE):
_PLAYLIST_URL = '%s/kraken/channels/%%s/videos/?offset=%%d&limit=%%d' % TwitchBaseIE._API_BASE
class TwitchPlaylistBaseIE(TwitchBaseIE):
_PLAYLIST_URL = '%s/kraken/channels/%%s/videos/?offset=%%d&limit=%%d' % TwitchBaseIE._API_BASE
- _PAGE_LIMIT = 10
+ _PAGE_LIMIT = 10
0
def _extract_playlist(self, channel_id):
info = self._download_json(
def _extract_playlist(self, channel_id):
info = self._download_json(
@@
-302,8
+303,7
@@
class TwitchPlaylistBaseIE(TwitchBaseIE):
'Twitch paging is broken on twitch side, requesting all videos at once',
channel_id)
broken_paging_detected = True
'Twitch paging is broken on twitch side, requesting all videos at once',
channel_id)
broken_paging_detected = True
- limit = total
- offset = 0
+ offset = total
counter_override = '(all at once)'
continue
entries.extend(page_entries)
counter_override = '(all at once)'
continue
entries.extend(page_entries)
@@
-311,7
+311,7
@@
class TwitchPlaylistBaseIE(TwitchBaseIE):
break
offset += limit
return self.playlist_result(
break
offset += limit
return self.playlist_result(
- [self.url_result(entry) for entry in
s
et(entries)],
+ [self.url_result(entry) for entry in
orderedS
et(entries)],
channel_id, channel_name)
def _extract_playlist_page(self, response):
channel_id, channel_name)
def _extract_playlist_page(self, response):