@@ -575,3 +575,11 @@ system_settings_066: id: "66" value: "false" section: Flagging +system_settings_067: + name: Keep Embedded Metadata For All Sizes + technically_advanced: true + required_to_be_configured: true + explanation: "When creating the different versions of uploaded images, such as thumbnails, should we keep the embedded metadata with the new version of the image? Not transferring embedded metadata to the new versions can make them significantly smaller, especially if the original has an embedded thumbnail version already. On the other hand embedded metadata may contain information that is important to keep, such as copyright holder." + id: "67" + value: "false" + section: Images db/bootstrap/system_settings.yml @@ -54,7 +54,7 @@ module ResizeAsJpegWhenNecessary end def resize_image(img, size) - img.strip! # remove metadata from the resized image + img.strip! unless attachment_options[:keep_profile] # remove metadata from the resized image img.format = 'JPEG' # set format to JPEG self.temp_path = write_to_temp_file(img.to_blob { self.format = 'JPEG' }) if self.class.should_be_converted?(img.format) super lib/resize_as_jpeg_when_necessary.rb @@ -58,13 +58,19 @@ namespace :kete do end end - desc 'Resize original images based on current IMAGE_SIZES and add new ones if needed. Does not remove no longer needed ones (to prevent links breaking).' + desc 'Resize original images based on current IMAGE_SIZES and add new ones if needed. Does not remove no longer needed ones (to prevent links breaking). By default image files that match new sizes will be skipped. If you need new versions recreated even if there is an existing file that matches the size, use FORCE_RESIZE=true.' task :resize_images => :environment do @logger = Logger.new(RAILS_ROOT + "/log/resize_images_#{Time.now.strftime('%Y-%m-%d_%H:%M:%S')}.log") puts "Resizing/created images based on IMAGE_SIZES..." @logger.info "Starting image file resizing." + force_resize = (ENV['FORCE_RESIZE'] && ENV['FORCE_RESIZE'] == "true") ? true : false + if force_resize + puts "All image sizes will be recreated from originals, even if the same size image file already exists." + @logger.info "FORCE_RESIZE=true" + end + # get a list of thumbnail keys image_size_keys = IMAGE_SIZES.keys @@ -92,7 +98,7 @@ namespace :kete do missing_image_size_keys = missing_image_size_keys - [child_image_file.thumbnail.to_sym] # if this image doesn't need to be changed, skip it - if image_file_match_image_size?(child_image_file) + if image_file_match_image_size?(child_image_file) && !force_resize @logger.info " Child image #{child_image_file.id} does not need resizing" next end lib/tasks/tools.rake f4101d51477c1133541d03d0d5e2324c20c2a42d b420ee21a479985a3be090eda42b7abd7430d0f7 Kieran Pilkington kieran@katipo.co.nz http://github.com/kete/kete/commit/a8d1f37dc16cdf92a5af602817430c07d717f506 a8d1f37dc16cdf92a5af602817430c07d717f506 2009-11-08T13:29:23-08:00 2009-11-08T13:29:23-08:00 Merge branch 'master' of github.com:kete/kete into enhancement_241_comment_system_improvements 8e0b2f052ee17a83154bf3f184359fb3c6d288db Kieran Pilkington kieran@katipo.co.nz