iv-org/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-10-01 01:35:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes

Browse Source
This commit is contained in:
Omar Roth 2018-01-20 18:21:47 -06:00
commit daba77d665
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/invidious.cr
View File

@ -121,7 +121,6 @@ get "/watch" do |env|
next templated "error" next templated "error"
end end
player_response = JSON.parse(video.info["player_response"])
fmt_stream = [] of HTTP::Params fmt_stream = [] of HTTP::Params
video.info["url_encoded_fmt_stream_map"].split(",") do |string| video.info["url_encoded_fmt_stream_map"].split(",") do |string|
@ -131,9 +130,20 @@ get "/watch" do |env|
fmt_stream.reverse! # We want lowest quality first fmt_stream.reverse! # We want lowest quality first
adaptive_fmts = [] of HTTP::Params adaptive_fmts = [] of HTTP::Params
if video.info.has_key?("adaptive_fmts")
video.info["adaptive_fmts"].split(",") do |string| video.info["adaptive_fmts"].split(",") do |string|
adaptive_fmts << HTTP::Params.parse(string) adaptive_fmts << HTTP::Params.parse(string)
end end
end
rvs = [] of Hash(String, String)
if video.info.has_key?("rvs")
video.info["rvs"].split(",").each do |rv|
rvs << HTTP::Params.parse(rv).to_h
end
end
player_response = JSON.parse(video.info["player_response"])
likes = video.html.xpath_node(%q(//button[@title="I like this"]/span)) likes = video.html.xpath_node(%q(//button[@title="I like this"]/span))
likes = likes ? likes.content.delete(",").to_i : 1 likes = likes ? likes.content.delete(",").to_i : 1
@ -150,11 +160,6 @@ get "/watch" do |env|
engagement = ((dislikes.to_f + likes.to_f)/views * 100) engagement = ((dislikes.to_f + likes.to_f)/views * 100)
calculated_rating = (likes.to_f/(likes.to_f + dislikes.to_f) * 4 + 1) calculated_rating = (likes.to_f/(likes.to_f + dislikes.to_f) * 4 + 1)
rvs = [] of Hash(String, String)
video.info["rvs"].split(",").each do |rv|
rvs << HTTP::Params.parse(rv).to_h
end
templated "watch" templated "watch"
end end