Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-12-19 20:54:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

StaticFileHandler: Adapt for Crystal 1.6

Browse Source 
See:
 - https://github.com/crystal-lang/crystal/pull/12310
 - https://github.com/kemalcr/kemal/pull/644
This commit is contained in:
Samantaz Fox 2022-08-15 12:31:33 +02:00
parent b2c0f7efc3
commit d950a0ef5d
No known key found for this signature in database
GPG Key ID: F42821059186176E
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ext/kemal_static_file_handler.cr
View File

@ -149,7 +149,9 @@ module Kemal
send_file(context, file_path, file[:data], file[:filestat]) send_file(context, file_path, file[:data], file[:filestat])
else else
is_dir = Dir.exists? file_path file_info = File.info?(file_path)
is_dir = file_info.try &.directory? || false
is_file = file_info.try &.file? || false
if request_path != expanded_path if request_path != expanded_path
redirect_to context, expanded_path redirect_to context, expanded_path
@ -157,15 +159,17 @@ module Kemal
redirect_to context, expanded_path + '/' redirect_to context, expanded_path + '/'
end end
if Dir.exists?(file_path) return call_next(context) if file_info.nil?
if is_dir
if config.is_a?(Hash) && config["dir_listing"] == true if config.is_a?(Hash) && config["dir_listing"] == true
context.response.content_type = "text/html" context.response.content_type = "text/html"
directory_listing(context.response, request_path, file_path) directory_listing(context.response, request_path, file_path)
else else
call_next(context) call_next(context)
end end
elsif File.exists?(file_path) elsif is_file
last_modified = modification_time(file_path) last_modified = file_info.modification_time
add_cache_headers(context.response.headers, last_modified) add_cache_headers(context.response.headers, last_modified)
if cache_request?(context, last_modified) if cache_request?(context, last_modified)
@ -177,14 +181,12 @@ module Kemal
data = Bytes.new(size) data = Bytes.new(size)
File.open(file_path, &.read(data)) File.open(file_path, &.read(data))
filestat = File.info(file_path) @cached_files[file_path] = {data: data, filestat: file_info}
send_file(context, file_path, data, file_info)
@cached_files[file_path] = {data: data, filestat: filestat}
send_file(context, file_path, data, filestat)
else else
send_file(context, file_path) send_file(context, file_path)
end end
else else # Not a normal file (FIFO/device/socket)
call_next(context) call_next(context)
end end
end end