ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

Update error messages for video extractor

Browse Source
This commit is contained in:
Omar Roth 2019-11-05 19:39:11 -05:00
parent bcdb8cd770
commit 0e1d6aa85c
No known key found for this signature in database
GPG Key ID: B8254FB7EC3D37F2
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/invidious/videos.cr
View File

@ -1137,8 +1137,11 @@ def extract_player_config(body, html)
error_message = html.xpath_node(%q(//h1[@id="unavailable-message"])) error_message = html.xpath_node(%q(//h1[@id="unavailable-message"]))
if error_message if error_message
params["reason"] = error_message.content.strip params["reason"] = error_message.content.strip
elsif body.includes?("To continue with your YouTube experience, please fill out the form below.") ||
body.includes?("https://www.google.com/sorry/index")
params["reason"] = "Could not extract video info. Instance is likely blocked."
else else
params["reason"] = "Could not extract video info." params["reason"] = "Video unavailable."
end end
end end
@ -1192,19 +1195,13 @@ def fetch_video(id, region)
end end
end end
if !info["player_response"]? || info["errorcode"]?.try &.== "2" if info["reason"]? && !info["player_response"]?
raise "Video unavailable."
end
if info["reason"]? && !info["player_response"]["videoDetails"]?
raise info["reason"] raise info["reason"]
end end
player_json = JSON.parse(info["player_response"]) player_json = JSON.parse(info["player_response"])
if reason = player_json["playabilityStatus"]?.try &.["reason"]?.try &.as_s
reason = player_json["playabilityStatus"]?.try &.["reason"]?.try &.as_s raise reason
if reason == "This video is not available."
raise "This video is not available."
end end
title = player_json["videoDetails"]["title"].as_s title = player_json["videoDetails"]["title"].as_s