Copy binary files instead of rendering through MM. Closes #643. Closes #699

This commit is contained in:
Thomas Reynolds 2012-12-30 20:36:06 -08:00
parent 6253c91610
commit fbb2a355d7
4 changed files with 25 additions and 8 deletions

View file

@ -1,6 +1,8 @@
Master Master
=== ===
* Directly send binary files in preview and copy them in build, avoiding reading large binary files into memory for rendering. #643 #699
3.0.7 3.0.7
==== ====
* Turn html5 boilerplate into a layout * Turn html5 boilerplate into a layout

View file

@ -117,16 +117,20 @@ module Middleman::Cli
build_dir = self.class.shared_instance.config[:build_dir] build_dir = self.class.shared_instance.config[:build_dir]
output_file = File.join(build_dir, resource.destination_path) output_file = File.join(build_dir, resource.destination_path)
begin if resource.binary?
response = self.class.shared_rack.get(URI.escape(resource.destination_path)) copy_file(resource.source_file, output_file)
else
begin
response = self.class.shared_rack.get(URI.escape(resource.destination_path))
if response.status == 200 if response.status == 200
create_file(output_file, response.body) create_file(output_file, response.body)
else else
handle_error(output_file, response.body) handle_error(output_file, response.body)
end
rescue => e
handle_error(output_file, "#{e}\n#{e.backtrace.join("\n")}", e)
end end
rescue => e
handle_error(output_file, "#{e}\n#{e.backtrace.join("\n")}", e)
end end
output_file output_file

View file

@ -245,6 +245,9 @@ module Middleman
# Return 404 if not in sitemap # Return 404 if not in sitemap
return not_found(res, request_path) unless resource && !resource.ignored? return not_found(res, request_path) unless resource && !resource.ignored?
# If this path is a binary file, send it immediately
return send_file(resource.source_file, env, res) if resource.binary?
current_path = resource.destination_path current_path = resource.destination_path
# Set a HTTP content type based on the request's extensions # Set a HTTP content type based on the request's extensions

View file

@ -146,6 +146,14 @@ module Middleman
end end
File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/', url_path) File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/', url_path)
end end
# Whether the source file is binary.
#
# @retrun [Boolean]
def binary?
s = (File.read(source_file, File.stat(source_file).blksize) || "").split(//)
((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
end
end end
end end
end end