Merge branch 'outfit_thumbnails'

This commit is contained in:
Emi Matchu 2012-07-31 12:05:54 -04:00
commit 0d02e05624

View file

@ -140,10 +140,16 @@ class Outfit < ActiveRecord::Base
unless image_layers.empty? unless image_layers.empty?
temp_image_files = Parallel.map(image_layers, :in_threads => 8) do |swf_asset| temp_image_files = Parallel.map(image_layers, :in_threads => 8) do |swf_asset|
image_file = Tempfile.open(['outfit_layer', '.png']) image_file = Tempfile.open(['outfit_layer', '.png'])
begin
write_temp_swf_asset_image!(swf_asset, image_file) write_temp_swf_asset_image!(swf_asset, image_file)
image_file.close rescue RightAws::AwsError
nil # skip broken images
else
image_file image_file
ensure
image_file.close
end end
end.compact # remove nils for broken images
# Here we do some awkwardness to get the exact ImageMagick command we # Here we do some awkwardness to get the exact ImageMagick command we
# want, though it's still less awkward than handling the command # want, though it's still less awkward than handling the command