Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raise error if video not playable, also handle missing related videos #2892

Merged
merged 1 commit into from
Feb 13, 2022
Merged

Raise error if video not playable, also handle missing related videos #2892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/invidious/videos.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,11 +881,13 @@ def extract_video_info(video_id : String, proxy_region : String? = nil, context_

player_response = YoutubeAPI.player(video_id: video_id, params: "", client_config: client_config)

if player_response["playabilityStatus"]?.try &.["status"]?.try &.as_s != "OK"
reason = player_response["playabilityStatus"]["errorScreen"]?.try &.["playerErrorMessageRenderer"]?.try &.["subreason"]?.try { |s|
s["simpleText"]?.try &.as_s || s["runs"].as_a.map { |r| r["text"] }.join("")
} || player_response["playabilityStatus"]["reason"].as_s
if player_response.dig?("playabilityStatus", "status").try &.as_s != "OK"
subreason = player_response.dig?("playabilityStatus", "errorScreen", "playerErrorMessageRenderer", "subreason")
reason = subreason.try &.[]?("simpleText").try &.as_s
reason ||= subreason.try &.[]("runs").as_a.map(&.[]("text")).join("")
reason ||= player_response.dig("playabilityStatus", "reason").as_s
params["reason"] = JSON::Any.new(reason)
return params
end

params["shortDescription"] = player_response.dig?("videoDetails", "shortDescription") || JSON::Any.new(nil)
Expand Down Expand Up @@ -928,11 +930,8 @@ def extract_video_info(video_id : String, proxy_region : String? = nil, context_
raise BrokenTubeException.new("twoColumnWatchNextResults") if !main_results

primary_results = main_results.dig?("results", "results", "contents")
secondary_results = main_results
.dig?("secondaryResults", "secondaryResults", "results")

raise BrokenTubeException.new("results") if !primary_results
raise BrokenTubeException.new("secondaryResults") if !secondary_results

video_primary_renderer = primary_results
.as_a.find(&.["videoPrimaryInfoRenderer"]?)
Expand All @@ -952,7 +951,9 @@ def extract_video_info(video_id : String, proxy_region : String? = nil, context_
related = [] of JSON::Any

# Parse "compactVideoRenderer" items (under secondary results)
secondary_results.as_a.each do |element|
secondary_results = main_results
.dig?("secondaryResults", "secondaryResults", "results")
Comment on lines +954 to +955
Copy link
Member

@SamantazFox SamantazFox Feb 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just not sure why you moved this block ^^ (yeah, that's nitpicking)

secondary_results.try &.as_a.each do |element|
if item = element["compactVideoRenderer"]?
related_video = parse_related_video(item)
related << JSON::Any.new(related_video) if related_video
Expand Down Expand Up @@ -1119,7 +1120,9 @@ def fetch_video(id, region)
info = embed_info if !embed_info["reason"]?
end

raise InfoException.new(info["reason"]?.try &.as_s || "") if !info["videoDetails"]?
if reason = info["reason"]?
raise InfoException.new(reason.as_s || "")
end

video = Video.new({
id: id,
Expand Down