Mirrored_Repos/twitch-dl
1
0
Fork 0
mirror of https://github.com/ihabunek/twitch-dl synced 2024-08-30 18:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve paging

Browse Source
This commit is contained in:
Ivan Habunek 2020-05-17 14:41:11 +02:00
parent d22fd74357
commit cabc8ff327
No known key found for this signature in database
GPG Key ID: CDBD63C43A30BB95
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
twitchdl/twitch.py
View File

@ -102,31 +102,40 @@ def get_channel_videos(channel_id, limit, sort, type="archive", game_ids=[], aft
query = """ query = """
{{ {{
user(login: "{channel_id}") {{ user(login: "{channel_id}") {{
videos(options: {{ videos(
gameIDs: {game_ids} first: {limit},
}}, first: {limit}, type: {type}, sort: {sort}, after: "{after}") {{ type: {type},
totalCount sort: {sort},
edges {{ after: "{after}",
cursor options: {{
node {{ gameIDs: {game_ids}
id }}
title ) {{
publishedAt totalCount
broadcastType pageInfo {{
lengthSeconds hasNextPage
game {{ }}
name edges {{
}} cursor
creator {{ node {{
channel {{ id
displayName title
publishedAt
broadcastType
lengthSeconds
game {{
name
}}
creator {{
channel {{
displayName
}}
}}
}}
}} }}
}}
}} }}
}}
}} }}
}}
}} }}
""" """
@ -152,9 +161,10 @@ def channel_videos_generator(channel_id, limit, sort, type, game_ids=None):
if not videos["edges"]: if not videos["edges"]:
break break
cursor = videos["edges"][-1]["cursor"] has_next = videos["pageInfo"]["hasNextPage"]
cursor = videos["edges"][-1]["cursor"] if has_next else None
yield videos, cursor is not None yield videos, has_next
if not cursor: if not cursor:
break break