imagetools 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ff1f2f85b91da3ff4348eebce3f2157c7d9f8216afee1c3c8a8264428a390a
-  data.tar.gz: 8905d951157a918fa7cdd83a33eaf9607423f722dc129bb3f33e888b25697a73
+  metadata.gz: 1ebf051e18de9f5e74f9ffc5a3efc716e7e83a3fee7537d28eacd5657fda24f5
+  data.tar.gz: fe7e01ce0290adb48269577d295df12661ca029c1a6f9762423e3e8878c3ab2f
 SHA512:
-  metadata.gz: 35738982bdb2a55638a975b761973bb04118e80837e0f2850332e5c670ced1d3dd75f1a6079af452e1855d5897ba11b38dcce9f7d97c91e50d513f9fc8ea3dab
-  data.tar.gz: e4a5b065b76bf44e8ca52480a076364cf37c503d38964d54b9d682395293892243c6fb3d193560ef5c7323288977b87446d0ea879ba302064655dcf2d2cf6219
+  metadata.gz: 5df4b176fae56ee6975eb443eba41c68d8fd6941b72199d7264824eba21f980065f598d9794d85832de1f2fdb951636b9c525a868cc7699062883fc993b1973a
+  data.tar.gz: d221b89f398e20f8d44116c51e5d565a2d6181d7cb8d046f3e01905630289286b640c52bc8220ad8cfb0bed3c01a8c2c11f4c92070a744cb846bc8f70bd6aff6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imagetools (0.8.0)
+    imagetools (0.9.0)
       rmagick
 
 GEM

data/lib/imagetools/imagefilter.rb

@@ -9,9 +9,17 @@ module Imagetools
 
     SCREENSHOT_SEARCH = /s (\d+)-(\d+)-(\d+) (\d+)\.(\d+)\.(\d+)/
     SCREENSHOT_REPLACE = 's_\1\2\3_\4\5\6'
+    OTHER_JPG_SEARCH = /\.(large|huge|jpg_large)$/i
+    OTHER_JPG_REPLACE = '.jpg'
+    
+    CONVERT_CMD = "convert"
+    DWEBP_CMD = "dwebp"
     RESIZE_CMD = "mogrify -resize 1280x\\> "
     COMPRESS_CMD = "jpegoptim --strip-all --max=90 "
     EXTERNAL_CMDS = [RESIZE_CMD, COMPRESS_CMD]
+
+    WEBP_SEARCH = /(.+)\.webp/i
+    WEBP_REPLACE = '\1.jpg'
     
     PNG_SEARCH = /(.+)\.png/i
     PNG_REPLACE = '\1.jpg'
@@ -68,10 +76,16 @@ EOM
       filepaths
     end
 
-    def self.replace_screenshot_filename(filename)
-      filename.sub!(SCREENSHOT_SEARCH, SCREENSHOT_REPLACE)
+    def self.replace_image_filename(filename)
+      result = filename.sub!(SCREENSHOT_SEARCH, SCREENSHOT_REPLACE)
+      return result if result
+      filename.sub!(OTHER_JPG_SEARCH, OTHER_JPG_REPLACE)
     end
 
+    def self.replace_webp2jpg(filename)
+      filename.sub!(WEBP_SEARCH, WEBP_REPLACE)
+    end
+    
     def self.replace_png2jpg(filename)
       filename.sub!(PNG_SEARCH, PNG_REPLACE)
     end
@@ -106,7 +120,8 @@ EOM
         return
       end
       
-      filepath = rename_screenshot(filepath)
+      filepath = rename_image(filepath)
+      filepath = webp2jpg(filepath)
       filepath = png2jpg(filepath)
       filepath = resize_jpg(filepath)
       filepath = compress_jpg(filepath)
@@ -123,9 +138,9 @@ EOM
       false
     end
     
-    def rename_screenshot(filepath)
+    def rename_image(filepath)
       fromname = File.basename(filepath)
-      toname = self.class.replace_screenshot_filename(fromname)
+      toname = self.class.replace_image_filename(fromname)
       return filepath if toname.nil?
 
       dir = File.dirname(filepath)
@@ -135,6 +150,22 @@ EOM
       return topath
     end
 
+    def webp2jpg(filepath)
+      fromname = File.basename(filepath)
+      toname = self.class.replace_webp2jpg(fromname)
+      return filepath if toname.nil?
+
+      dir = File.dirname(filepath)
+      topath = File.join(dir, toname)
+      puts "convert: #{filepath} => #{topath}"
+      # dwebp ~/Desktop/1.webp -o ~/Desktop/1.jpg      
+      cmd = "#{DWEBP_CMD} \"#{filepath}\" -o \"#{topath}\""
+      if system(cmd)
+        FileUtils.rm(filepath)
+      end
+      return topath
+    end
+    
     def png2jpg(filepath)
       fromname = File.basename(filepath)
       toname = self.class.replace_png2jpg(fromname)
@@ -144,7 +175,7 @@ EOM
       topath = File.join(dir, toname)
       puts "convert: #{filepath} => #{topath}"
       # convert test.png -background "#ffff00" -flatten test.jpg
-      cmd = "convert \"#{filepath}\" -background \"#ffffff\" -flatten \"#{topath}\""
+      cmd = "#{CONVERT_CMD} \"#{filepath}\" -background \"#ffffff\" -flatten \"#{topath}\""
       if system(cmd)
         FileUtils.rm(filepath)
       end

data/lib/imagetools/version.rb

@@ -1,3 +1,3 @@
 module Imagetools
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagetools
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick