imagetools 1.4.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c695900493f7e008bd7a71202f740d8cf7934017cc4dbd554102e52c45d68be5
-  data.tar.gz: 9d0085886aac557e3da673d47258a30bf5c8ebcee4d77ad641ce232e73c21bb1
+  metadata.gz: f128fc1b72a58b40adbbba6c9c078cd5005d14c230134692c6d9237c2a35bc54
+  data.tar.gz: 38f28d503272cd72386ceb7f67b0201f6431adbf861ddfac4e96787467140440
 SHA512:
-  metadata.gz: 9a0c730e84290e6f18afa19c5446d98e75fee8a2966229812d7e372e6e3dd9e38909c5f6c447ef8af9c807645b936248b50086709cce7f7df301e02536b60aef
-  data.tar.gz: c3e99d26db139acc25fc259449e6ba7344c9e788bd595ad6744a408ff7e5da253d07f00dc0a57a8036e464dc8c6f3763f07327fb137dddfd2be49f7aa37bcadb
+  metadata.gz: 45346fcff77ae87676bb73a1cf7d622dfbcc14e90cabf114e2d123e4792ab9b175808a4cb0eb9412db6f600984e8973158e1406e804704c70e5ff08477dbbad2
+  data.tar.gz: c2ef3862385e14409f88dbe169248d3f624e2fbfd789ea63ef679c1826ad119461dbde03a38912886cec06a24e21dc1d9e0438f13fe275006e9aab4028a6bdd7

data/.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

data/.idea/workspace.xml

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="b197c64f-57f8-4389-ab8d-dc9fe3cb05ba" name="Default" comment="">
-      <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.gemspec" beforeDir="false" afterPath="$PROJECT_DIR$/imagetools.gemspec" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/imagetools.iml" beforeDir="false" afterPath="$PROJECT_DIR$/imagetools.iml" afterDir="false" />
-    </list>
+    <list default="true" id="b197c64f-57f8-4389-ab8d-dc9fe3cb05ba" name="Default" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -32,7 +27,6 @@
   <component name="ProjectId" id="1YvZY4FKb8fv8Y6MWahnStNLEFS" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
@@ -42,12 +36,17 @@
     <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="MemberChooser.sorted" value="false" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.0" />
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
   </component>
   <component name="RunManager">
@@ -73,11 +72,12 @@
       <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
       <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
       <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
-      <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_FORKED_COVERAGE="true">
         <COVERAGE_PATTERN ENABLED="true">
           <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
         </COVERAGE_PATTERN>
       </EXTENSION>
+      <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
       <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$PROJECT_DIR$/exe/iconcreator" />
       <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
       <method v="2">
@@ -103,6 +103,7 @@
       </method>
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="false" RAILS_SPRING_PRE_LOADER_OPTION="false" />
   <component name="SvnConfiguration">
     <configuration />
@@ -115,6 +116,7 @@
       <updated>1570340432394</updated>
       <workItem from="1570340436196" duration="217000" />
       <workItem from="1583825074054" duration="96000" />
+      <workItem from="1646719315550" duration="10000" />
     </task>
     <servers />
   </component>
@@ -131,12 +133,6 @@
       </list>
     </option>
   </component>
-  <component name="WindowStateProjectService">
-    <state x="100" y="123" width="1720" height="977" key="DiffContextDialog" timestamp="1583825160786">
-      <screen x="0" y="23" width="1920" height="1177" />
-    </state>
-    <state x="100" y="123" width="1720" height="977" key="DiffContextDialog/-1920.23.1920.1177/0.23.1920.1177@0.23.1920.1177" timestamp="1583825160786" />
-  </component>
   <component name="masterDetails">
     <states>
       <state key="ProjectJDKs.UI">

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.0.2

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    imagetools (1.4.0)
-      rmagick (= 3.2.0)
+    imagetools (1.5.2)
+      rmagick
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.15.0)
     rake (13.0.6)
-    rmagick (3.2.0)
+    rmagick (4.2.4)
 
 PLATFORMS
   ruby
@@ -21,4 +21,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.1.4
+   2.3.8

data/exe/imageblog

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'imagetools/imageblog'
+
+Imagetools::Imageblog.run(ARGV)

data/imagetools.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_dependency "rmagick", "3.2.0"
+  spec.add_dependency "rmagick"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/imagetools.iml

@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="rbenv: 2.6.5" jdkType="RUBY_SDK" />
+    <orderEntry type="jdk" jdkName="rbenv: 3.0.2" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="minitest (vbundled(5.14.0)) [path][gem]" type="rubylib">

data/lib/imagetools/imageblog.rb

@@ -0,0 +1,148 @@
+# coding: utf-8
+# imagehugo: hugo用の画像処理。リネームとサムネイル&アイキャッチ画像の生成。
+
+require 'imagetools/version'
+require 'imagetools/imagefilter'
+require 'rmagick'
+require 'optparse'
+require 'fileutils'
+
+module Imagetools
+  class ImageItem
+    attr_accessor :srcfile, :dstfile, :outfile
+    def to_s
+      "#{srcfile}=>#{dstfile}=>#{outfile}"
+    end
+  end
+  
+  class Imageblog
+    def self.run(argv)
+      STDOUT.sync = true
+      opts = {}
+      opt = OptionParser.new(argv)
+      opt.version = VERSION
+      opt.banner = "Usage: #{opt.program_name} [-h|--help] <dir> or <image1 image2 image3 ...>"
+      opt.separator('')
+      opt.separator("Examples:")
+      opt.separator("    #{opt.program_name} ~/tmp # concat two recent IMG_*jpg images.")
+      opt.separator("    #{opt.program_name} image1.jpg image2.jpg image3.jpg  # concat specified images.")
+      opt.separator('')      
+      opt.separator("Options:")
+      opt.on_head('-h', '--help', 'Show this message') do |v|
+        puts opt.help
+        exit       
+      end
+      opt.on('-v', '--verbose', 'Verbose message') {|v| opts[:v] = v}
+      opt.on('--dry-run', 'Message only') {|v| opts[:dry_run] = v}
+      opt.on('-o OUTDIR', '--output=OUTDIR', 'Output dir') {|v| opts[:o] = v}
+      opt.on('-n NUM', '--number=NUM', 'Process image number') {|v| opts[:n] = v.to_i}
+      opt.on('-b BASENAME', '--base=BASENAME', 'Output file basename') {|v| opts[:b] = v} 
+      opt.parse!(argv)
+      opts[:b] ||= Time.now.strftime("%Y%m%d")
+      dir, image_files = get_image_files(opts, argv)
+      if image_files.size == 0
+        puts opt.help
+        exit        
+      end
+      command = Imageblog.new(opts)
+      command.run(dir, image_files)
+    end
+
+    def self.get_image_files(opts, argv)
+      image_files = []
+      # ディレクトリが処理対象かどうかを決める
+      dir = nil
+      if argv.size == 1
+        # 引き数が1個の場合は最初の引き数
+        path = File.expand_path(argv[0])
+        if FileTest.directory?(path)
+          dir = path
+        end
+      elsif argv.size == 0
+        # 引き数がない場合カレントディレクトリ
+        dir = File.expand_path('.')
+      end
+      if dir
+        concat_number = opts[:n] || 2
+        # ディレクトリが指定されていた場合、指定ディレクトリ内のIMG_ファイルの最新n個を対象とする
+        # 最新の基準は(ファイル名基準)
+        match_files = Dir.glob("#{dir}/*.{jpg,jpeg,png}", File::FNM_CASEFOLD).sort
+#        match_files.sort {|a, b|
+#          File.mtime(a) <=> File.mtime(b)
+#        }
+        # 後ろからn個を取得(小さい方の数とする)
+        count = [match_files.size, concat_number].min
+        image_files = match_files[-count..-1]
+      else
+        # それ以外は指定された引き数を全て対象とする
+        argv.each do |arg|
+          arg = File.expand_path(arg)
+          dir = File.dirname(arg)
+          if FileTest.file?(arg) && (arg =~ /\.jpe?g$/i || arg =~ /\.png/i)
+            image_files << arg
+          end
+        end
+      end
+      return dir, image_files
+    end
+
+    def initialize(opts)
+      @opts = opts
+    end
+
+
+    def run(dir, image_files)
+      outdir = dir
+      if @opts[:o]
+        outdir = @opts[:o]
+      end
+      rename_images(image_files, outdir)
+#      concat_images(image_files, output_path)        
+    end
+
+    private
+    def rename_images(image_files, outdir)
+      # サムネイルはhoge_0.jpg
+      # アイキャッチはhoge_1.jpg hoge_2.jpg以降が通常の画像
+      items = []
+      thumbnal_item = nil # hoge_0.jpgとする
+      image_files.each_with_index do |image_file, index|
+        item = ImageItem.new
+        item.srcfile = image_file
+
+        src_basename = File.basename(image_file)
+        extname = File.extname(src_basename)
+        dst_basename = @opts[:b]
+
+        item.dstfile = File.join(outdir, "#{dst_basename}_#{index + 1}#{extname}")
+        if index == 0
+          thumbnal_item = ImageItem.new
+          thumbnal_item.srcfile = image_file
+          thumbnal_item.dstfile = File.join(outdir, "#{dst_basename}_0#{extname}")
+        end
+        items << item
+      end
+      items.each do |item|
+        FileUtils.cp(item.srcfile, item.dstfile)
+      end
+      FileUtils.cp(thumbnal_item.srcfile, thumbnal_item.dstfile)
+
+      #フィルタ実行
+      config = Config.new
+      config.init_default
+      opts = {}
+      filter = Imagefilter.new(opts, config)
+      items.each do |item|
+        item.outfile = filter.run(item.dstfile)
+      end
+      
+
+      # サムネイル
+      config.resize_width = 400
+      filter = Imagefilter.new(opts, config)
+      thumbnal_item.outfile = filter.run(thumbnal_item.dstfile)
+      
+    end
+  end
+end
+    

data/lib/imagetools/imageconcat.rb

@@ -26,7 +26,7 @@ module Imagetools
       opt.on('-v', '--verbose', 'Verbose message') {|v| opts[:v] = v}
       opt.on('--dry-run', 'Message only') {|v| opts[:dry_run] = v}
       opt.on('-o OUTNAME', '--output=OUTNAME', 'Output file') {|v| opts[:o] = v}
-      opt.on('-n NUM', '--number=NUM', 'Cancat image Number') {|v| opts[:n] = v.to_i}
+      opt.on('-n NUM', '--number=NUM', 'Concat image number') {|v| opts[:n] = v.to_i}
       opt.parse!(argv)
       image_files = get_image_files(opts, argv)
       if image_files.size < 2
@@ -89,14 +89,22 @@ module Imagetools
     def concat_images(image_files, output_file)
       puts image_files.join("+") + "=#{output_file}"
 
+      # 結果の画像リスト
       result_image_list = Magick::ImageList.new
+      
       image_files.each do |image_file|
-        #background_colorとflatten_imagesを組み合わせて背景色を指定
-        image_list = Magick::ImageList.new(image_file) {self.background_color = 'white'}
+        # 個別画像の背景色を白に変換
+        # 一気に行く方法がないので、ImageListを作成しbackground_colorとflatten_imagesを組み合わる。
+        #        image_list = Magick::ImageList.new(image_file) {self.background_color = 'white'}
+        # 2022/03/24「passing a block without an image argument is deprecate」対策。 https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md RMagick 4.2.0
+        image_list = Magick::ImageList.new(image_file) {|image| image.background_color = 'white'} 
         image = image_list.flatten_images
+
+        # 結果の画像リストに追加
         result_image_list << image
       end
-      
+
+      #append(false)で横方向に結合
       result = result_image_list.append(false)      
 
       width = result.columns

data/lib/imagetools/imagefilter.rb

@@ -9,20 +9,45 @@ module Imagetools
   class Config
     FILENAME_SEARCH = 's (\d+)-(\d+)-(\d+) (\d+)\.(\d+)\.(\d+)'
     FILENAME_REPLACE = 's_\1\2\3_\4\5\6'
+    RESIZE_WIDTH = 1280
+
+    def self.create_from_yaml(yaml)
+      config = Config.new
+      config.filename_search1 = config_value(yaml, "filename", "search1", false)
+      config.filename_replace1 = config_value(yaml, "filename", "replace1", false)
+      config.filename_search2 = config_value(yaml, "filename", "search2", false)
+      config.filename_replace2 = config_value(yaml, "filename", "replace2", false)
+      config.filename_search3 = config_value(yaml, "filename", "search3", false)
+      config.filename_replace3 = config_value(yaml, "filename", "replace3", false)
+      config.resize_width = config_value(yaml, "resize", "width", false)
+      config.init_default
+      config
+    end
+
+
+    def self.config_value(yaml, section, key, require)
+      return nil unless yaml
+      return nil unless yaml[section]
+      value = yaml[section][key]
+      if require && (value.nil? || value.empty?)
+        raise RuntimeError, "#{section}:#{key}: is empty"
+      end
+      value
+    end        
     
-    def initialize(yaml)
-      @yaml = yaml
-      @filename_search1 = config_value("filename", "search1", false) || FILENAME_SEARCH
-      @filename_replace1 = config_value("filename", "replace1", false) || FILENAME_REPLACE
-      @filename_search2 = config_value("filename", "search2", false)
-      @filename_replace2 = config_value("filename", "replace2", false)
-      @filename_search3 = config_value("filename", "search3", false)
-      @filename_replace3 = config_value("filename", "replace3", false) 
+    def initialize
     end
 
-    attr_reader :filename_search1, :filename_replace1,
-                :filename_search2, :filename_replace2,
-                :filename_search3, :filename_replace3 
+    def init_default
+      @filename_search1 ||= FILENAME_SEARCH
+      @filename_replace1 ||= FILENAME_REPLACE
+      @resize_width ||= RESIZE_WIDTH      
+    end
+
+    attr_accessor :filename_search1, :filename_replace1,
+                  :filename_search2, :filename_replace2,
+                  :filename_search3, :filename_replace3
+    attr_accessor :resize_width
 
     def filename_patterns
       [
@@ -31,16 +56,6 @@ module Imagetools
         [@filename_search3, @filename_replace3],  
       ]
     end
-    
-    private
-    def config_value(section, key, require)
-      return nil unless @yaml
-      value = @yaml[section][key]
-      if require && (value.nil? || value.empty?)
-        raise RuntimeError, "#{section}:#{key}: is empty"
-      end
-      value
-    end    
   end
   
   class Imagefilter
@@ -49,8 +64,7 @@ module Imagetools
     
     CONVERT_CMD = "convert"
     DWEBP_CMD = "dwebp"
-    #    RESIZE_CMD = "mogrify -resize 1280x\\> "
-    RESIZE_CMD = "mogrify -background white -resize 1280x\\> "    
+    RESIZE_CMD = "mogrify -background white -resize %dx\\> "
     ROTATE_CMD = "exiftran -ai "
     COMPRESS_CMD = "jpegoptim --strip-all --max=90 "
     EXTERNAL_CMDS = [RESIZE_CMD, ROTATE_CMD, COMPRESS_CMD]
@@ -99,7 +113,7 @@ EOM
       if FileTest.file?(config_file)
         yaml = YAML.load_file(config_file)
       end
-      config = Config.new(yaml)
+      config = Config.create_from_yaml(yaml)
       if opts[:t]
         ret = selftest
         exit(ret)
@@ -269,7 +283,8 @@ EOM
         return filepath 
       end
       puts "resize: #{filepath}"
-      cmd = "#{RESIZE_CMD} \"#{filepath}\""
+      resize_cmd = sprintf(RESIZE_CMD, @config.resize_width)
+      cmd = "#{resize_cmd} \"#{filepath}\""
       system(cmd)
       return filepath
     end

data/lib/imagetools/version.rb

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

data/test_imageblog.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+bundle exec ruby exe/imageblog "$@"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: imagetools
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.2
 platform: ruby
 authors:
 - src
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,7 @@ email:
 executables:
 - iconcreator
 - iconextractor
+- imageblog
 - imageburst
 - imageconcat
 - imagefilter
@@ -86,6 +87,7 @@ files:
 - ".idea/inspectionProfiles/Project_Default.xml"
 - ".idea/misc.xml"
 - ".idea/modules.xml"
+- ".idea/runConfigurations.xml"
 - ".idea/vcs.xml"
 - ".idea/workspace.xml"
 - ".ruby-version"
@@ -102,6 +104,7 @@ files:
 - build.sh
 - exe/iconcreator
 - exe/iconextractor
+- exe/imageblog
 - exe/imageburst
 - exe/imageconcat
 - exe/imagefilter
@@ -113,6 +116,7 @@ files:
 - lib/imagetools.rb
 - lib/imagetools/iconcreator.rb
 - lib/imagetools/iconextractor.rb
+- lib/imagetools/imageblog.rb
 - lib/imagetools/imageburst.rb
 - lib/imagetools/imageconcat.rb
 - lib/imagetools/imagefilter.rb
@@ -142,12 +146,19 @@ files:
 - sample/demo/demo/Base.lproj/Main.storyboard
 - sample/demo/demo/Info.plist
 - sample/demo/demo/ViewController.swift
+- sample/hugo_dst/1200x400.png
+- sample/hugo_dst/1200x800.png
+- sample/hugo_dst/600x200.png
+- sample/hugo_src/0000.png
+- sample/hugo_src/0001.png
+- sample/hugo_src/0002.png
 - sample/icon.png
 - sample/icon.sketch
 - sample_iconcreator.sh
 - test.sh
 - test_iconcreator.sh
 - test_iconextractor.sh
+- test_imageblog.sh
 - test_imageburst.sh
 - test_imageconcat.sh
 - test_imagefilter.sh
@@ -156,7 +167,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Image Tools.
 test_files: []