iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1525 from saltycrys/fix-video-descriptions 

Fix `extract_polymer_config`
This commit is contained in:
TheFrenchGhosty 2020-12-03 23:31:39 +00:00 committed by GitHub
parent 501db8f276 7823c07f1a
commit 76cad41382
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/invidious/videos.cr
View File

@ -816,7 +816,7 @@ end
def extract_polymer_config(body) def extract_polymer_config(body)
params = {} of String => JSON::Any params = {} of String => JSON::Any
player_response = body.match(/window\["ytInitialPlayerResponse"\]\s*=\s*(?<info>.*?);\n/) player_response = body.match(/(window\["ytInitialPlayerResponse"\]|var\sytInitialPlayerResponse)\s*=\s*(?<info>{.*?});/m)
.try { |r| JSON.parse(r["info"]).as_h } .try { |r| JSON.parse(r["info"]).as_h }
if body.includes?("To continue with your YouTube experience, please fill out the form below.") || if body.includes?("To continue with your YouTube experience, please fill out the form below.") ||
@ -914,11 +914,15 @@ def extract_polymer_config(body)
.try { |r| JSON.parse(r["info"]) }.try &.["args"]["player_response"]? .try { |r| JSON.parse(r["info"]) }.try &.["args"]["player_response"]?
.try &.as_s?.try &.try { |r| JSON.parse(r).as_h } .try &.as_s?.try &.try { |r| JSON.parse(r).as_h }
return params if !initial_data if initial_data
{"playabilityStatus", "streamingData"}.each do |f| {"playabilityStatus", "streamingData"}.each do |f|
params[f] = initial_data[f] if initial_data[f]? params[f] = initial_data[f] if initial_data[f]?
end end
else
{"playabilityStatus", "streamingData"}.each do |f|
params[f] = player_response[f] if player_response[f]?
end
end
params params
end end