hashirama/invidious-mod-JP
1
0
Fork 0
Code Issues Pull requests Actions 2 Projects Releases Wiki Activity

videos: Fix extraction code according to tests

Browse source
This commit is contained in:
Samantaz Fox 2022-08-21 17:28:27 +02:00
parent 33150f5de3
commit e23ceb6ae9
No known key found for this signature in database
GPG key ID: F42821059186176E
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/invidious/videos.cr
View file

@ -666,20 +666,20 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
raise BrokenTubeException.new("twoColumnWatchNextResults") if !main_results raise BrokenTubeException.new("twoColumnWatchNextResults") if !main_results
primary_results = main_results.dig?("results", "results", "contents") # Primary results are not available on Music videos
# See: https://github.com/iv-org/invidious/pull/3238#issuecomment-1207193725
if primary_results = main_results.dig?("results", "results", "contents")
video_primary_renderer = primary_results
.as_a.find(&.["videoPrimaryInfoRenderer"]?)
.try &.["videoPrimaryInfoRenderer"]
raise BrokenTubeException.new("results") if !primary_results video_secondary_renderer = primary_results
.as_a.find(&.["videoSecondaryInfoRenderer"]?)
.try &.["videoSecondaryInfoRenderer"]
video_primary_renderer = primary_results raise BrokenTubeException.new("videoPrimaryInfoRenderer") if !video_primary_renderer
.as_a.find(&.["videoPrimaryInfoRenderer"]?) raise BrokenTubeException.new("videoSecondaryInfoRenderer") if !video_secondary_renderer
.try &.["videoPrimaryInfoRenderer"] end
video_secondary_renderer = primary_results
.as_a.find(&.["videoSecondaryInfoRenderer"]?)
.try &.["videoSecondaryInfoRenderer"]
raise BrokenTubeException.new("videoPrimaryInfoRenderer") if !video_primary_renderer
raise BrokenTubeException.new("videoSecondaryInfoRenderer") if !video_secondary_renderer
video_details = player_response.dig?("videoDetails") video_details = player_response.dig?("videoDetails")
microformat = player_response.dig?("microformat", "playerMicroformatRenderer") microformat = player_response.dig?("microformat", "playerMicroformatRenderer")
@ -691,9 +691,12 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
title = video_details["title"]?.try &.as_s title = video_details["title"]?.try &.as_s
# We have to try to extract viewCount from videoPrimaryInfoRenderer first,
# then from videoDetails, as the latter is "0" for livestreams (we want
# to get the amount of viewers watching).
views = video_primary_renderer views = video_primary_renderer
.dig?("viewCount", "videoViewCountRenderer", "viewCount", "runs", 0, "text") .try &.dig?("viewCount", "videoViewCountRenderer", "viewCount", "runs", 0, "text")
.try &.as_s.to_i64 .try &.as_s.to_i64
views ||= video_details["viewCount"]?.try &.as_s.to_i64 views ||= video_details["viewCount"]?.try &.as_s.to_i64
length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"]) length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"])
@ -825,7 +828,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
if live_now if live_now
video_type = VideoType::Livestream video_type = VideoType::Livestream
elsif premiere_timestamp.not_nil! elsif !premiere_timestamp.nil?
video_type = VideoType::Scheduled video_type = VideoType::Scheduled
published = premiere_timestamp || Time.utc published = premiere_timestamp || Time.utc
else else
@ -861,7 +864,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
"author" => JSON::Any.new(author || ""), "author" => JSON::Any.new(author || ""),
"ucid" => JSON::Any.new(ucid || ""), "ucid" => JSON::Any.new(ucid || ""),
"authorThumbnail" => JSON::Any.new(author_thumbnail.try &.as_s || ""), "authorThumbnail" => JSON::Any.new(author_thumbnail.try &.as_s || ""),
"authorVerified" => JSON::Any.new(author_verified), "authorVerified" => JSON::Any.new(author_verified || false),
"subCountText" => JSON::Any.new(subs_text || "-"), "subCountText" => JSON::Any.new(subs_text || "-"),
} }