PrivateCoffee/invidious
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2656 from SamantazFox/fix-2549

Browse source 
extract_video_info: Make sure that the Android player response is valid
This commit is contained in:
Samantaz Fox 2021-11-28 02:38:29 +01:00 committed by GitHub
commit 82f3eda82b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/invidious/videos.cr
View file

@ -857,8 +857,16 @@ def extract_video_info(video_id : String, proxy_region : String? = nil, context_
else else
client_config.client_type = YoutubeAPI::ClientType::Android client_config.client_type = YoutubeAPI::ClientType::Android
end end
stream_data = YoutubeAPI.player(video_id: video_id, params: "", client_config: client_config) android_player = YoutubeAPI.player(video_id: video_id, params: "", client_config: client_config)
params["streamingData"] = stream_data["streamingData"]? || JSON::Any.new("")
# Sometime, the video is available from the web client, but not on Android, so check
# that here, and fallback to the streaming data from the web client if needed.
# See: https://github.com/iv-org/invidious/issues/2549
if android_player["playabilityStatus"]["status"] == "OK"
params["streamingData"] = android_player["streamingData"]? || JSON::Any.new("")
else
params["streamingData"] = player_response["streamingData"]? || JSON::Any.new("")
end
end end
{"captions", "microformat", "playabilityStatus", "storyboards", "videoDetails"}.each do |f| {"captions", "microformat", "playabilityStatus", "storyboards", "videoDetails"}.each do |f|