From 692df7d8ead6d4cd7e918247de4c520dfae8857a Mon Sep 17 00:00:00 2001 From: syeopite Date: Thu, 14 Nov 2024 19:52:48 -0800 Subject: [PATCH] Simplify namespace calls to ConnectionPool --- src/invidious/connection/pool.cr | 4 ++-- src/invidious/routes/images.cr | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/invidious/connection/pool.cr b/src/invidious/connection/pool.cr index e9b0ca18..02935253 100644 --- a/src/invidious/connection/pool.cr +++ b/src/invidious/connection/pool.cr @@ -126,7 +126,7 @@ module Invidious::ConnectionPool # Mapping of subdomain => Invidious::ConnectionPool::Pool # This is needed as we may need to access arbitrary subdomains of ytimg - private YTIMG_POOLS = {} of String => Invidious::ConnectionPool::Pool + private YTIMG_POOLS = {} of String => ConnectionPool::Pool # Fetches a HTTP pool for the specified subdomain of ytimg.com # @@ -136,7 +136,7 @@ module Invidious::ConnectionPool return pool else LOGGER.info("ytimg_pool: Creating a new HTTP pool for \"https://#{subdomain}.ytimg.com\"") - pool = Invidious::ConnectionPool::Pool.new( + pool = ConnectionPool::Pool.new( URI.parse("https://#{subdomain}.ytimg.com"), max_capacity: CONFIG.pool_size, idle_capacity: CONFIG.idle_pool_size, diff --git a/src/invidious/routes/images.cr b/src/invidious/routes/images.cr index e79a7432..7097ab79 100644 --- a/src/invidious/routes/images.cr +++ b/src/invidious/routes/images.cr @@ -42,7 +42,7 @@ module Invidious::Routes::Images end begin - Invidious::ConnectionPool.get_ytimg_pool(authority).get(url, headers) do |resp| + ConnectionPool.get_ytimg_pool(authority).get(url, headers) do |resp| env.response.headers["Connection"] = "close" return self.proxy_image(env, resp) end @@ -65,7 +65,7 @@ module Invidious::Routes::Images end begin - Invidious::ConnectionPool.get_ytimg_pool("i9").get(url, headers) do |resp| + ConnectionPool.get_ytimg_pool("i9").get(url, headers) do |resp| return self.proxy_image(env, resp) end rescue ex @@ -111,7 +111,7 @@ module Invidious::Routes::Images if name == "maxres.jpg" build_thumbnails(id).each do |thumb| thumbnail_resource_path = "/vi/#{id}/#{thumb[:url]}.jpg" - if Invidious::ConnectionPool.get_ytimg_pool("i").head(thumbnail_resource_path, headers).status_code == 200 + if ConnectionPool.get_ytimg_pool("i").head(thumbnail_resource_path, headers).status_code == 200 name = thumb[:url] + ".jpg" break end @@ -127,7 +127,7 @@ module Invidious::Routes::Images end begin - Invidious::ConnectionPool.get_ytimg_pool("i").get(url, headers) do |resp| + ConnectionPool.get_ytimg_pool("i").get(url, headers) do |resp| return self.proxy_image(env, resp) end rescue ex