heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yt_data_extract: Simplify extract_items so it needs only 1 while loop

Browse Source
This commit is contained in:
James Taylor 2019-12-26 18:38:18 -08:00
parent f7a5f7fbaa
commit c7edea0848
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
youtube/yt_data_extract/common.py
View File

@ -378,43 +378,42 @@ def extract_items(response, item_types=item_types):
renderer = get(response, 'contents', {}, types=dict) renderer = get(response, 'contents', {}, types=dict)
while True: while True:
# mode 1: dig into the current renderer # mode 1: get a new renderer by iterating.
# Will stay in mode 1 (via continue) if a new renderer is found inside this one # goes down the stack for an iterator if one has been exhausted
# Otherwise, after finding that it is an item renderer, if not renderer:
# contains a list, or contains nothing, try:
# falls through into mode 2 to get a new renderer renderer = current_iter.__next__()
if len(renderer) != 0: except StopIteration:
key, value = list(renderer.items())[0] try:
current_iter = iter_stack.pop()
except IndexError:
return items, ctoken
# Get new renderer or check that the one we got is good before
# proceeding to mode 2
continue
# has a list in it, add it to the iter stack
if key in nested_renderer_list_dispatch: # mode 2: dig into the current renderer
renderer_list, continuation = nested_renderer_list_dispatch[key](value) key, value = list(renderer.items())[0]
if renderer_list:
iter_stack.append(current_iter) # has a list in it, add it to the iter stack
current_iter = iter(renderer_list) if key in nested_renderer_list_dispatch:
renderer_list, continuation = nested_renderer_list_dispatch[key](value)
if renderer_list:
iter_stack.append(current_iter)
current_iter = iter(renderer_list)
if continuation: if continuation:
ctoken = continuation ctoken = continuation
# new renderer nested inside this one # new renderer nested inside this one
elif key in nested_renderer_dispatch: elif key in nested_renderer_dispatch:
renderer = nested_renderer_dispatch[key](value) renderer = nested_renderer_dispatch[key](value)
continue # back to mode 1 continue # don't reset renderer to None
# the renderer is an item # the renderer is an item
elif key in item_types: elif key in item_types:
items.append(renderer) items.append(renderer)
renderer = None
# mode 2: get a new renderer by iterating.
# goes up the stack for an iterator if one has been exhausted
while current_iter is not None:
try:
renderer = current_iter.__next__()
break
except StopIteration:
try:
current_iter = iter_stack.pop() # go back up the stack
except IndexError:
return items, ctoken
else: else:
return [], None return [], None