Upstream/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-11-04 08:39:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Typos and tiny styling changes

Browse Source
This commit is contained in:
syeopite 2021-08-04 19:54:41 -07:00
parent ca9eb0d539
commit e5f07dedbf
No known key found for this signature in database
GPG Key ID: 6FA616E5A5294A82
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,9 +35,7 @@ private module Parsers
title = extract_text(item_contents["title"]) || "" title = extract_text(item_contents["title"]) || ""
# Extract author information # Extract author information
author_info = item_contents["ownerText"]?.try &.["runs"]?.try &.as_a?.try &.[0]? if author_info = item_contents.dig?("ownerText", "runs", 0)
if author_info = item_contents.dig?("ownerText", "runs")
author_info = author_info[0]
author = author_info["text"].as_s author = author_info["text"].as_s
author_id = HelperExtractors.get_browse_endpoint(author_info) author_id = HelperExtractors.get_browse_endpoint(author_info)
else else
@ -49,7 +47,7 @@ private module Parsers
# Instead, in its place is the amount of people currently watching. This behavior should be replicated # Instead, in its place is the amount of people currently watching. This behavior should be replicated
# on Invidious once all features of livestreams are supported. On an unrelated note, defaulting to the current # on Invidious once all features of livestreams are supported. On an unrelated note, defaulting to the current
# time for publishing isn't a good idea. # time for publishing isn't a good idea.
published = item_contents["publishedTimeText"]?.try &.["simpleText"].try { |t| decode_date(t.as_s) } || Time.local published = item_contents.dig?("publishedTimeText", "simpleText").try { |t| decode_date(t.as_s) } || Time.local
# Typically views are stored under a "simpleText" in the "viewCountText". However, for # Typically views are stored under a "simpleText" in the "viewCountText". However, for
# livestreams and premiered it is stored under a "runs" array: [{"text":123}, {"text": "watching"}] # livestreams and premiered it is stored under a "runs" array: [{"text":123}, {"text": "watching"}]
@ -119,8 +117,10 @@ private module Parsers
author_thumbnail = HelperExtractors.get_thumbnails(item_contents) author_thumbnail = HelperExtractors.get_thumbnails(item_contents)
# When public subscriber count is disabled, the subscriberCountText isn't sent by InnerTube. # When public subscriber count is disabled, the subscriberCountText isn't sent by InnerTube.
# Always simpleText
# TODO change default value to nil # TODO change default value to nil
subscriber_count = item_contents.dig?("subscriberCountText").try &.["simpleText"].try { |s| short_text_to_number(s.as_s.split(" ")[0]) } || 0 subscriber_count = item_contents.dig?("subscriberCountText").try &.["simpleText"].try { \
|s| short_text_to_number(s.as_s.split(" ")[0]) } || 0
auto_generated = !item_contents["videoCountText"]? ? true : false auto_generated = !item_contents["videoCountText"]? ? true : false
@ -420,10 +420,9 @@ def extract_item(item : JSON::Any, author_fallback : String? = nil,
return result return result
end end
end end
# TODO radioRenderer, showRenderer, shelfRenderer, horizontalCardListRenderer, searchPyvRenderer
end end
# Parses multiple items from Youtube's initial JSON response into a more usable structure. # Parses multiple items from YouTube's initial JSON response into a more usable structure.
# The end result is an array of SearchItem. # The end result is an array of SearchItem.
def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : String? = nil, def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : String? = nil,
author_id_fallback : String? = nil) : Array(SearchItem) author_id_fallback : String? = nil) : Array(SearchItem)
@ -436,7 +435,7 @@ def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : Stri
unpackaged_data = initial_data unpackaged_data = initial_data
end end
# This is identicial to the parser cyling of extract_item(). # This is identical to the parser cyling of extract_item().
ITEM_CONTAINER_EXTRACTOR.each do |extractor| ITEM_CONTAINER_EXTRACTOR.each do |extractor|
results = extractor.process(unpackaged_data) results = extractor.process(unpackaged_data)
if !results.nil? if !results.nil?