lug/invidious
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add '/videoplayback' redirect

Browse Source
This commit is contained in:
Omar Roth 2018-08-07 11:39:56 -05:00
parent a5fb1d38e0
commit 373c5378b2
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/invidious.cr
View File

@ -223,6 +223,7 @@ get "/watch" do |env|
fmt_stream = video.fmt_stream(decrypt_function) fmt_stream = video.fmt_stream(decrypt_function)
adaptive_fmts = video.adaptive_fmts(decrypt_function) adaptive_fmts = video.adaptive_fmts(decrypt_function)
video_streams = video.video_streams(adaptive_fmts)
audio_streams = video.audio_streams(adaptive_fmts) audio_streams = video.audio_streams(adaptive_fmts)
captions = video.captions captions = video.captions
@ -334,6 +335,7 @@ get "/embed/:id" do |env|
fmt_stream = video.fmt_stream(decrypt_function) fmt_stream = video.fmt_stream(decrypt_function)
adaptive_fmts = video.adaptive_fmts(decrypt_function) adaptive_fmts = video.adaptive_fmts(decrypt_function)
video_streams = video.video_streams(adaptive_fmts)
audio_streams = video.audio_streams(adaptive_fmts) audio_streams = video.audio_streams(adaptive_fmts)
captions = video.captions captions = video.captions
@ -2553,8 +2555,8 @@ get "/api/manifest/dash/id/:id" do |env|
end end
end end
video_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("video/mp4") ? s : nil } video_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("video") ? s : nil }
audio_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("audio/mp4") ? s : nil } audio_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("audio") ? s : nil }
audio_streams.sort_by! { |s| s["bitrate"].to_i }.reverse! audio_streams.sort_by! { |s| s["bitrate"].to_i }.reverse!
audio_streams.each do |fmt| audio_streams.each do |fmt|
@ -2658,15 +2660,21 @@ get "/api/manifest/hls_playlist/*" do |env|
manifest manifest
end end
options "/videoplayback/:wild/*" do |env| options "/videoplayback*" do |env|
env.response.headers["Access-Control-Allow-Origin"] = "*" env.response.headers["Access-Control-Allow-Origin"] = "*"
env.response.headers["Access-Control-Allow-Methods"] = "GET" env.response.headers["Access-Control-Allow-Methods"] = "GET"
env.response.headers["Access-Control-Allow-Headers"] = "Content-Type, range" env.response.headers["Access-Control-Allow-Headers"] = "Content-Type, range"
end end
get "/videoplayback/:wild/*" do |env| options "/videoplayback/*" do |env|
env.response.headers["Access-Control-Allow-Origin"] = "*"
env.response.headers["Access-Control-Allow-Methods"] = "GET"
env.response.headers["Access-Control-Allow-Headers"] = "Content-Type, range"
end
get "/videoplayback/*" do |env|
path = env.request.path path = env.request.path
if path != "/videoplayback"
path = path.lchop("/videoplayback/") path = path.lchop("/videoplayback/")
path = path.rchop("/") path = path.rchop("/")
@ -2690,9 +2698,12 @@ get "/videoplayback/:wild/*" do |env|
end end
query_params = HTTP::Params.new(raw_params) query_params = HTTP::Params.new(raw_params)
else
env.redirect "/videoplayback?#{query_params}"
end
get "/videoplayback" do |env|
query_params = env.params.query query_params = env.params.query
end
fvip = query_params["fvip"] fvip = query_params["fvip"]
mn = query_params["mn"].split(",")[0] mn = query_params["mn"].split(",")[0]

2
src/invidious/helpers/helpers.cr
View File

@ -17,7 +17,7 @@ class Config
end end
class FilteredCompressHandler < Kemal::Handler class FilteredCompressHandler < Kemal::Handler
exclude ["/videoplayback/:wild/*", "/api/*"] exclude ["/videoplayback/*", "/api/*"]
def call(env) def call(env)
return call_next env if exclude_match? env return call_next env if exclude_match? env

6
src/invidious/videos.cr
View File

@ -152,6 +152,12 @@ class Video
return adaptive_fmts return adaptive_fmts
end end
def video_streams(adaptive_fmts)
video_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("video") ? s : nil }
return video_streams
end
def audio_streams(adaptive_fmts) def audio_streams(adaptive_fmts)
audio_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("audio") ? s : nil } audio_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("audio") ? s : nil }
audio_streams.sort_by! { |s| s["bitrate"].to_i }.reverse! audio_streams.sort_by! { |s| s["bitrate"].to_i }.reverse!