Merge pull request #100 from danielpietzsch/improveRegeneratePerformance
Improving build performance when a lot of images have already been resized before
This commit is contained in:
commit
7679f4b8f5
|
@ -8,12 +8,11 @@ module Jekyll
|
|||
|
||||
Jekyll.logger.warn "Invalid image path specified: #{image_path.inspect}" unless File.file?(absolute_image_path)
|
||||
|
||||
resize_handler = ResizeHandler.new
|
||||
img = Magick::Image::read(absolute_image_path).first
|
||||
resize_handler = ResizeHandler.new(absolute_image_path, config)
|
||||
|
||||
{
|
||||
original: image_hash(config, image_path, img.columns, img.rows),
|
||||
resized: resize_handler.resize_image(img, config),
|
||||
original: image_hash(config, image_path, resize_handler.original_image.columns, resize_handler.original_image.rows),
|
||||
resized: resize_handler.resize_image,
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -3,26 +3,39 @@ module Jekyll
|
|||
class ResizeHandler
|
||||
include ResponsiveImage::Utils
|
||||
|
||||
def resize_image(img, config)
|
||||
img.auto_orient! if config['auto_rotate']
|
||||
attr_reader :original_image
|
||||
|
||||
def initialize(original_image_absolute_path, config)
|
||||
@config = config
|
||||
|
||||
@original_image_absolute_path = original_image_absolute_path
|
||||
|
||||
if @config['auto_rotate']
|
||||
load_full_image
|
||||
@original_image.auto_orient!
|
||||
else
|
||||
load_image_properties_only
|
||||
end
|
||||
end
|
||||
|
||||
def resize_image
|
||||
resized = []
|
||||
|
||||
config['sizes'].each do |size|
|
||||
@config['sizes'].each do |size|
|
||||
width = size['width']
|
||||
ratio = width.to_f / img.columns.to_f
|
||||
height = (img.rows.to_f * ratio).round
|
||||
ratio = width.to_f / @original_image.columns.to_f
|
||||
height = (@original_image.rows.to_f * ratio).round
|
||||
|
||||
next unless needs_resizing?(img, width)
|
||||
next unless needs_resizing?(width)
|
||||
|
||||
image_path = img.filename.force_encoding(Encoding::UTF_8)
|
||||
filepath = format_output_path(config['output_path_format'], config, image_path, width, height)
|
||||
resized.push(image_hash(config, filepath, width, height))
|
||||
image_path = @original_image.filename.force_encoding(Encoding::UTF_8)
|
||||
filepath = format_output_path(@config['output_path_format'], @config, image_path, width, height)
|
||||
resized.push(image_hash(@config, filepath, width, height))
|
||||
|
||||
site_source_filepath = File.expand_path(filepath, config[:site_source])
|
||||
site_dest_filepath = File.expand_path(filepath, config[:site_dest])
|
||||
site_source_filepath = File.expand_path(filepath, @config[:site_source])
|
||||
site_dest_filepath = File.expand_path(filepath, @config[:site_dest])
|
||||
|
||||
if config['save_to_source']
|
||||
if @config['save_to_source']
|
||||
target_filepath = site_source_filepath
|
||||
else
|
||||
target_filepath = site_dest_filepath
|
||||
|
@ -36,16 +49,22 @@ module Jekyll
|
|||
|
||||
Jekyll.logger.info "Generating #{target_filepath}"
|
||||
|
||||
if config['strip']
|
||||
img.strip!
|
||||
end
|
||||
i = img.scale(ratio)
|
||||
i.write(target_filepath) do |f|
|
||||
f.interlace = i.interlace
|
||||
f.quality = size['quality'] || config['default_quality']
|
||||
load_full_image unless @original_image_pixels_loaded
|
||||
|
||||
if @config['strip']
|
||||
@original_image.strip!
|
||||
end
|
||||
|
||||
if config['save_to_source']
|
||||
i = @original_image.scale(ratio)
|
||||
|
||||
quality = size['quality'] || @config['default_quality']
|
||||
|
||||
i.write(target_filepath) do |f|
|
||||
f.interlace = i.interlace
|
||||
f.quality = quality
|
||||
end
|
||||
|
||||
if @config['save_to_source']
|
||||
# Ensure the generated file is copied to the _site directory
|
||||
Jekyll.logger.info "Copying resized image to #{site_dest_filepath}"
|
||||
FileUtils.copy_file(site_source_filepath, site_dest_filepath)
|
||||
|
@ -54,7 +73,7 @@ module Jekyll
|
|||
i.destroy!
|
||||
end
|
||||
|
||||
img.destroy!
|
||||
@original_image.destroy!
|
||||
|
||||
resized
|
||||
end
|
||||
|
@ -65,8 +84,18 @@ module Jekyll
|
|||
Pathname.new(format % params).cleanpath.to_s
|
||||
end
|
||||
|
||||
def needs_resizing?(img, width)
|
||||
img.columns > width
|
||||
def needs_resizing?(width)
|
||||
@original_image.columns > width
|
||||
end
|
||||
|
||||
def load_full_image
|
||||
@original_image = Magick::Image::read(@original_image_absolute_path).first
|
||||
@original_image_pixels_loaded = true
|
||||
end
|
||||
|
||||
def load_image_properties_only
|
||||
@original_image = Magick::Image::ping(@original_image_absolute_path).first
|
||||
@original_image_pixels_loaded = false
|
||||
end
|
||||
|
||||
def ensure_output_dir_exists!(path)
|
||||
|
|
Loading…
Reference in New Issue