imagetools 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4321ff7a51cd2038d5acb37c21c932d40ce0eb0e7a0f2514e852dd7c36e26617
-  data.tar.gz: dc47c8f323837468154686fed41727a9096560bed0ca0cb00e1f62b675ba44f6
+  metadata.gz: c695900493f7e008bd7a71202f740d8cf7934017cc4dbd554102e52c45d68be5
+  data.tar.gz: 9d0085886aac557e3da673d47258a30bf5c8ebcee4d77ad641ce232e73c21bb1
 SHA512:
-  metadata.gz: e8383d80757e294e21277deade67ee1b05b1760918b3b2ef6b76478959244a6b1b39e682630b68b876f87371121df9cc4dc8a6a0db5954bda84ab61346b8101a
-  data.tar.gz: 0a69d98a867405f44dccf7406cc1cd9a9a1e82b2eb2bf5eb979e284ea89aa28878118a75df83ff6e8c36e44b559b6d795fa00aab7ff1198655e1549f65a36da2
+  metadata.gz: 9a0c730e84290e6f18afa19c5446d98e75fee8a2966229812d7e372e6e3dd9e38909c5f6c447ef8af9c807645b936248b50086709cce7f7df301e02536b60aef
+  data.tar.gz: c3e99d26db139acc25fc259449e6ba7344c9e788bd595ad6744a408ff7e5da253d07f00dc0a57a8036e464dc8c6f3763f07327fb137dddfd2be49f7aa37bcadb

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.5

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    imagetools (1.1.0)
+    imagetools (1.4.0)
       rmagick (= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.14.0)
-    rake (13.0.1)
+    minitest (5.15.0)
+    rake (13.0.6)
     rmagick (3.2.0)
 
 PLATFORMS
@@ -21,4 +21,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/lib/imagetools/imagefilter.rb

@@ -44,22 +44,26 @@ module Imagetools
   end
   
   class Imagefilter
-    OTHER_JPG_SEARCH = /\.(large|huge|jpg_large)$/i
+    OTHER_JPG_SEARCH = /\.(large|huge|jpg_large|JPG)$/i
     OTHER_JPG_REPLACE = '.jpg'
     
     CONVERT_CMD = "convert"
     DWEBP_CMD = "dwebp"
-    RESIZE_CMD = "mogrify -resize 1280x\\> "
+    #    RESIZE_CMD = "mogrify -resize 1280x\\> "
+    RESIZE_CMD = "mogrify -background white -resize 1280x\\> "    
     ROTATE_CMD = "exiftran -ai "
     COMPRESS_CMD = "jpegoptim --strip-all --max=90 "
     EXTERNAL_CMDS = [RESIZE_CMD, ROTATE_CMD, COMPRESS_CMD]
 
     WEBP_SEARCH = /(.+)\.webp/i
-    WEBP_REPLACE = '\1.jpg'
+    WEBP_REPLACE = '\1.png'
     
     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)
@@ -133,7 +137,7 @@ EOM
       filename.sub(OTHER_JPG_SEARCH, OTHER_JPG_REPLACE)
     end
 
-    def self.replace_webp2jpg(filename)
+    def self.replace_webp2png(filename)
       filename.sub(WEBP_SEARCH, WEBP_REPLACE)
     end
     
@@ -141,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
@@ -171,10 +179,10 @@ EOM
       if exclude_image?(filepath)
         return
       end
-      
       filepath = rename_image(filepath)
-      filepath = webp2jpg(filepath)
+      filepath = webp2png(filepath)
       filepath = png2jpg(filepath)
+      filepath = heic2jpg(filepath)      
       filepath = resize_jpg(filepath)
       filepath = rotate_jpg(filepath)
       filepath = compress_jpg(filepath)
@@ -199,13 +207,16 @@ EOM
       dir = File.dirname(filepath)
       topath = File.join(dir, toname)
       puts "rename: #{filepath} => #{topath}"
-      FileUtils.mv(filepath, topath) unless @opts[:n]
+      #      FileUtils.mv(filepath, topath, :force => true) unless @opts[:n]
+      # aaa.JPG => aaa.jpgを成功させるためにFIleUtils.mv(same fileエラーがでる)ではなくmvを使う
+      cmd = "mv \"#{filepath}\" \"#{topath}\""
+      system(cmd)
       return topath
     end
 
-    def webp2jpg(filepath)
+    def webp2png(filepath)
       fromname = File.basename(filepath)
-      toname = self.class.replace_webp2jpg(fromname)
+      toname = self.class.replace_webp2png(fromname)
       return filepath if fromname == toname
 
       dir = File.dirname(filepath)
@@ -235,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.1.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagetools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Image Tools.