imagetools 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b165e7e85d7d0854577ab7a1f452ff4b3df9d87ea82890dcdda5f0550f969046
-  data.tar.gz: e38ddf3c06d47997399fada92f2130460cfadb5558bb0f460b555e07684cb3cb
+  metadata.gz: c695900493f7e008bd7a71202f740d8cf7934017cc4dbd554102e52c45d68be5
+  data.tar.gz: 9d0085886aac557e3da673d47258a30bf5c8ebcee4d77ad641ce232e73c21bb1
 SHA512:
-  metadata.gz: f16f40fdcb563715da0064a6c5a2ef9bd61ff2469f70d7e25760156b081ef950b8c5ea3608bcf773e96ba59b91314216ff7b995bfd94b6c784b10d3a2d61c9a0
-  data.tar.gz: bea91193b72e52fda2954c19939dbf92ae479bec2a3029c6d4156f2d19714b01e343301ce8f205a1c27d9ece7a95b538f700379dc37cedc48c9b353fba1fda26
+  metadata.gz: 9a0c730e84290e6f18afa19c5446d98e75fee8a2966229812d7e372e6e3dd9e38909c5f6c447ef8af9c807645b936248b50086709cce7f7df301e02536b60aef
+  data.tar.gz: c3e99d26db139acc25fc259449e6ba7344c9e788bd595ad6744a408ff7e5da253d07f00dc0a57a8036e464dc8c6f3763f07327fb137dddfd2be49f7aa37bcadb

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    imagetools (1.3.1)
+    imagetools (1.4.0)
       rmagick (= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.14.4)
+    minitest (5.15.0)
     rake (13.0.6)
     rmagick (3.2.0)
 

data/lib/imagetools/imagefilter.rb

@@ -61,6 +61,9 @@ module Imagetools
     PNG_SEARCH = /(.+)\.png/i
     PNG_REPLACE = '\1.jpg'
     JPG_SEARCH = /(.+)\.jpe?g/i
+    HEIC_SEARCH = /(.+)\.heic/i
+    HEIC_REPLACE = '\1.jpg'
+    
     EXCLUDE_PAT = /^_/ # 先頭が"_"の場合は除外
     
     def self.run(argv)
@@ -142,6 +145,10 @@ EOM
       filename.sub(PNG_SEARCH, PNG_REPLACE)
     end
 
+    def self.replace_heic2jpg(filename)
+      filename.sub(HEIC_SEARCH, HEIC_REPLACE)
+    end
+
     def self.match_exclude_image?(filename)
       filename =~ EXCLUDE_PAT
     end
@@ -172,10 +179,10 @@ EOM
       if exclude_image?(filepath)
         return
       end
-      
       filepath = rename_image(filepath)
       filepath = webp2png(filepath)
       filepath = png2jpg(filepath)
+      filepath = heic2jpg(filepath)      
       filepath = resize_jpg(filepath)
       filepath = rotate_jpg(filepath)
       filepath = compress_jpg(filepath)
@@ -239,6 +246,23 @@ EOM
       return topath
     end
 
+    def heic2jpg(filepath)
+      fromname = File.basename(filepath)
+      toname = self.class.replace_heic2jpg(fromname)
+#      puts "heic2jpg #{fromname}=>#{toname}"      
+      return filepath if fromname == toname
+
+      dir = File.dirname(filepath)
+      topath = File.join(dir, toname)
+      puts "convert: #{filepath} => #{topath}"
+      # convert ~/Desktop/test.heic -o ~/Desktop/test.jpg
+      cmd = "#{CONVERT_CMD} \"#{filepath}\" \"#{topath}\""
+      if system(cmd)
+        FileUtils.rm(filepath)
+      end
+      return topath      
+    end
+
     def resize_jpg(filepath)
       fromname = File.basename(filepath)
       unless fromname =~ JPG_SEARCH

data/lib/imagetools/version.rb

@@ -1,3 +1,3 @@
 module Imagetools
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagetools
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick