lug/invidious
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize routing logic of extract_item(s) funcs

Browse Source
This commit is contained in:
syeopite 2021-09-28 08:50:23 -07:00
parent aa59925374
commit 9ab242ca2e
No known key found for this signature in database
GPG Key ID: 6FA616E5A5294A82
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/invidious/helpers/extractors.cr
View File

@ -352,7 +352,7 @@ private module Extractors
content = extract_selected_tab(target["tabs"])["content"] content = extract_selected_tab(target["tabs"])["content"]
content["sectionListRenderer"]["contents"].as_a.each do |renderer_container| content["sectionListRenderer"]["contents"].as_a.each do |renderer_container|
renderer_container_contents = renderer_container["itemSectionRenderer"]["contents"].as_a[0] renderer_container_contents = renderer_container["itemSectionRenderer"]["contents"][0]
# Category extraction # Category extraction
if items_container = renderer_container_contents["shelfRenderer"]? if items_container = renderer_container_contents["shelfRenderer"]?
@ -527,8 +527,7 @@ def extract_item(item : JSON::Any, author_fallback : String? = "",
# Each parser automatically validates the data given to see if the data is # Each parser automatically validates the data given to see if the data is
# applicable to itself. If not nil is returned and the next parser is attemped. # applicable to itself. If not nil is returned and the next parser is attemped.
ITEM_PARSERS.each do |parser| ITEM_PARSERS.each do |parser|
result = parser.process(item, author_fallback) if result = parser.process(item, author_fallback)
if !result.nil?
return result return result
end end
end end
@ -542,22 +541,21 @@ def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : Stri
if unpackaged_data = initial_data["contents"]?.try &.as_h if unpackaged_data = initial_data["contents"]?.try &.as_h
elsif unpackaged_data = initial_data["response"]?.try &.as_h elsif unpackaged_data = initial_data["response"]?.try &.as_h
elsif unpackaged_data = initial_data["onResponseReceivedActions"]?.try &.as_a.[0].as_h elsif unpackaged_data = initial_data.dig?("onResponseReceivedActions", 0).try &.as_h
else else
unpackaged_data = initial_data unpackaged_data = initial_data
end end
# This is identical to the parser cyling of extract_item(). # This is identical to the parser cycling of extract_item().
ITEM_CONTAINER_EXTRACTOR.each do |extractor| ITEM_CONTAINER_EXTRACTOR.each do |extractor|
results = extractor.process(unpackaged_data) if container = extractor.process(unpackaged_data)
if !results.nil? # Extract items in container
results.each do |item| container.each do |item|
parsed_result = extract_item(item, author_fallback, author_id_fallback) if parsed_result = extract_item(item, author_fallback, author_id_fallback)
if !parsed_result.nil?
items << parsed_result items << parsed_result
end end
end end
return items return items
end end
end end