multi_exiftool 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da035005cfd8b951a7cc60ecd7e1675ab9652d020f3b067ac6a3c8cd656f5a4
-  data.tar.gz: 913ebcb588e47bbd3a0d3ea7f8cfadba69cfd996be7508b1348f59833f719f3c
+  metadata.gz: f5e0da6a6777fec53fcab69c4b0820b6c4ed0de051f52f6954c0b4ed77aed3d3
+  data.tar.gz: 1f5990491326fd50822a5b53ff0fd7e772e5ee778a870a789baaf9d714b15246
 SHA512:
-  metadata.gz: 29779137c5f5b6a4548373955f10b6ed0621001e0dcebc5779d79023a54ed35189f3bd52a29f910f2be6b88204bb77ae7084d59e7db3ac3e2058b618f875a025
-  data.tar.gz: 731d597e9d15160b8b3c0fed87e287f5d33ef3cb2f11184f1d16d8fe13e1a5bee0eecde4c1d49cddfe293d42f4da79d6865ceb37b8833198919f5bbee9e78260
+  metadata.gz: d0eb9046eaeed06017ce13fce678d00243ffb79c17cc4592b3ad4d41e79ec38e903e09432a9857db79c27e61ac34aa1c45086d9f3b6b09db3b15b72015be2d87
+  data.tar.gz: faf64b4908f2ed242d32e3d80920628b10a3618c021a643be158d80463f79561c0d0a798ef3eb356ec44ba47384d5bb3976b1b3e0f4b36c8d0dd8fa379590e31

data/Changelog

@@ -1,3 +1,8 @@
+0.18.0
+Adapt handling of errors. Only lines in STDERR which starts with "Error:" or
+"Warning:" are now interpreted as error messages. Therefore ExifTool 11.10 is
+now the minimal supported version.
+
 0.17.1
 Maintenance release: update Ruby versions for CI.
 

data/README.md

@@ -199,12 +199,9 @@ The method Values#convert is called each time a value is fetched.
 ## Requirements
 
 - Ruby 1.9.1 or higher
-- An installation of the ExifTool command-line application (version 7.65 or
+- An installation of the ExifTool command-line application (version 11.10 or
 higher). Instructions for installation you can find under
 https://exiftool.org/install.html .
-- If you have problems with special characters (like German umlauts) in
-filenames on windows system it is recommended to use exiftool version 9.79
-or higher.
 
 ## Installation
 

data/Rakefile

@@ -18,14 +18,14 @@ Rim.setup do |p|
   p.homepage = 'https://github.com/janfri/multi_exiftool'
   p.install_message = %q{
 +-----------------------------------------------------------------------+
-| Please ensure you have installed exiftool version 7.65 or higher and  |
+| Please ensure you have installed exiftool version 11.10 or higher and |
 | it's found in your PATH (Try "exiftool -ver" on your commandline).    |
 | For more details see                                                  |
-| https://exiftool.org/install.html             |
+| https://exiftool.org/install.html                                     |
 +-----------------------------------------------------------------------+
   }
   p.development_dependencies << %w(contest ~>0.1)
   p.development_dependencies << 'test-unit'
-  p.requirements << 'exiftool, version 7.65 or higher'
+  p.requirements << 'exiftool, version 11.10 or higher'
   p.test_warning = false
 end

data/lib/multi_exiftool/batch.rb

@@ -30,13 +30,6 @@ module MultiExiftool
       @writers.map {|w| w.exiftool_args + ['-execute']}.flatten
     end
 
-    private
-
-    def parse_results
-      @errors = @stderr.read.split(/\n/)
-      @errors.empty?
-    end
-
   end
 
 end

data/lib/multi_exiftool/executable.rb

@@ -72,6 +72,15 @@ module MultiExiftool
       stdin.close
     end
 
+    def parse_results
+      parse_errors
+      @errors.empty?
+    end
+
+    def parse_errors
+      @errors = @stderr.read.lines(chomp: true).select {|l| l =~ /^(Error|Warning):/}
+    end
+
   end
 
 end

data/lib/multi_exiftool/reader.rb

@@ -29,11 +29,7 @@ module MultiExiftool
     end
 
     def self.mandatory_args
-      if MultiExiftool.exiftool_version >= 9.79
-        %w(-J -charset FileName=utf8 -charset utf8)
-      else
-        %w(-J -charset utf8)
-      end
+      %w(-J -charset FileName=utf8 -charset utf8)
     end
 
     # Options to use with the exiftool command.
@@ -73,9 +69,8 @@ module MultiExiftool
     end
 
     def parse_results
+      parse_errors
       stdout = @stdout.read
-      error_string = @stderr.read.gsub(/^ .*$/, '')
-      @errors = error_string.split(/\n/)
       json = JSON.parse(stdout)
       json.map {|values| Values.new(values)}
     rescue JSON::ParserError

data/lib/multi_exiftool/writer.rb

@@ -20,11 +20,7 @@ module MultiExiftool
     end
 
     def self.mandatory_args
-      if MultiExiftool.exiftool_version >= 9.79
-        %w(-charset FileName=utf8 -charset utf8)
-      else
-        %w(-charset utf8)
-      end
+      %w(-charset FileName=utf8 -charset utf8)
     end
 
     # Options to use with the exiftool command.
@@ -71,11 +67,6 @@ module MultiExiftool
       res.flatten
     end
 
-    def parse_results
-      @errors = @stderr.read.split(/\n/)
-      @errors.empty?
-    end
-
   end
 
 end

data/lib/multi_exiftool.rb

@@ -8,7 +8,7 @@ require_relative 'multi_exiftool/batch'
 
 module MultiExiftool
 
-  VERSION = '0.17.1'
+  VERSION = '0.18.0'
 
   @exiftool_command = 'exiftool'
 

data/multi_exiftool.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: multi_exiftool 0.17.1 ruby lib
+# stub: multi_exiftool 0.18.0 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,21 +7,21 @@
 
 Gem::Specification.new do |s|
   s.name = "multi_exiftool"
-  s.version = "0.17.1"
+  s.version = "0.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jan Friedrich"]
-  s.date = "2023-10-06"
+  s.date = "2024-04-04"
   s.description = "This library is a wrapper for the ExifTool command-line application (https://exiftool.org) written by Phil Harvey. It is designed for dealing with multiple files at once by creating commands to call exiftool with various arguments, call it and parsing the results."
   s.email = "janfri26@gmail.com"
   s.files = ["./.aspell.pws", "Changelog", "Gemfile", "LICENSE", "README.md", "Rakefile", "lib/multi_exiftool", "lib/multi_exiftool.rb", "lib/multi_exiftool/batch.rb", "lib/multi_exiftool/executable.rb", "lib/multi_exiftool/reader.rb", "lib/multi_exiftool/values.rb", "lib/multi_exiftool/writer.rb", "multi_exiftool.gemspec", "regtest/read_all_tags.rb", "regtest/read_all_tags.yml", "regtest/test.jpg", "test/data", "test/data/a.jpg", "test/data/b.jpg", "test/data/c.jpg", "test/data/example.config", "test/helper.rb", "test/test_batch.rb", "test/test_executable.rb", "test/test_exiftool_stuff.rb", "test/test_functional_api.rb", "test/test_reader.rb", "test/test_values.rb", "test/test_values_using_groups.rb", "test/test_writer.rb", "test/test_writer_groups.rb"]
   s.homepage = "https://github.com/janfri/multi_exiftool"
   s.licenses = ["MIT"]
-  s.post_install_message = "\n+-----------------------------------------------------------------------+\n| Please ensure you have installed exiftool version 7.65 or higher and  |\n| it's found in your PATH (Try \"exiftool -ver\" on your commandline).    |\n| For more details see                                                  |\n| https://exiftool.org/install.html             |\n+-----------------------------------------------------------------------+\n  "
+  s.post_install_message = "\n+-----------------------------------------------------------------------+\n| Please ensure you have installed exiftool version 11.10 or higher and |\n| it's found in your PATH (Try \"exiftool -ver\" on your commandline).    |\n| For more details see                                                  |\n| https://exiftool.org/install.html                                     |\n+-----------------------------------------------------------------------+\n  "
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.requirements = ["exiftool, version 7.65 or higher"]
-  s.rubygems_version = "3.5.0.dev"
+  s.requirements = ["exiftool, version 11.10 or higher"]
+  s.rubygems_version = "3.6.0.dev"
   s.summary = "This library is a wrapper for the ExifTool command-line application (https://exiftool.org)."
 
   s.specification_version = 4

data/regtest/read_all_tags.yml

@@ -4,10 +4,10 @@ result:
 - - !ruby/object:MultiExiftool::Values
     values:
       sourcefile: regtest/test.jpg
-      exiftoolversion: 12.0
+      exiftoolversion: 12.26
       filename: test.jpg
       directory: regtest
-      filesize: 43 kB
+      filesize: 43 KiB
       filetype: JPEG
       filetypeextension: jpg
       mimetype: image/jpeg

data/test/test_functional_api.rb

@@ -135,7 +135,7 @@ class TestFunctionalApi < Test::Unit::TestCase
       run_in_temp_dir do
         values = {orientation: 2}
         errors = MultiExiftool.write(@filenames, values)
-        assert_equal ["Warning: Can't convert IFD0:Orientation (matches more than one PrintConv)", "Nothing to do."], errors
+        assert_equal ["Warning: Can't convert IFD0:Orientation (matches more than one PrintConv)"], errors
         errors = MultiExiftool.write(@filenames, values, numerical: true)
         assert errors.empty?
       end
@@ -188,13 +188,11 @@ class TestFunctionalApi < Test::Unit::TestCase
     test 'error if tags do not exist' do
       run_in_temp_dir do
         errors = MultiExiftool.delete_values(@filenames, tags: %w[foo bar])
-        err1, err2, err3 = errors
-        expected1 = /^Warning: Tag 'foo' is not (defined|supported)$/
-        expected2 = /^Warning: Tag 'bar' is not (defined|supported)$/
-        expected3 = 'Nothing to do.'
+        err1, err2 = errors
+        expected1 = /^Warning: Tag 'foo' is not defined$/
+        expected2 = /^Warning: Tag 'bar' is not defined$/
         assert_match expected1, err1
         assert_match expected2, err2
-        assert_equal expected3, err3
       end
     end
 

data/test/test_reader.rb

@@ -101,11 +101,7 @@ class TestReader < Test::Unit::TestCase
         @reader.filenames = %w(non_existing_file)
         res = @reader.read
         assert_equal [], res
-        if MultiExiftool.exiftool_version < 11.10
-          assert_equal ['File not found: non_existing_file'], @reader.errors
-        else
-          assert_equal ['Error: File not found - non_existing_file'], @reader.errors
-        end
+        assert_equal ['Error: File not found - non_existing_file'], @reader.errors
       end
     end
 
@@ -115,11 +111,7 @@ class TestReader < Test::Unit::TestCase
         @reader.tags = %w(fnumber foo)
         res = @reader.read
         assert_equal [5.6], res.map {|e| e['FNumber']}
-        if MultiExiftool.exiftool_version < 11.10
-          assert_equal ['File not found: xxx'], @reader.errors
-        else
-          assert_equal ['Error: File not found - xxx'], @reader.errors
-        end
+        assert_equal ['Error: File not found - xxx'], @reader.errors
       end
     end
 

data/test/test_writer.rb

@@ -123,11 +123,7 @@ class TestWriter < Test::Unit::TestCase
         @writer.values = {comment: 'foo', bar: 'x'}
         rc = @writer.write
         assert !rc
-        if MultiExiftool.exiftool_version >= 10.38
-          assert_equal ["Warning: Tag 'bar' is not defined", "Error: File not found - xxx"], @writer.errors
-        else
-          assert_equal ["Warning: Tag 'bar' is not supported", "Error: File not found - xxx"], @writer.errors
-        end
+        assert_equal ["Warning: Tag 'bar' is not defined", "Error: File not found - xxx"], @writer.errors
       end
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Jan Friedrich
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,10 +123,10 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: "\n+-----------------------------------------------------------------------+\n|
-  Please ensure you have installed exiftool version 7.65 or higher and  |\n| it's
+  Please ensure you have installed exiftool version 11.10 or higher and |\n| it's
   found in your PATH (Try \"exiftool -ver\" on your commandline).    |\n| For more
   details see                                                  |\n| https://exiftool.org/install.html
-  \            |\n+-----------------------------------------------------------------------+\n
+  \                                    |\n+-----------------------------------------------------------------------+\n
   \ "
 rdoc_options: []
 require_paths:
@@ -143,9 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- exiftool, version 7.65 or higher
-rubygems_version: 3.5.0.dev
-signing_key:
+- exiftool, version 11.10 or higher
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: This library is a wrapper for the ExifTool command-line application (https://exiftool.org).
 test_files: []