Skip to content

Invidious is an alternative front-end to YouTube

Reduce indent in StaticAssetsHandler#serve_file

syeopite1f5685ef92ef
diff --git a/src/invidious/http_server/static_assets_handler.cr b/src/invidious/http_server/static_assets_handler.cr
index e086ac3b..7902c95b 100644
--- a/src/invidious/http_server/static_assets_handler.cr
+++ b/src/invidious/http_server/static_assets_handler.cr
@@ -50,24 +50,25 @@ module Invidious::HttpServer
range_header = context.request.headers["Range"]?
- if !file_info.is_a? CachedFile
- retrieve_bytes_from = IO::Memory.new
+ # If the file is cached we can just directly serve it
+ if file_info.is_a? CachedFile
+ return dispatch_serve(context, file_info.data, file_info, range_header)
+ end
- File.open(file_path) do |file|
- # We cannot cache partial data so we'll rewind and read from the start
- if range_header
- dispatch_serve(context, file, file_info, range_header)
- IO.copy(file.rewind, retrieve_bytes_from)
- else
- context.response.output = IO::MultiWriter.new(context.response.output, retrieve_bytes_from, sync_close: true)
- dispatch_serve(context, file, file_info, range_header)
- end
+ # Otherwise we'll need to read from disk and cache it
+ retrieve_bytes_from = IO::Memory.new
+ File.open(file_path) do |file|
+ # We cannot cache partial data so we'll rewind and read from the start
+ if range_header
+ dispatch_serve(context, file, file_info, range_header)
+ IO.copy(file.rewind, retrieve_bytes_from)
+ else
+ context.response.output = IO::MultiWriter.new(context.response.output, retrieve_bytes_from, sync_close: true)
+ dispatch_serve(context, file, file_info, range_header)
end
-
- return flush_io_to_cache(retrieve_bytes_from, file_path, file_info)
- else
- return dispatch_serve(context, file_info.data, file_info, range_header)
end
+
+ return flush_io_to_cache(retrieve_bytes_from, file_path, file_info)
end
# Writes file data to the cache