Skip to content

Commit

Permalink
Merge pull request #1776 from manyfold3d/efficient-file-sending
Browse files Browse the repository at this point in the history
Make file sending more memory efficient by chunking
  • Loading branch information
Floppy authored Jan 29, 2024
2 parents a5eb143 + 898eb31 commit 6998d2b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
14 changes: 11 additions & 3 deletions app/controllers/model_files_controller.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
class ModelFilesController < ApplicationController
include ActionController::Live

before_action :get_library
before_action :get_model
before_action :get_file, except: [:bulk_edit, :bulk_update]
Expand All @@ -13,7 +15,7 @@ def show
send_file_content
end
format.any(*SupportedMimeTypes.image_types.map(&:to_sym)) do
send_file File.join(@library.path, @model.path, @file.filename)
send_file_content
end
end
end
Expand Down Expand Up @@ -51,12 +53,18 @@ def destroy

private

def send_file_content
def send_file_content(disposition: :attachment)
filename = File.join(@library.path, @model.path, @file.filename)
response.headers["Content-Length"] = File.size(filename).to_s
send_file filename, disposition: :inline, type: @file.extension.to_sym
response.headers["Content-Disposition"] = ActionDispatch::Http::ContentDisposition.format(disposition: disposition, filename: @file.filename)
response.headers["Content-Type"] = @file.mime_type.to_s
IO.foreach(filename, 2**15) do |chunk|
response.stream.write(chunk)
end
rescue Errno::ENOENT
head :internal_server_error
ensure
response.stream.close
end

def bulk_update_params
Expand Down
4 changes: 4 additions & 0 deletions app/models/model_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ def is_image?
SupportedMimeTypes.image_extensions.include? extension
end

def mime_type
Mime::Type.lookup_by_extension(extension)
end

def name
File.basename(filename, ".*").humanize.titleize
end
Expand Down

0 comments on commit 6998d2b

Please sign in to comment.