exiftool_vendored 10.25.0 → 10.31.0

data/bin/Image-ExifTool-10.31/config_files/fotoware.config

@@ -0,0 +1,114 @@
+#------------------------------------------------------------------------------
+# File:         fotoware.config
+#
+# Description:  This config file defines Fotoware XMP tags for writing.
+#
+# Notes:        Length limits are imposed according to Fotoware limitations when
+#               writing string values, but these may be disabled with the -n
+#               option or by adding a "#" to the tag name.  However, beware that
+#               longer strings may cause unpredictable results in Fotoware
+#               software.
+#
+#               Use of this file will not bring full Fotoware 'experience'.
+#               Fotostation writes these tags not only into XMP but also in IIM
+#               and even Exif spaces.  Communication with older Fotoware systems
+#               may be broken when using only XMP.
+#
+#               Also note that there are potential problems with character
+#               encoding on systems with mixed environments, depending on
+#               Fotoware software settings.
+#
+# Usage:        exiftool -config fotoware.config -FOTOWARETAG=VALUE FILE ...
+#
+# Requires:     ExifTool version 7.00 or later
+#
+# Revisions:    2012/09/19 - P. Harvey Created
+#               2016/09/24 - Mikolaj Machowski updated with new Fotostation tags
+#------------------------------------------------------------------------------
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::XMP::Main' => {
+        fwl => {
+            SubDirectory => { TagTable => 'Image::ExifTool::UserDefined::fwl' },
+        },
+        fwr => {
+            SubDirectory => { TagTable => 'Image::ExifTool::UserDefined::fwr' },
+        },
+        fwc => {
+            SubDirectory => { TagTable => 'Image::ExifTool::UserDefined::fwc' },
+        },
+        fwu => {
+            SubDirectory => { TagTable => 'Image::ExifTool::UserDefined::fwu' },
+        },
+    },
+);
+
+%Image::ExifTool::UserDefined::fwl = (
+    GROUPS           => { 0 => 'XMP', 1 => 'XMP-fwl', 2 => 'Image' },
+    NAMESPACE        => { 'fwl' => 'http://ns.fotoware.com/iptcxmp-legacy/1.0/' },
+    WRITABLE         => 'string',
+    # limit maximum lengths of string values
+    CreatedTime      => { PrintConvInv => 'substr($val,0,16)' },
+    EditStatus       => { PrintConvInv => 'substr($val,0,64)' },
+    FixtureIdentifier=> { PrintConvInv => 'substr($val,0,1024)' },
+    LocalCaption     => { PrintConvInv => 'substr($val,0,2000)' },
+    ObjectCycle      => { PrintConvInv => 'substr($val,0,32)' },
+    ProgramVersion   => { PrintConvInv => 'substr($val,0,10)' },
+    ReferenceNumber  => { PrintConvInv => 'substr($val,0,256)' },
+    ReferenceService => { PrintConvInv => 'substr($val,0,256)' },
+    ReferenceDate    => {
+        Groups => { 2 => 'Time' },
+        Writable => 'date',
+        Shift => 'Time',
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,undef,1)',
+    },
+    ReleaseDate    => {
+        Groups => { 2 => 'Time' },
+        Writable => 'date',
+        Shift => 'Time',
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,undef,1)',
+    },
+    ReleaseTime      => { PrintConvInv => 'substr($val,0,16)' },
+);
+
+%Image::ExifTool::UserDefined::fwr = (
+    GROUPS           => { 0 => 'XMP', 1 => 'XMP-fwr', 2 => 'Image' },
+    NAMESPACE        => { 'fwr' => 'http://ns.fotoware.com/iptcxmp-reserved/1.0/' },
+    WRITABLE         => 'string',
+    Classify         => { PrintConvInv => 'substr($val,0,256)' },
+    DocumentText     => { PrintConvInv => 'substr($val,0,2000)' },
+    Exif             => { PrintConvInv => 'substr($val,0,1024)' },
+    History          => { PrintConvInv => 'substr($val,0,256)' },
+    ImageNotes       => { PrintConvInv => 'substr($val,0,256)' },
+    JobId            => { PrintConvInv => 'substr($val,0,256)' },
+    OwnerId          => { PrintConvInv => 'substr($val,0,256)' },
+    ShortUniqeId     => { PrintConvInv => 'substr($val,0,256)' },
+    ContentValue     => { PrintConvInv => 'substr($val,0,256)' },
+    UniqueId         => { PrintConvInv => 'substr($val,0,256)' },
+    MasterDocumentId => { PrintConvInv => 'substr($val,0,256)' },
+);
+
+
+%Image::ExifTool::UserDefined::fwc = (
+    GROUPS        => { 0 => 'XMP', 1 => 'XMP-fwc', 2 => 'Image' },
+    NAMESPACE     => { 'fwc' => 'http://ns.fotoware.com/iptcxmp-custom/1.0/' },
+    WRITABLE      => 'string',
+    # generate CustomField1 through CustomField20 tags
+    map { 'CustomField' . $_ => {
+        PrintConvInv => 'substr($val,0,256)',
+    } } (1 .. 20),
+);
+
+%Image::ExifTool::UserDefined::fwu = (
+    GROUPS        => { 0 => 'XMP', 1 => 'XMP-fwu', 2 => 'Image' },
+    NAMESPACE     => { 'fwu' => 'http://ns.fotoware.com/iptcxmp-user/1.0/' },
+    WRITABLE      => 'string',
+    # generate UserDefined1 through UserDefined255 tags
+    map { 'UserDefined' . $_ => {
+        PrintConvInv => 'substr($val,0,256)',
+    } } (1 .. 255),
+);
+
+1;  #end

data/bin/Image-ExifTool-10.31/config_files/photoshop_paths.config

@@ -0,0 +1,105 @@
+#------------------------------------------------------------------------------
+# File:         photoshop_paths.config
+#
+# Description:  This config file generates user-defined tags for Photoshop
+#               paths, and may be used to extract path names and/or Bezier knot
+#               anchor points, or copy path information from one file to
+#               another.
+#
+#               The anchor points may be extracted along with the path names by
+#               setting the "Anchor" user parameter (ie. "-userparam anchor"),
+#               or by themselves with "AnchorOnly".
+#
+#               An "AllPaths" shortcut tag is also provided represent all
+#               Photoshop path tags.  This shortcut must be used when copying
+#               because these tags are marked as "Protected" so they won't be
+#               copied by default.
+#
+# Note:         Print conversion must be disabled to be able to copy these tags
+#               (via either the -n option, or by adding a "#" to the tag name,
+#               eg. "-tagsfromfile SRC -allpaths#").
+#
+# Usage:
+#
+#   1) Extract Photoshop path names:
+# 
+#      exiftool -config photoshop_paths.config -allpaths FILE
+#
+#   2) Extract Photoshop path names and anchor points:
+# 
+#      exiftool -config photoshop_paths.config -userparam anchor -allpaths FILE
+#
+#   3) Extract Photoshop path anchor points only:
+# 
+#      exiftool -config photoshop_paths.config -userparam anchoronly -allpaths FILE
+#
+#   4) Copy all Photoshop paths from one file (SRC) to another (DST):
+#
+#      exiftool -config photoshop_paths.config -tagsfromfile SRC -allpaths# DST
+#
+# Requires:     ExifTool version 9.95 or later
+#
+# Revisions:    2015/05/07 - P. Harvey Created
+#               2016/09/14 - PH Added feature to allow extracting anchor points
+#
+# References:   http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,1621.0.html
+#               http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3910.0.html
+#               http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,6647.0.html
+#------------------------------------------------------------------------------
+
+# Print Photoshop path name and/or anchor points
+# Inputs: 0) reference to Photoshop path data, 1) ExifTool object reference
+# Returns: String with name and/or Bezier knot anchor points
+sub PrintPath($)
+{
+    my ($val, $et) = @_;
+    my ($pos, $name, @rtn);
+    my $len = length($$val) - 26;
+
+    # recover exiftool-added path name if it exists
+    if ($$val =~ m{/#(.*?)#/$}s) {
+        $name = $1;
+        $len -= length($1) + 4;
+    } else {
+        $name = '<none>';
+    }
+    my $anchorOnly = $et->Options(UserParam => 'AnchorOnly');
+    push @rtn, $name unless $anchorOnly;
+
+    # loop through path points and extract anchor points if specified
+    if ($anchorOnly or $et->Options(UserParam => 'Anchor')) {
+        SetByteOrder('MM');
+        for ($pos=0; $pos<=$len; $pos+=26) {
+            my $type = Get16u($val, $pos);
+            # Bezier knot records are types 1, 2, 4 and 5
+            next unless {1=>1,2=>1,4=>1,5=>1}->{$type};
+            # the anchor point is at offset 10 in the Bezier knot record
+            # (fixed-point values with 24-bits after the decimal point)
+            my $y = Get32s($val, $pos+10) / 0x1000000;  # (vertical component first)
+            my $x = Get32s($val, $pos+14) / 0x1000000;
+            push @rtn, sprintf('(%g,%g)', $x, $y);
+        }
+    }
+    return join ' ', @rtn;
+}
+
+%Image::ExifTool::Shortcuts::UserDefined = (
+    # create "AllPaths" shortcut for all Photoshop path tags
+    AllPaths => [
+        map { sprintf "Path%x", $_ } (0x7d0 .. 0xbb5),
+    ],
+);
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::Photoshop::Main' => {
+        # generate tags for each of the 998 possible Photoshop paths
+        map { $_ => {
+            Name => sprintf('Path%x', $_),
+            Description => sprintf('Path %x', $_),
+            Flags => [ qw(Writable Protected Binary ConvertBinary SetResourceName) ],
+            PrintConv => \&PrintPath,
+        } } (0x7d0 .. 0xbb5),
+    },
+);
+
+1;  #end

data/bin/Image-ExifTool-10.31/config_files/time_zone.config

@@ -0,0 +1,56 @@
+#------------------------------------------------------------------------------
+# File:         time_zone.config
+#
+# Description:  ExifTool config file to return time zone from an image
+#
+# Notes:        The Composite:TimeZone tag defined here attempts to determine
+#               the time zone for an image.  If possible, the time zone for
+#               DateTimeOriginal is returned, but if this can't be determined
+#               then the time zone for CreateDate and then ModifyDate are used.
+#
+# Usage:        exiftool -config time_zone.config -timezone FILE
+#
+# Requires:     Any version of ExifTool
+#
+# Revisions:    2016/10/03 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::Composite' => {
+        FileName => {
+            Desire => {
+                0 => 'DateTimeOriginal',
+                1 => 'CreateDate',
+                2 => 'ModifyDate',
+                3 => 'GPSDateStamp',
+                4 => 'GPSTimeStamp',
+                5 => 'OffsetTimeOriginal',  # (DateTimeOriginal)
+                6 => 'OffsetTimeDigitized', # (CreateDate)
+                7 => 'OffsetTime',          # (ModifyDate)
+                8 => 'TimeZoneOffset',      # (ModifyDate)
+            },
+            RawConv => q{
+                return $val[5] if $val[5];
+                return $val[6] if $val[6];
+                return $val[7] if $val[7];
+                if (defined $val[8]) {
+                    my $tzh = $val[8];
+                    $tzh =~ s/ .*//;
+                    return TimeZoneString($tzh * 60);
+                }
+                if (defined $val[3] and defined $val[4]) {
+                    my $loc = $val[0] || $val[1] || $val[2];
+                    print "$loc\n";#TEST
+                    if ($loc) {
+                        my @loc = split /[: ]/, $loc;
+                        my @gmt = split /[: ]/, "$val[3] $val[4]";
+                        return TimeZoneString(GetTimeZone([@loc[5,4,3,2]], [@gmt[5,4,3,2]]));
+                    }
+                }
+                return undef;
+            },
+        },
+    },
+);
+
+1;  #end

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '10.25';
+my $version = '10.31';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -49,12 +49,14 @@ sub Infile($;$);
 sub AddSetTagsFile($;$);
 sub DoSetFromFile($$$);
 sub CleanFilename($);
+sub SetWindowTitle($);
 sub ProcessFiles($;$);
 sub ScanDir($$;$);
 sub FindFileWindows($$);
 sub FileNotFound($);
 sub PreserveTime();
 sub AbsPath($);
+sub MyConvertFileName($$);
 sub SuggestedExtension($$$);
 sub LoadPrintFormat($);
 sub FilenameSPrintf($;$@);
@@ -75,7 +77,7 @@ END {
 
 # declare all static file-scope variables
 my @commonArgs;     # arguments common to all commands
-my @csvFiles;       # list of files when reading with CSV option
+my @csvFiles;       # list of files when reading with CSV option (in ExifTool Charset)
 my @csvTags;        # order of tags for first file with CSV option (lower case)
 my @delFiles;       # list of files to delete
 my @dynamicFiles;   # list of -tagsFromFile files with dynamic names and -TAG<=FMT pairs
@@ -90,7 +92,7 @@ my @tags;           # list of tags to extract
 my %appended;       # list of files appended to
 my %created;        # list of files we created
 my %csvTags;        # lookup for all found tags with CSV option (lower case keys)
-my %database;       # lookup for database information based on file name
+my %database;       # lookup for database information based on file name (in ExifTool Charset)
 my %filterExt;      # lookup for filtered extensions
 my %ignore;         # directory names to ignore
 my %preserveTime;   # preserved timestamps for files
@@ -153,7 +155,8 @@ my $outOpt;         # output file or directory name
 my $overwriteOrig;  # flag to overwrite original file (1=overwrite, 2=in place)
 my $pause;          # pause before returning
 my $preserveTime;   # flag to preserve times of updated files (2=preserve FileCreateDate only)
-my $progress;       # progress count
+my $progress;       # flag to calculate total files to process (0=calculate but don't display)
+my $progressCount;  # count of files processed
 my $progressMax;    # total number of files to process
 my $progStr;        # progress message string
 my $quiet;          # flag to disable printing of informational messages / warnings
@@ -178,6 +181,7 @@ my $utf8;           # flag set if we are using UTF-8 encoding
 my $validFile;      # flag indicating we processed a valid file
 my $verbose;        # verbose setting
 my $vout;           # verbose output file reference (\*STDOUT or \*STDERR)
+my $windowTitle;    # title for console window
 my $xml;            # flag for XML-formatted output
 
 # flag to keep the input -@ argfile open:
@@ -187,6 +191,8 @@ my $xml;            # flag for XML-formatted output
 # 3 = waiting for -@ to switch to a new STAYOPEN argfile
 my $stayOpen = 0;
 
+my $curTitle = '';  # current window title
+
 # lookup for O/S names which may use a backslash as a directory separator
 # (ref File::Spec of PathTools-3.2701)
 my %hasBackslash = ( MSWin32 => 1, os2 => 1, dos => 1, NetWare => 1, symbian => 1, cygwin => 1 );
@@ -236,6 +242,22 @@ my %optArgs = (
     '-X' => 0,
 );
 
+my @recommends = qw(
+  Archive::Zip
+  Compress::Zlib
+  Digest::MD5
+  Digest::SHA
+  IO::Compress::Bzip2
+  Time::HiRes
+  POSIX::strptime
+  Unicode::LineBreak
+  IO::Compress::RawDeflate
+  IO::Uncompress::RawInflate
+  Win32::API
+  Win32::FindFile
+  Win32API::File
+);
+
 # exit routine
 sub Exit {
     if ($pause) {
@@ -279,6 +301,7 @@ sub Cleanup() {
     undef $tmpFile;
     undef $tmpText;
     PreserveTime() if %preserveTime;
+    SetWindowTitle('');
 }
 
 #------------------------------------------------------------------------------
@@ -390,6 +413,7 @@ undef $multiFile;
 undef $outOpt;
 undef $preserveTime;
 undef $progress;
+undef $progressCount;
 undef $progressMax;
 undef $recurse;
 undef $scanWritable;
@@ -403,6 +427,7 @@ undef $tmpFile;
 undef $tmpText;
 undef $validFile;
 undef $verbose;
+undef $windowTitle;
 
 $count = 0;
 $countBad = 0;
@@ -590,7 +615,18 @@ for (;;) {
         $pass or push(@nextPass,'-ver'), next;
         my $libVer = $Image::ExifTool::VERSION;
         my $str = $libVer eq $version ? '' : " [Warning: Library version is $libVer]";
-        print("$version$str$Image::ExifTool::RELEASE\n");
+        if ($verbose) {
+            print "ExifTool version $version$str$Image::ExifTool::RELEASE\n";
+            print "Platform: $^O\n";
+            print "Optional libraries:\n";
+            foreach (@recommends) {
+                next if /^Win32/ and $^O ne 'MSWin32';
+                my $ver = eval "require $_ and \$${_}::VERSION";
+                printf "  %-28s %s\n", $_, $ver || '(not installed)';
+            }
+        } else {
+            print "$version$str$Image::ExifTool::RELEASE\n";
+        }
         $helped = 1;
         next;
     }
@@ -646,10 +682,11 @@ for (;;) {
                 s/^\xef\xbb\xbf//;
                 $didBOM = 1;
             }
+            next if /^#/;   # ignore lines beginning with '#'
             s/^\s+//; s/[\x0d\x0a]+$//s; # remove leading white space and trailing newline
             # remove white space before, and single space after '=', '+=', '-=' or '<='
             s/^(-[-:\w]+#?)\s*([-+<]?=) ?/$1$2/;
-            push @newArgs, $_ unless $_ eq '' or /^#/;
+            push @newArgs, $_ unless $_ eq '';
         }
         close ARGFILE;
         unshift @ARGV, @newArgs;
@@ -946,9 +983,16 @@ for (;;) {
     }
     (/^P$/ or $a eq 'preserve') and $preserveTime = 1, next;
     /^password$/i and $mt->Options(Password => shift), next;
-    if ($a eq 'progress') {
-        $progress = 0;
-        $verbose = 0 unless defined $verbose;
+    if (/^progress(:.*)?/i) {
+        if ($1) {
+            $windowTitle = substr $1, 1;
+            $windowTitle = 'ExifTool %p%%' unless length $windowTitle;
+            $windowTitle =~ /%\d*[bpr]/ and $progress = 0 unless defined $progress;
+        } else {
+            $progress = 1;
+            $verbose = 0 unless defined $verbose;
+        }
+        $progressCount = 0;
         next;
     }
     /^q(uiet)?$/i and ++$quiet, next;
@@ -1588,24 +1632,14 @@ if (@fileOrder) {
 # set file count for progress message
 $progressMax = scalar @files if defined $progress;
 
-# store duplicate database information under absolute path,
-# and translate the filename character set if necessary
+# store duplicate database information under absolute path
 my @dbKeys = keys %database;
 if (@dbKeys) {
-    my $enc = $mt->Options('CharsetFileName');
-    if ($enc) {
-        foreach (@dbKeys) {
-            my $f = $mt->InverseFileName($_);
-            next if $f eq $_;
-            $database{$f} = $database{$_};
-            delete $database{$_};
-            $_ = $f;
-        }
-    }
     if (eval { require Cwd }) {
         undef $evalWarning;
         local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
         foreach (@dbKeys) {
+            # (punt on using ConvertFileName here, so $absPath may be a mix of encodings)
             my $absPath = AbsPath($_);
             if (defined $absPath) {
                 $database{$absPath} = $database{$_} unless $database{$absPath};
@@ -1694,8 +1728,8 @@ if (defined $deleteOrig) {
 # set error status if we had any errors or if all files failed the "-if" condition
 $rtnVal = 1 if $countBadWr or $countBadCr or $countBad or ($countFailed and not $count);
 
-# last ditch effort to preserve filemodifydate
-PreserveTime() if %preserveTime;
+# clean up after each command
+Cleanup();
 
 } # end "Command" loop ........................................................
 
@@ -1712,6 +1746,24 @@ sub GetImageInfo($$)
     my ($et, $orig) = @_;
     my (@foundTags, $info, $file, $ind);
 
+    # set window title for this file if necessary
+    if (defined $windowTitle) {
+        my $prog = $progressMax ? "$progressCount/$progressMax" : '0/0';
+        my $title = $windowTitle;
+        my ($num, $denom) = split '/', $prog;
+        my $frac = $num / ($denom || 1);
+        my $n = $title =~ s/%(\d+)b/%b/ ? $1 : 20;  # length of bar
+        my $bar = int($frac * $n + 0.5);
+        my %lkup = (
+            b => ('I' x $bar) . ('.' x ($n - $bar)), # (undocumented)
+            f => $orig,
+            p => int(100 * $frac + 0.5),
+            r => $prog,
+           '%'=> '%',
+        );
+        $title =~ s/%([%bfpr])/$lkup{$1}/eg;
+        SetWindowTitle($title);
+    }
     # determine the name of the source file based on the original input file name
     if (@srcFmt) {
         my ($fmt, $first);
@@ -1796,6 +1848,8 @@ sub GetImageInfo($$)
         }
         return;
     }
+    ++$seqFileNum;  # increment our file counter
+
     my $lineCount = 0;
     my ($fp, $outfile, $append);
     if ($textOut and $verbose and not $tagOut) {
@@ -1986,17 +2040,18 @@ sub GetImageInfo($$)
                 # set delimiters for JSON or PHP output
                 ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
                 print $fp ",\n" if $comma;
-                print $fp qq($bra\n  "SourceFile"$sep ), EscapeJSON($mt->ConvertFileName($file, 1));
+                print $fp qq($bra\n  "SourceFile"$sep ), EscapeJSON(MyConvertFileName($et,$file));
                 $comma = 1;
                 $ind = (defined $showGroup and not $allGroup) ? '    ' : '  ';
             } elsif ($csv) {
-                $database{$file} = \%csvInfo;
-                push @csvFiles, $file;
+                my $file2 = MyConvertFileName($et, $file);
+                $database{$file2} = \%csvInfo;
+                push @csvFiles, $file2;
             }
         }
         # suppress duplicates manually in JSON and short XML output
         my $noDups = ($json or ($xml and $outFormat > 0));
-        my $printConv = $mt->Options('PrintConv');
+        my $printConv = $et->Options('PrintConv');
         my $lastGroup = '';
 TAG:    foreach $tag (@foundTags) {
             my $tagName = GetTagName($tag);
@@ -2080,7 +2135,7 @@ TAG:    foreach $tag (@foundTags) {
                         }
                         next TAG;
                     }
-                    my @groups = $mt->GetGroup($tag);
+                    my @groups = $et->GetGroup($tag);
                     $outfile and close($fp), undef($tmpText); # (shouldn't happen)
                     ($fp, $outfile, $append) = OpenOutputFile($orig, $tagName, \@groups, $ext);
                     $fp or ++$countBad, next TAG;
@@ -2382,8 +2437,11 @@ sub SetImageInfo($$$)
     my ($outfile, $restored, $isTemporary, $isStdout, $outType, $tagsFromSrc, $hardLink, $testName);
     my $infile = $file;    # save infile in case we change it again
 
-    undef $tmpFile; # make sure this isn't defined
-
+    # clean up old temporary file if necessary
+    if (defined $tmpFile) {
+        $et->Unlink($tmpFile);
+        undef $tmpFile;
+    }
     # clear any existing errors or warnings since we check these on return
     delete $$et{VALUE}{Error};
     delete $$et{VALUE}{Warning};
@@ -2493,24 +2551,28 @@ sub SetImageInfo($$$)
                 my $opts = $$dyFile[2];
                 if (defined $fname and SlurpFile($fname, \$buff)) {
                     $verbose and print $vout "Reading $$dyFile[0] from $fname\n";
-                    ($rtn, $wrn) = $mt->SetNewValue($$dyFile[0], $buff, %$opts);
+                    ($rtn, $wrn) = $et->SetNewValue($$dyFile[0], $buff, %$opts);
                     $wrn and Warn "$wrn\n";
                 }
                 # remove this tag if we couldn't set it properly
-                $rtn or $mt->SetNewValue($$dyFile[0], undef, Replace => 2,
+                $rtn or $et->SetNewValue($$dyFile[0], undef, Replace => 2,
                                          ProtectSaved => $$opts{ProtectSaved});
                 next;
             } elsif (ref $dyFile eq 'SCALAR') {
-                # set new values from CSV database
+                # set new values from CSV or JSON database
                 my ($f, $found, $tag);
                 undef $evalWarning;
                 local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
+                # force UTF-8 if the database was JSON
+                my $old = $et->Options('Charset');
+                $et->Options(Charset => 'UTF8') if $csv eq 'JSON';
                 # read tags for SourceFile '*' plus the specific file
-                foreach $f ('*', $file) {
+                foreach $f ('*', MyConvertFileName($et, $file)) {
                     my $csvInfo = $database{$f};
                     unless ($csvInfo) {
                         next if $f eq '*';
                         # check absolute path
+                        # (punt on using ConvertFileName here, so $absPath may be a mix of encodings)
                         my $absPath = AbsPath($f);
                         next unless defined $absPath and $csvInfo = $database{$absPath};
                     }
@@ -2518,12 +2580,13 @@ sub SetImageInfo($$$)
                     $verbose and print $vout "Setting new values from $csv database\n";
                     foreach $tag (sort keys %$csvInfo) {
                         next if $tag =~ /\b(SourceFile|Directory|FileName)$/i; # don't write these
-                        my ($rtn, $wrn) = $mt->SetNewValue($tag, $$csvInfo{$tag},
+                        my ($rtn, $wrn) = $et->SetNewValue($tag, $$csvInfo{$tag},
                                           Protected => 1, AddValue => $csvAdd,
                                           ProtectSaved => $csvSaveCount);
                         $wrn and Warn "$wrn\n" if $verbose;
                     }
                 }
+                $et->Options(Charset => $old) if $csv eq 'JSON';
                 unless ($found) {
                     Warn("No SourceFile '$file' in imported $csv database\n");
                     my $absPath = AbsPath($file);
@@ -2994,7 +3057,7 @@ sub PrintCSV()
     print join(',', 'SourceFile', @tags), "\n";
     my $empty = defined($forcePrint) ? $forcePrint : '';
     foreach $file (@csvFiles) {
-        my @vals = (FormatCSV($mt->ConvertFileName($file))); # start with full file name
+        my @vals = (FormatCSV($file)); # start with full file name
         my $csvInfo = $database{$file};
         foreach $lcTag (@csvTags) {
             next unless $csvTags{$lcTag};
@@ -3189,6 +3252,24 @@ sub CheckUTF8($$)
     return $isUTF8;
 }
 
+#------------------------------------------------------------------------------
+# Set window title
+# Inputs: title string or '' to reset title
+sub SetWindowTitle($)
+{
+    my $title = shift;
+    if ($curTitle ne $title) {
+        $curTitle = $title;
+        if ($^O eq 'MSWin32') {
+            $title =~ s/([&\/\?:|"<>])/^$1/g;   # escape special chars
+            eval { system qq{title $title} };
+        } else {
+            # (this only works for XTerm terminals, and STDERR must go to the console)
+            printf STDERR "\033]0;%s\007", $title;
+        }
+    }
+}
+
 #------------------------------------------------------------------------------
 # Process files in our @files list
 # Inputs: 0) ExifTool ref, 1) list ref to just return full file names
@@ -3200,14 +3281,14 @@ sub ProcessFiles($;$)
     foreach $file (@files) {
         $et->Options(CharsetFileName => 'UTF8') if $utf8FileName{$file};
         if (defined $progressMax) {
-            ++$progress;
-            $progStr = " [$progress/$progressMax]";
+            ++$progressCount;
+            $progStr = " [$progressCount/$progressMax]" if $progress;
         }
-        if ($mt->IsDirectory($file)) {
+        if ($et->IsDirectory($file)) {
             $multiFile = $validFile = 1;
-            ScanDir($mt, $file, $list);
+            ScanDir($et, $file, $list);
         } elsif ($filterFlag and not AcceptFile($file)) {
-            if ($mt->Exists($file)) {
+            if ($et->Exists($file)) {
                 $filtered = 1;
                 $verbose and print $vout "-------- $file (wrong extension)$progStr\n";
             } else {
@@ -3307,9 +3388,9 @@ sub ScanDir($$;$)
                 next unless $file =~ /\.(gz|bz2)$/i;
             }
         }
+        $utf8FileName{$path} = 1 if $utf8Name;
         if ($list) {
             push(@$list, $path);
-            $utf8FileName{$path} = 1 if $utf8Name;
         } else {
             GetImageInfo($et, $path);
         }
@@ -3403,6 +3484,20 @@ sub AbsPath($)
     return $path;
 }
 
+#------------------------------------------------------------------------------
+# Convert file name to ExifTool Charset
+# Inputs: 0) ExifTool ref, 1) file name in CharsetFileName
+# Returns: file name in ExifTool Charset
+sub MyConvertFileName($$)
+{
+    my ($et, $file) = @_;
+    my $enc = $et->Options('CharsetFileName');
+    $et->Options(CharsetFileName => 'UTF8') if $utf8FileName{$file};
+    my $convFile = $et->ConvertFileName($file);
+    $et->Options(CharsetFileName => $enc) if $utf8FileName{$file};
+    return $convFile;
+}
+
 #------------------------------------------------------------------------------
 # Add print format entry
 # Inputs: 0) expression string
@@ -3581,8 +3676,9 @@ sub NextUnusedFilename($;$$)
             $filename .= substr($fmt, $pos, pos($fmt) - $pos - length($1));
             $pos = pos($fmt);
             my ($sign, $wid, $dec, $wid2, $mod, $tok) = ($2, $3 || 0, $4, $5 || 0, $6, $7);
+            my $seq = $seqFileNum - 1;
             if ($tok eq 'C') {
-                $seqFileNum = $wid if $wid and not $seqFileNum;
+                $seq += $wid if $wid;
                 $wid = $wid2;
             } else {
                 next unless $dec or $copy;
@@ -3591,13 +3687,13 @@ sub NextUnusedFilename($;$$)
             # add dash or underline separator if '-' or '+' specified
             $filename .= $sep{$sign} if $sign;
             if ($mod and $mod ne 'n') {
-                my $a = $tok eq 'C' ? Num2Alpha($seqFileNum++) : $alpha;
+                my $a = $tok eq 'C' ? Num2Alpha($seq) : $alpha;
                 my $str = ($wid and $wid > length $a) ? 'a' x ($wid - length($a)) : '';
                 $str .= $a;
                 $str = uc $str if $mod eq 'u';
                 $filename .= $str;
             } else {
-                my $c = $tok eq 'C' ? $seqFileNum++ : $copy;
+                my $c = $tok eq 'C' ? $seq : $copy;
                 my $num = $c + ($mod ? 1 : 0);
                 $filename .= $wid ? sprintf("%.${wid}d",$num) : $num;
             }
@@ -3870,19 +3966,23 @@ exiftool - Read and write meta information in files
 
 =head1 SYNOPSIS
 
-=over 4
+=head2 Reading
+
+B<exiftool> [I<OPTIONS>] [-I<TAG>...] [--I<TAG>...] I<FILE>...
 
-=item B<exiftool> [I<OPTIONS>] [-I<TAG>...] [--I<TAG>...] I<FILE>...
+=head2 Writing
 
-=item B<exiftool> [I<OPTIONS>] -I<TAG>[+-E<lt>]=[I<VALUE>]... I<FILE>...
+B<exiftool> [I<OPTIONS>] -I<TAG>[+-E<lt>]=[I<VALUE>]... I<FILE>...
 
-=item B<exiftool> [I<OPTIONS>] B<-tagsFromFile> I<SRCFILE>
+=head2 Copying
+
+B<exiftool> [I<OPTIONS>] B<-tagsFromFile> I<SRCFILE>
 [-I<SRCTAG>[E<gt>I<DSTTAG>]...] I<FILE>...
 
-=item B<exiftool> [ B<-ver> |
-B<-list>[B<w>|B<f>|B<r>|B<wf>|B<g>[I<NUM>]|B<d>|B<x>] ]
+=head2 Other
 
-=back
+B<exiftool> [ B<-ver> |
+B<-list>[B<w>|B<f>|B<r>|B<wf>|B<g>[I<NUM>]|B<d>|B<x>] ]
 
 For specific examples, see the L<EXAMPLES|/READING EXAMPLES> sections below.
 
@@ -3917,42 +4017,42 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DV    r     | KDC   r     | OGV   r     | RW2   r/w
-  3G2   r/w   | DVB   r/w   | KEY   r     | OPUS  r     | RWL   r/w
-  3GP   r/w   | DYLIB r     | LA    r     | ORF   r/w   | RWZ   r
-  A     r     | EIP   r     | LFP   r     | OTF   r     | RM    r
-  AA    r     | EPS   r/w   | LNK   r     | PAC   r     | SEQ   r
-  AAX   r/w   | EPUB  r     | M2TS  r     | PAGES r     | SO    r
-  ACR   r     | ERF   r/w   | M4A/V r/w   | PBM   r/w   | SR2   r/w
-  AFM   r     | EXE   r     | MEF   r/w   | PCD   r     | SRF   r
-  AI    r/w   | EXIF  r/w/c | MIE   r/w/c | PDB   r     | SRW   r/w
-  AIFF  r     | EXR   r     | MIFF  r     | PDF   r/w   | SVG   r
-  APE   r     | EXV   r/w/c | MKA   r     | PEF   r/w   | SWF   r
-  ARW   r/w   | F4A/V r/w   | MKS   r     | PFA   r     | THM   r/w
-  ASF   r     | FFF   r/w   | MKV   r     | PFB   r     | TIFF  r/w
-  AVI   r     | FLA   r     | MNG   r/w   | PFM   r     | TORRENT r
-  AZW   r     | FLAC  r     | MOBI  r     | PGF   r     | TTC   r
-  BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | TTF   r
-  BPG   r     | FPF   r     | MOI   r     | PLIST r     | VCF   r
-  BTF   r     | FPX   r     | MOS   r/w   | PICT  r     | VRD   r/w/c
-  CHM   r     | GIF   r/w   | MOV   r/w   | PMP   r     | VSD   r
-  COS   r     | GZ    r     | MP3   r     | PNG   r/w   | WAV   r
-  CR2   r/w   | HDP   r/w   | MP4   r/w   | PPM   r/w   | WDP   r/w
-  CRW   r/w   | HDR   r     | MPC   r     | PPT   r     | WEBP  r
-  CS1   r/w   | HTML  r     | MPG   r     | PPTX  r     | WEBM  r
-  DCM   r     | ICC   r/w/c | MPO   r/w   | PS    r/w   | WMA   r
-  DCP   r/w   | ICS   r     | MQV   r/w   | PSB   r/w   | WMV   r
-  DCR   r     | IDML  r     | MRW   r/w   | PSD   r/w   | WV    r
-  DFONT r     | IIQ   r/w   | MXF   r     | PSP   r     | X3F   r/w
-  DIVX  r     | IND   r/w   | NEF   r/w   | QTIF  r/w   | XCF   r
-  DJVU  r     | INX   r     | NRW   r/w   | RA    r     | XLS   r
-  DLL   r     | ISO   r     | NUMBERS r   | RAF   r/w   | XLSX  r
-  DNG   r/w   | ITC   r     | O     r     | RAM   r     | XMP   r/w/c
-  DOC   r     | J2C   r     | ODP   r     | RAR   r     | ZIP   r
-  DOCX  r     | JNG   r/w   | ODS   r     | RAW   r/w   |
-  DPX   r     | JP2   r/w   | ODT   r     | RIFF  r     |
-  DR4   r/w/c | JPEG  r/w   | OFR   r     | RSRC  r     |
-  DSS   r     | K25   r     | OGG   r     | RTF   r     |
+  3FR   r     | DV    r     | K25   r     | OGG   r     | RTF   r
+  3G2   r/w   | DVB   r/w   | KDC   r     | OGV   r     | RW2   r/w
+  3GP   r/w   | DYLIB r     | KEY   r     | OPUS  r     | RWL   r/w
+  A     r     | EIP   r     | LA    r     | ORF   r/w   | RWZ   r
+  AA    r     | EPS   r/w   | LFP   r     | OTF   r     | RM    r
+  AAX   r/w   | EPUB  r     | LNK   r     | PAC   r     | SEQ   r
+  ACR   r     | ERF   r/w   | M2TS  r     | PAGES r     | SO    r
+  AFM   r     | EXE   r     | M4A/V r/w   | PBM   r/w   | SR2   r/w
+  AI    r/w   | EXIF  r/w/c | MEF   r/w   | PCD   r     | SRF   r
+  AIFF  r     | EXR   r     | MIE   r/w/c | PDB   r     | SRW   r/w
+  APE   r     | EXV   r/w/c | MIFF  r     | PDF   r/w   | SVG   r
+  ARW   r/w   | F4A/V r/w   | MKA   r     | PEF   r/w   | SWF   r
+  ASF   r     | FFF   r/w   | MKS   r     | PFA   r     | THM   r/w
+  AVI   r     | FLA   r     | MKV   r     | PFB   r     | TIFF  r/w
+  AZW   r     | FLAC  r     | MNG   r/w   | PFM   r     | TORRENT r
+  BMP   r     | FLIF  r/w   | MOBI  r     | PGF   r     | TTC   r
+  BPG   r     | FLV   r     | MODD  r     | PGM   r/w   | TTF   r
+  BTF   r     | FPF   r     | MOI   r     | PLIST r     | VCF   r
+  CHM   r     | FPX   r     | MOS   r/w   | PICT  r     | VRD   r/w/c
+  COS   r     | GIF   r/w   | MOV   r/w   | PMP   r     | VSD   r
+  CR2   r/w   | GZ    r     | MP3   r     | PNG   r/w   | WAV   r
+  CRW   r/w   | HDP   r/w   | MP4   r/w   | PPM   r/w   | WDP   r/w
+  CS1   r/w   | HDR   r     | MPC   r     | PPT   r     | WEBP  r
+  DCM   r     | HTML  r     | MPG   r     | PPTX  r     | WEBM  r
+  DCP   r/w   | ICC   r/w/c | MPO   r/w   | PS    r/w   | WMA   r
+  DCR   r     | ICS   r     | MQV   r/w   | PSB   r/w   | WMV   r
+  DFONT r     | IDML  r     | MRW   r/w   | PSD   r/w   | WV    r
+  DIVX  r     | IIQ   r/w   | MXF   r     | PSP   r     | X3F   r/w
+  DJVU  r     | IND   r/w   | NEF   r/w   | QTIF  r/w   | XCF   r
+  DLL   r     | INX   r     | NRW   r/w   | RA    r     | XLS   r
+  DNG   r/w   | ISO   r     | NUMBERS r   | RAF   r/w   | XLSX  r
+  DOC   r     | ITC   r     | O     r     | RAM   r     | XMP   r/w/c
+  DOCX  r     | J2C   r     | ODP   r     | RAR   r     | ZIP   r
+  DPX   r     | JNG   r/w   | ODS   r     | RAW   r/w   |
+  DR4   r/w/c | JP2   r/w   | ODT   r     | RIFF  r     |
+  DSS   r     | JPEG  r/w   | OFR   r     | RSRC  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4049,7 +4149,7 @@ L<Processing control|/Processing control>
   -overwrite_original_in_place     Overwrite original by copying tmp file
   -P          (-preserve)          Preserve date/time of original file
   -password PASSWD                 Password for processing protected files
-  -progress                        Show file progress count
+  -progress[:[TITLE]]              Show file progress count
   -q          (-quiet)             Quiet processing
   -r[.]       (-recurse)           Recursively process subdirectories
   -scanForXMP                      Brute force XMP scan
@@ -4086,6 +4186,7 @@ L<Advanced options|/Advanced options>
   -srcfile FMT                     Process a different source file
   -stay_open FLAG                  Keep reading -@ argfile even after EOF
   -userParam PARAM[=VAL]           Set user parameter (API UserParam opt)
+  -windowTitle TITLE               Set console window title for each file
 
 =head2 Option Details
 
@@ -4146,9 +4247,9 @@ Write a new value for the specified tag (eg. C<-comment=wow>), or delete the
 tag if no I<VALUE> is given (eg. C<-comment=>).  C<+=> and C<-=> are used to
 add or remove existing entries from a list, or to shift date/time values
 (see L<Image::ExifTool::Shift.pl|Image::ExifTool::Shift.pl> and note 6 below
-for more details).  C<+=> may also be used to increment numerical values,
-and C<-=> may be used to conditionally delete or replace a tag (see
-L</WRITING EXAMPLES> for examples).
+for more details).  C<+=> may also be used to increment numerical values (or
+decrement if I<VALUE> is negative), and C<-=> may be used to conditionally
+delete or replace a tag (see L</WRITING EXAMPLES> for examples).
 
 I<TAG> may contain one or more leading family 0, 1 or 2 group names,
 prefixed by optional family numbers, and separated colons.  If no group name
@@ -4539,9 +4640,9 @@ Set the format for date/time tag values.  The specifics of the I<FMT> syntax
 are system dependent -- consult the C<strftime> man page on your system for
 details.  The default format is equivalent to "%Y:%m:%d %H:%M:%S".  This
 option has no effect on date-only or time-only tags and ignores timezone
-information if present.  Only one B<-d> option may be used per command.  The
-inverse operation (ie. un-formatting a date/time value) is currently not
-applied when writing a date/time tag.
+information if present.  Only one B<-d> option may be used per command. 
+Requires POSIX::strptime for the inversion conversion when writing (not
+included in the Windows EXE package).
 
 =item B<-D> (B<-decimal>)
 
@@ -4737,7 +4838,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 10.25 --
+    -- Generated by ExifTool 10.31 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38
@@ -5284,15 +5385,24 @@ If a password is required but not given, a warning is issued and the
 document is not processed.  This option is ignored if a password is not
 required.
 
-=item B<-progress>
+=item B<-progress>[:[I<TITLE>]]
 
 Show file progress count in messages.  The progress count appears in
 brackets after the name of each processed file, and gives the current file
 number and the total number of files to be processed.  Implies the B<-v0>
-option, which prints the name of each processed file when writing.  When
-combined with the B<-if> option, the total count includes all files before
-the condition is applied, but files that fail the condition will not have
-their names printed.
+option if I<TITLE> is not used, printing the name of each processed file
+when writing.  When combined with the B<-if> option, the total count
+includes all files before the condition is applied, but files that fail the
+condition will not have their names printed.
+
+If followed by a colon (ie. B<-progress:>), the console window title is set
+according to the specified I<TITLE> string.  If no I<TITLE> is given, a
+default I<TITLE> string of "ExifTool %p%%" is assumed.  In the string, %f
+represents the file name, %p is the progress as a percent, %r is the
+progress as a ratio, and %% is a % character.  May be combined with the
+normal B<-progress> option to also show the progress count in console
+messages.  (Note:  This feature works on Mac/Linux only if stderr goes to
+the console.)
 
 =item B<-q> (B<-quiet>)
 
@@ -5367,11 +5477,12 @@ padding in embedded XMP, saving 2424 bytes when writing XMP in a file.
 Read command-line arguments from the specified file.  The file contains one
 argument per line (NOT one option per line -- some options require
 additional arguments, and all arguments must be placed on separate lines).
-Blank lines and lines beginning with C<#> are ignored.  Normal shell
-processing of arguments is not performed, which among other things means
-that arguments should not be quoted and spaces are treated as any other
-character.  I<ARGFILE> may exist relative to either the current directory or
-the exiftool directory unless an absolute pathname is given.
+Blank lines and lines beginning with C<#> are ignored.  White space at the
+start of a line is removed.  Normal shell processing of arguments is not
+performed, which among other things means that arguments should not be
+quoted and spaces are treated as any other character.  I<ARGFILE> may exist
+relative to either the current directory or the exiftool directory unless an
+absolute pathname is given.
 
 For example, the following I<ARGFILE> will set the value of Copyright to
 "Copyright YYYY, Phil Harvey", where "YYYY" is the year of CreateDate:
@@ -5430,7 +5541,9 @@ Note that none of the B<-list> options require an input I<FILE>.
 
 =item B<-ver>
 
-Print exiftool version number.
+Print exiftool version number.  The B<-v> option may be added to print
+addition system information (see the README file of the full distribution
+for more details about optional libraries).
 
 =back
 
@@ -5590,8 +5703,8 @@ more information about the ExifTool configuration file.
 
 =item B<-echo>[I<NUM>] I<TEXT>
 
-Echo text to stdout (B<-echo> or B<-echo1>) or stderr (B<-echo2>).  Text is
-output as the command line is parsed, before the processing of any input
+Echo I<TEXT> to stdout (B<-echo> or B<-echo1>) or stderr (B<-echo2>).  Text
+is output as the command line is parsed, before the processing of any input
 files.  I<NUM> may also be 3 or 4 to output text (to stdout or stderr
 respectively) after processing is complete.