Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-10-01 01:25:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved code around and fixed a problem

Browse Source
This commit is contained in:
RadoslavL 2023-11-24 11:24:56 +02:00
parent 03f9962a47
commit 6861148290
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/invidious/jsonify/api_v1/video_json.cr
View File

@ -246,7 +246,7 @@ module Invidious::JSONify::APIv1
json.field "viewCountText", rv["short_view_count"]? json.field "viewCountText", rv["short_view_count"]?
json.field "viewCount", rv["view_count"]?.try &.empty? ? nil : rv["view_count"].to_i64 json.field "viewCount", rv["view_count"]?.try &.empty? ? nil : rv["view_count"].to_i64
json.field "published", rv["published"]? json.field "published", rv["published"]?
json.field "publishedTimeText", translate(locale, "`x` ago", rv["publishedText"].to_s) json.field "publishedTimeText", translate(locale, "`x` ago", rv["publishedText"].to_s.gsub(" ago", ""))
end end
end end
end end

21
src/invidious/videos/parser.cr
View File

@ -6,7 +6,7 @@ require "json"
# #
# TODO: "compactRadioRenderer" (Mix) and # TODO: "compactRadioRenderer" (Mix) and
# TODO: Use a proper struct/class instead of a hacky JSON object # TODO: Use a proper struct/class instead of a hacky JSON object
def parse_related_video(related : JSON::Any, published : String? = nil) : Hash(String, JSON::Any)? def parse_related_video(related : JSON::Any) : Hash(String, JSON::Any)?
return nil if !related["videoId"]? return nil if !related["videoId"]?
# The compact renderer has video length in seconds, where the end # The compact renderer has video length in seconds, where the end
@ -36,11 +36,12 @@ def parse_related_video(related : JSON::Any, published : String? = nil) : Hash(S
LOGGER.trace("parse_related_video: Found \"watchNextEndScreenRenderer\" container") LOGGER.trace("parse_related_video: Found \"watchNextEndScreenRenderer\" container")
publishedText = related["publishedTimeText"]? if published_time_text = related["publishedTimeText"]?
if !publishedText.nil? decoded_time = decode_date(published_time_text["simpleText"].to_s)
publishedSimpleText = publishedText["simpleText"].to_s published = decoded_time.to_unix.to_s
published_time_text = published_time_text["simpleText"].to_s
else else
publishedSimpleText = nil published = nil
end end
# TODO: when refactoring video types, make a struct for related videos # TODO: when refactoring video types, make a struct for related videos
@ -55,7 +56,7 @@ def parse_related_video(related : JSON::Any, published : String? = nil) : Hash(S
"short_view_count" => JSON::Any.new(short_view_count || "0"), "short_view_count" => JSON::Any.new(short_view_count || "0"),
"author_verified" => JSON::Any.new(author_verified), "author_verified" => JSON::Any.new(author_verified),
"published" => JSON::Any.new(published || ""), "published" => JSON::Any.new(published || ""),
"publishedText" => JSON::Any.new(publishedSimpleText || ""), "publishedText" => JSON::Any.new(published_time_text || ""),
} }
end end
@ -244,13 +245,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
.dig?("secondaryResults", "secondaryResults", "results") .dig?("secondaryResults", "secondaryResults", "results")
secondary_results.try &.as_a.each do |element| secondary_results.try &.as_a.each do |element|
if item = element["compactVideoRenderer"]? if item = element["compactVideoRenderer"]?
if rv_published_time_text = item["publishedTimeText"]? related_video = parse_related_video(item)
rv_decoded_time = decode_date(rv_published_time_text["simpleText"].to_s)
rv_published_timestamp = rv_decoded_time.to_unix.to_s
else
rv_published_timestamp = nil
end
related_video = parse_related_video(item, published: rv_published_timestamp)
related << JSON::Any.new(related_video) if related_video related << JSON::Any.new(related_video) if related_video
end end
end end