Invidious is an alternative front-end to YouTube
Improve cache size check to be more performant
syeopite21049518d603
diff --git a/spec/http_server/handlers/static_assets_handler_spec.cr b/spec/http_server/handlers/static_assets_handler_spec.crindex 4b50171a..76dc7be7 100644--- a/spec/http_server/handlers/static_assets_handler_spec.cr+++ b/spec/http_server/handlers/static_assets_handler_spec.cr@@ -198,5 +198,36 @@ Spectator.describe StaticAssetsHandler doendend+ it "Will not cache additional files if the cache limit is reached" do+ 5.times do |times|+ data = "a" * 1_000_000++ make_temporary_file("test cache size limit #{times}") do |temporary_file, file_link|+ cycle_temporary_file_contents(temporary_file, data) do+ response = handle HTTP::Request.new("GET", file_link)+ expect(response.status_code).to eq(200)+ expect(response.body).to eq(data)+ end++ response = handle HTTP::Request.new("GET", file_link)+ expect(response.status_code).to eq(200)+ expect(response.body).to eq(data)+ end+ end++ # Cache should be 5 mb so no more files will be cached.+ make_temporary_file("test cache size limit uncached") do |temporary_file, file_link|+ cycle_temporary_file_contents(temporary_file, "a") do+ response = handle HTTP::Request.new("GET", file_link)+ expect(response.status_code).to eq(200)+ expect(response.body).to eq("a")+ end++ response = handle HTTP::Request.new("GET", file_link)+ expect(response.status_code).to eq(200)+ expect(response.body).to_not eq("a")+ end+ end+after_each { Invidious::HttpServer::StaticAssetsHandler.clear_cache }enddiff --git a/src/invidious/http_server/static_assets_handler.cr b/src/invidious/http_server/static_assets_handler.crindex 94add5a8..e086ac3b 100644--- a/src/invidious/http_server/static_assets_handler.cr+++ b/src/invidious/http_server/static_assets_handler.cr@@ -20,6 +20,7 @@ module Invidious::HttpServerendCACHE_LIMIT = 5_000_000 # 5MB+ @@current_cache_size = 0@@cached_files = {} of Path => CachedFile# Returns metadata for the requested file@@ -71,9 +72,8 @@ module Invidious::HttpServer# Writes file data to the cacheprivate def flush_io_to_cache(io, file_path, file_info)- if @@cached_files.sum(&.[1].size) + file_info.size < CACHE_LIMIT- data_slice = io.to_slice- @@cached_files[file_path] = CachedFile.new(data_slice, file_info.size, file_info.modification_time)+ if (@@current_cache_size += file_info.size) <= CACHE_LIMIT+ @@cached_files[file_path] = CachedFile.new(io.to_slice, file_info.size, file_info.modification_time)endend@@ -112,6 +112,7 @@ module Invidious::HttpServer## This is only used in the specs to clear the cache before each handler testdef self.clear_cache+ @@current_cache_size = 0return @@cached_files.clearendend