Optimize spritesheets using OptiPNG

Jasper van Merle committed 7 years ago

Commit dc475731 parent 49a74852 files · +42 −6Browse files

Unified · Split

2 files

lib/app.rb +1 −1
lib/tasks/sprites.thor +41 −5

@@ -56,7 +56,7 @@ class App < Sinatra::Application · 55 unmodified lines
56	require 'thor'	56	require 'thor'
57	load 'tasks/sprites.thor'	57	load 'tasks/sprites.thor'
58		58
59	SpritesCLI.new.invoke(:generate)	59	SpritesCLI.new.invoke(:generate, [], :disable_optimization => true)
60		60
61	require 'active_support/per_thread_registry'	61	require 'active_support/per_thread_registry'
62	require 'active_support/cache'	62	require 'active_support/cache'

lib/tasks/sprites.thor+41−5

     super
   end
-  desc 'generate [--remove-public-icons] [--verbose]', 'Generate the documentation icon spritesheets'
+  desc 'generate [--remove-public-icons] [--disable-optimization] [--verbose]', 'Generate the documentation icon spritesheets'
   option :remove_public_icons, type: :boolean, desc: 'Remove public/icons after generating the spritesheets'
+  option :disable_optimization, type: :boolean, desc: 'Disable optimizing the spritesheets with OptiPNG'
   option :verbose, type: :boolean
   def generate
     items = get_items
     log_details(items_with_icons, icons_per_row)
-    generate_spritesheet(16, items_with_icons, 'assets/images/sprites/docs.png') {|item| item[:icon_16]}
+    generate_spritesheet(16, items_with_icons) {|item| item[:icon_16]}
-    generate_spritesheet(32, items_with_icons, 'assets/images/sprites/docs@2x.png') {|item| item[:icon_32]}
+    generate_spritesheet(32, items_with_icons) {|item| item[:icon_32]}
+    unless options[:disable_optimization]
+      optimize_spritesheet(get_output_path(16))
+      optimize_spritesheet(get_output_path(32))
+    end
     # Add Mongoose's icon details to docs without custom icons
     default_item = items_with_icons.find {|item| item[:type] == 'mongoose'}
     0.2126 * rgb[0] + 0.7152 * rgb[1] + 0.0722 * rgb[2]
   end
-  def generate_spritesheet(size, items_with_icons, output_path, &item_to_icon)
+  def generate_spritesheet(size, items_with_icons, &item_to_icon)
-    logger.info("Generating spritesheet #{output_path} with icons of size #{size} x #{size}")
+    output_path = get_output_path(size)
+    logger.info("Generating spritesheet to #{output_path} with icons of size #{size} x #{size}")
     icons_per_row = Math.sqrt(items_with_icons.length).ceil
     spritesheet = ChunkyPNG::Image.new(size * icons_per_row, size * icons_per_row)
     spritesheet.save(output_path)
   end
+  def optimize_spritesheet(path)
+    logger.info("Optimizing spritesheet at #{path}")
+    image_optim.optimize_image!(path)
+  end
   def save_manifest(items, icons_per_row, path)
     logger.info("Saving spritesheet details to #{path}")
     logger.debug(border)
   end
+  def get_output_path(size)
+    "assets/images/sprites/docs#{size == 32 ? '@2x' : ''}.png"
+  end
+  def image_optim
+    @image_optim ||= ImageOptim.new(
+      :config_paths => [],
+      :advpng => false,
+      :gifsicle => false,
+      :jhead => false,
+      :jpegoptim => false,
+      :jpegrecompress => false,
+      :jpegtran => false,
+      :pngcrush => false,
+      :pngout => false,
+      :pngquant => false,
+      :svgo => false,
+      :optipng => {
+        :level => 7,
+      },
+    )
+  end
   def logger
     @logger ||= Logger.new($stdout).tap do |logger|
       logger.level = options[:verbose] ? Logger::DEBUG : Logger::INFO