Mirrored_Repos/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-11-22 05:27:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor duplicate logic in image routes

Browse Source
This commit is contained in:
syeopite 2023-12-08 18:42:40 -08:00
parent 480e073fa9
commit 52bc9aa328
No known key found for this signature in database
GPG Key ID: A73C186DA3955A1A
1 changed files with 21 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/invidious/routes/images.cr
View File

@ -11,29 +11,9 @@ module Invidious::Routes::Images
end end
end end
# We're encapsulating this into a proc in order to easily reuse this
# portion of the code for each request block below.
request_proc = ->(response : HTTP::Client::Response) {
env.response.status_code = response.status_code
response.headers.each do |key, value|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
env.response.headers[key] = value
end
end
env.response.headers["Access-Control-Allow-Origin"] = "*"
if response.status_code >= 300
env.response.headers.delete("Transfer-Encoding")
return
end
proxy_file(response, env)
}
begin begin
GGPHT_POOL.client &.get(url) do |resp| GGPHT_POOL.client &.get(url) do |resp|
return request_proc.call(resp) return self.proxy_image(env, resp)
end end
rescue ex rescue ex
end end
@ -61,27 +41,9 @@ module Invidious::Routes::Images
end end
end end
request_proc = ->(response : HTTP::Client::Response) {
env.response.status_code = response.status_code
response.headers.each do |key, value|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
env.response.headers[key] = value
end
end
env.response.headers["Connection"] = "close"
env.response.headers["Access-Control-Allow-Origin"] = "*"
if response.status_code >= 300
return env.response.headers.delete("Transfer-Encoding")
end
proxy_file(response, env)
}
begin begin
get_ytimg_pool(authority).client &.get(url) do |resp| get_ytimg_pool(authority).client &.get(url) do |resp|
return request_proc.call(resp) return self.proxy_image(env, resp)
end end
rescue ex rescue ex
end end
@ -101,26 +63,9 @@ module Invidious::Routes::Images
end end
end end
request_proc = ->(response : HTTP::Client::Response) {
env.response.status_code = response.status_code
response.headers.each do |key, value|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
env.response.headers[key] = value
end
end
env.response.headers["Access-Control-Allow-Origin"] = "*"
if response.status_code >= 300 && response.status_code != 404
return env.response.headers.delete("Transfer-Encoding")
end
proxy_file(response, env)
}
begin begin
get_ytimg_pool("i9").client &.get(url) do |resp| get_ytimg_pool("i9").client &.get(url) do |resp|
return request_proc.call(resp) return self.proxy_image(env, resp)
end end
rescue ex rescue ex
end end
@ -180,7 +125,15 @@ module Invidious::Routes::Images
end end
end end
request_proc = ->(response : HTTP::Client::Response) { begin
get_ytimg_pool("i").client &.get(url) do |resp|
return self.proxy_image(env, resp)
end
rescue ex
end
end
private def self.proxy_image(env, response)
env.response.status_code = response.status_code env.response.status_code = response.status_code
response.headers.each do |key, value| response.headers.each do |key, value|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase) if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
@ -190,18 +143,10 @@ module Invidious::Routes::Images
env.response.headers["Access-Control-Allow-Origin"] = "*" env.response.headers["Access-Control-Allow-Origin"] = "*"
if response.status_code >= 300 && response.status_code != 404 if response.status_code >= 300
return env.response.headers.delete("Transfer-Encoding") return env.response.headers.delete("Transfer-Encoding")
end end
proxy_file(response, env) return proxy_file(response, env)
}
begin
get_ytimg_pool("i").client &.get(url) do |resp|
return request_proc.call(resp)
end
rescue ex
end
end end
end end