imagetools 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b3c82bea2e6142528c1bd2950d328a1a68823f6ae8e0a89f8f69cef33275ed
-  data.tar.gz: e99f4a964370128a821a0b44c170b39d62b7b18078a7122d6f878a7f67f7cab3
+  metadata.gz: e1a3773ab194e825412e9f5cd7a6296b9dae8232b265df6099a1f505662ac21e
+  data.tar.gz: e306694b34e778ab2f18f60c55410c3307402f999633a4c288a740468aa181d6
 SHA512:
-  metadata.gz: ba4317180125f4d4e31a44666863d40ac2636997ff83211a26bc5e5b99c82e47cc7c5b68a2dff36b94546029fe5a98827ecf14aba4b1c47cb45ee362cdd33243
-  data.tar.gz: e9bba93211d4a035e6bbeabcd41ad7110ff5bcc4b2daad5512bcfe86bb0dcd9e5932f6e5f8915b765e406167b1de1de4eab5677eeedf2ba7ef720fad6914d6f0
+  metadata.gz: 7939c3704ae59d12664951d529166379ac2029e3104dad8f33987f24f70927cb6c7eca88904ab5a76c2c07cde3e1699f05a1325dbe5e59248056c23b9a9b9cdb
+  data.tar.gz: 90efa73ede00e2712c32c9b05451f22ed0532adbf8ebd6ec02ba495e874d5a4249e44a44865fde03b06085701a583a1bd6c8cc9b214aebdf354f289d14c092f0

data/.idea/workspace.xml

@@ -5,13 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b197c64f-57f8-4389-ab8d-dc9fe3cb05ba" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/imagetools.iml" beforeDir="false" afterPath="$PROJECT_DIR$/imagetools.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/imagetools/imagefilter.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/imagetools/imagefilter.rb" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/imagetools/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/imagetools/version.rb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/imagefilter_test.rb" beforeDir="false" afterPath="$PROJECT_DIR$/test/imagefilter_test.rb" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -299,7 +295,8 @@
       <workItem from="1669384174219" duration="2215000" />
       <workItem from="1678251388689" duration="1190000" />
       <workItem from="1682834450840" duration="2235000" />
-      <workItem from="1682836714784" duration="304000" />
+      <workItem from="1682836714784" duration="506000" />
+      <workItem from="1683773814394" duration="2723000" />
     </task>
     <servers />
   </component>
@@ -307,12 +304,13 @@
     <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.History.Properties">
-    <option name="COLUMN_ORDER">
+    <option name="COLUMN_ID_ORDER">
       <list>
-        <option value="0" />
-        <option value="2" />
-        <option value="3" />
-        <option value="1" />
+        <option value="Default.Root" />
+        <option value="Default.Author" />
+        <option value="Default.Date" />
+        <option value="Default.Subject" />
+        <option value="Space.CommitStatus" />
       </list>
     </option>
   </component>

data/Gemfile.lock

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

data/lib/imagetools/imagefilter.rb

@@ -71,14 +71,16 @@ module Imagetools
     EXTERNAL_CMDS = [CONVERT_CMD, RESIZE_CMD, ROTATE_CMD, COMPRESS_CMD, DWEBP_CMD, CWEBP_CMD]
 
     WEBP_SEARCH = /(.+)\.webp/i
-    WEBP_REPLACE = '\1.webp'
-    
+
     PNG_SEARCH = /(.+)\.png/i
-    PNG_REPLACE = '\1.jpg'
     JPG_SEARCH = /(.+)\.jpe?g/i
     HEIC_SEARCH = /(.+)\.heic/i
-    HEIC_REPLACE = '\1.jpg'
-    
+
+    WEBP_REPLACE = '\1.webp'
+    JPG_REPLACE = '\1.jpg'
+    PNG_REPLACE = '\1.png'
+
+
     EXCLUDE_PAT = /^_/ # 先頭が"_"の場合は除外
     
     def self.run(argv)
@@ -106,7 +108,10 @@ EOM
       opt.on('-n', '--dry-run', 'Message only') {|v| opts[:n] = v}
       opt.on('-t', '--self-test', 'Run Self Test') {|v| opts[:t] = v}
       opt.on('-c', '--config', 'Config file'){|v| opts[:c] = v }
+      types = ['jpg', 'wepp']
+      opt.on('-output-type=OUTPUTTYPE', types, types.join("|") + "(default jpg)") {|v| opts[:o] = v}
       opt.parse!(argv)
+      opts[:o] ||= types[0]
 
       config_file = opts[:c] || "~/.imagefilterrc"
       config_file = File.expand_path(config_file)
@@ -152,16 +157,16 @@ EOM
       filename.sub(OTHER_JPG_SEARCH, OTHER_JPG_REPLACE)
     end
 
-#    def self.replace_webp2png(filename)
-#      filename.sub(WEBP_SEARCH, WEBP_REPLACE)
-#    end
+   def self.replace_webp2png(filename)
+     filename.sub(WEBP_SEARCH, PNG_REPLACE)
+   end
     
-#    def self.replace_png2jpg(filename)
-#      filename.sub(PNG_SEARCH, PNG_REPLACE)
-#    end
+   def self.replace_png2jpg(filename)
+     filename.sub(PNG_SEARCH, JPG_REPLACE)
+   end
 
     def self.replace_heic2jpg(filename)
-      filename.sub(HEIC_SEARCH, HEIC_REPLACE)
+      filename.sub(HEIC_SEARCH, JPG_REPLACE)
     end
 
     def self.replace_image2webp(filename)
@@ -222,9 +227,16 @@ EOM
 
       # JPEG/PNG/WEBP 画像のリサイズ
       filepath = resize_image(filepath)
-      
-      # JPEG/PNGをWEBPに変換(WEBPはそのまま)
-      filepath = image2webp(filepath)
+      if @opts[:o] == 'webp'
+        # JPEG/PNGをWEBPに変換(WEBPはそのまま)
+       filepath = image2webp(filepath)
+      else
+        # PNGとWebPをJPEGに変換
+        filepath = webp2png(filepath)
+        filepath = png2jpg(filepath)
+        filepath = compress_jpg(filepath)
+      end
+
       filepath
     end
 
@@ -253,37 +265,37 @@ EOM
       return topath
     end
 
-    # def webp2png(filepath)
-    #   fromname = File.basename(filepath)
-    #   toname = self.class.replace_webp2png(fromname)
-    #   return filepath if fromname == toname
-
-    #   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 webp2png(filepath)
+      fromname = File.basename(filepath)
+      toname = self.class.replace_webp2png(fromname)
+      return filepath if fromname == toname
+
+      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)
-    #   return filepath if fromname == toname
-
-    #   dir = File.dirname(filepath)
-    #   topath = File.join(dir, toname)
-    #   puts "convert: #{filepath} => #{topath}"
-    #   # convert test.png -background "#ffff00" -flatten test.jpg
-    #   cmd = "#{CONVERT_CMD} \"#{filepath}\" -background \"#ffffff\" -flatten \"#{topath}\""
-    #   if system(cmd)
-    #     FileUtils.rm(filepath)
-    #   end
-    #   return topath
-    # end
+    def png2jpg(filepath)
+      fromname = File.basename(filepath)
+      toname = self.class.replace_png2jpg(fromname)
+      return filepath if fromname == toname
+
+      dir = File.dirname(filepath)
+      topath = File.join(dir, toname)
+      puts "convert: #{filepath} => #{topath}"
+      # convert test.png -background "#ffff00" -flatten test.jpg
+      cmd = "#{CONVERT_CMD} \"#{filepath}\" -background \"#ffffff\" -flatten \"#{topath}\""
+      if system(cmd)
+        FileUtils.rm(filepath)
+      end
+      return topath
+    end
 
     def heic2jpg(filepath)
       fromname = File.basename(filepath)
@@ -327,16 +339,16 @@ EOM
       return filepath
     end
     
-    # def compress_jpg(filepath)
-    #   fromname = File.basename(filepath)
-    #   unless fromname =~ JPG_SEARCH
-    #     return filepath 
-    #   end
-    #   puts "compress: #{filepath}"
-    #   cmd = "#{COMPRESS_CMD} \"#{filepath}\""
-    #   system(cmd)
-    #   return filepath
-    # end
+    def compress_jpg(filepath)
+      fromname = File.basename(filepath)
+      unless fromname =~ JPG_SEARCH
+        return filepath
+      end
+      puts "compress: #{filepath}"
+      cmd = "#{COMPRESS_CMD} \"#{filepath}\""
+      system(cmd)
+      return filepath
+    end
     
      def image2webp(filepath)
        fromname = File.basename(filepath)

data/lib/imagetools/version.rb

@@ -1,3 +1,3 @@
 module Imagetools
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagetools
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick