exiftool_vendored 12.06.0 → 12.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6fbacc803486908bf63bd351d8ea3d31bbe0cf1217b6bbab9ef074cde3f0ee3
-  data.tar.gz: fcb3492aae1fbdf6587a73ea5546eed530c09ac20c67fc1a77057becd1e87b0b
+  metadata.gz: fb85849da2fdeb7f34dcbd03ba9548e5744c692f93d8163cf3029a5189f75d2c
+  data.tar.gz: 0fd722ec987c17f4449f7eb9d18101286ceff673134d784833acd811cd376a09
 SHA512:
-  metadata.gz: 7101bbb72920052732e86bb2c44b828bbb901f89363768ebc5346d5225db5919e79de5de2ca8b0af2c77ccd6d62a9f2bf677c61479b877d06fecb88bbd8b29f8
-  data.tar.gz: 0d08e16271b5bd6fe9c4f9d154190a799b3d4bd3b3bdd777a42afa4b29786595869a3068fbc213a68135559d275bcfcf07a08f22d9fdc242130770905ca826cc
+  metadata.gz: 8273b84dd45c1b266eec1a0c13c14e0c60e6f68c3bbd76fce169002a9983606b76f70e636199b751dda2f8f6992ea39b164f4d24c29849fa494b30b4ad14b1fa
+  data.tar.gz: a65c0a97fdbc17365a46bd7605b36e72557004549f92ba9fc1f02d7358899643932125a499d65daa88eddebbf9c7a8d343c037b70baa4ff30802c97dfb66efd6

data/bin/Changes

@@ -7,8 +7,102 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.00. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
-(I'll be on vacation from Aug 26 to Sep 3, 2020 so don't expect any
-forum or email responses from me during this time - Phil H.)
+Dec. 4, 2020 - Version 12.12
+
+  - Added ability to geotag from DJI CSV log files
+  - Added a new CanonModelID
+  - Added a couple of new Sony LensType values (thanks LibRaw)
+  - Enhanced -csvDelim option to allow "\t", "\n", "\r" and "\\"
+  - Unescape "\b" and "\f" in imported JSON values
+  - Fixed bug introduced in 12.10 which generated a "Not an integer" warning
+    when attempting to shift some QuickTime date/time tags
+  - Fixed shared-write permission problem with -@ argfile when using -stay_open
+    and a filename containing special characters on Windows
+
+Nov. 27, 2020 - Version 12.11
+
+  - Added -csvDelim option
+  - Added new Canon and Olympus LensType values (thanks LibRaw)
+  - Added a warning if ICC_Profile is deleted from an image (github issue #63)
+  - EndDir() function for -if option now works when -fileOrder is used
+  - Changed FileSize conversion to use binary prefixes since that is how the
+    conversion is currently done (eg. MiB instead of MB)
+  - Patched -csv option so columns aren't resorted when using -G option and one
+    of the tags is missing from a file
+  - Fixed incompatiblity with Google Photos when writing UserData:GPSCoordinates
+    to MP4 videos
+  - Fixed problem where the tags available in a -p format string were limited to
+    the same as the -if[NUM] option when NUM was specified
+  - Fixed incorrect decoding of SourceFileIndex/SourceDirectoryIndex for Ricoh
+    models
+
+Nov. 12, 2020 - Version 12.10
+
+  - Added -validate test for proper TIFF magic number in JPEG EXIF header
+  - Added support for Nikon Z7 LensData version 0801
+  - Added a new XMP-GPano tag
+  - Decode ColorData for the Canon EOS 1DXmkIII (thanks LibRaw)
+  - Decode more tags for the Sony ILCE-7SM3 (thanks Jos Roost)
+  - Automatically apply QuickTimeUTC option for CR3 files
+  - Improved decoding of XAttrMDLabel from MacOS files
+  - Ignore time zones when writing date/time values and using the -d option
+  - Enhanced -echo3 and -echo4 options to allow exit status to be returned
+  - Changed -execute so the -q option no longer suppresses the "{ready}" message
+    when a synchronization number is used (eg. -execute123)
+
+Oct. 29, 2020 - Version 12.09
+
+  - Added ability to copy CanonMakerNotes from CR3 images to other file types
+  - Added read support for ON1 presets file (.ONP)
+  - Added two new CanonModelID values
+  - Added trailing "/" when writing QuickTime:GPSCoordinates
+  - Added a number of new XMP-crs tags
+  - Added a new Sony LensType (thanks Jos Roost)
+  - Added a new Nikon Z lens (thanks LibRaw)
+  - Added a new Canon LensType
+  - Decode ColorData for Canon EOS R5/R6
+  - Decode a couple of new HEIF tags
+  - Decode FirmwareVersion for Canon M50
+  - Improved decoding of Sony CreativeStyle tags (thanks Jos Roost)
+  - Improved parsing of Radiance files to recognize comments
+  - Renamed GIF AspectRatio tag to PixelAspectRatio
+  - Patched EndDir() feature so subdirectories are always processed when -r is
+    used (previously, EndDir() would end processing of a directory completely)
+  - Yet another tweak to the EventTime formatting rules (also allow time-only
+    values with fractional seconds and a time zone)
+  - Avoid loading GoPro module unnecessarily when reading MP4 videos from some
+    other cameras
+  - Fixed problem with an incorrect naming of CodecID tags in some MKV videos
+  - Fixed verbose output to avoid "adding" messages for existing flattened XMP
+    tags
+
+Oct. 15, 2020 - Version 12.08
+
+  - Added read support for MacOS "._" sidecar files
+  - Added a new Sony LensType (thanks Jos Roost)
+  - Recognize Mac OS X xattr files
+  - Extract ThumbnailImage from MP4 videos of more dashcam models
+  - Improved decoding of a number of Sony tags (thanks Jos Roost)
+  - Fixed problem where the special -if EndDir() function didn't work properly
+    for directories after the one in which it was initially called
+  - Patched to read DLL files which don't have a .rsrc section (thanks Hank)
+  - Patched to support new IGC date format when geotagging
+  - Patched to read DLL files with an invalid size in the header
+
+Oct. 2, 2020 - Version 12.07
+
+  - Added support for GoPro .360 videos
+  - Added some new Canon RF and Nikkor Z lenses (thanks LibRaw)
+  - Added some new Sony LensType and CreativeStyle values and decode some
+    ILCE-7C tags (thanks Jos Roost)
+  - Added a number of new Olympus SceneMode values (thanks Herb)
+  - Added a new Nikon LensID
+  - Decode more timed metadata from Insta360 videos (thanks Thomas Allen)
+  - Decode timed GPS from videos of more Garmin dashcam models
+  - Decode a new GoPro video tag
+  - Reformat time-only EventTime values when writing and prevent arbitrary
+    strings from being written
+  - Patched to accept backslashes in SourceFile entries for -csv option
 
 Sept. 11, 2020 - Version 12.06
 

data/bin/MANIFEST

@@ -567,6 +567,7 @@ t/GeoTiff_4.out
 t/Geotag.t
 t/Geotag_10.out
 t/Geotag_11.out
+t/Geotag_12.out
 t/Geotag_2.out
 t/Geotag_3.out
 t/Geotag_5.out
@@ -652,6 +653,8 @@ t/MWG_6.out
 t/MWG_7.out
 t/MXF.t
 t/MXF_2.out
+t/MacOS.t
+t/MacOS_2.out
 t/Matroska.t
 t/Matroska_2.out
 t/Minolta.t
@@ -984,6 +987,7 @@ t/images/Geotag.log
 t/images/Geotag.xml
 t/images/Geotag2.log
 t/images/Geotag3.log
+t/images/Geotag_DJI_2020-12-02_[07-50-31].csv
 t/images/GoPro.jpg
 t/images/HTML.html
 t/images/ICC_Profile.icc
@@ -1007,6 +1011,7 @@ t/images/MOI.moi
 t/images/MP3.mp3
 t/images/MWG.jpg
 t/images/MXF.mxf
+t/images/MacOS.macos
 t/images/Matroska.mkv
 t/images/Minolta.jpg
 t/images/Minolta.mrw

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.06"
+   "version" : "12.12"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.06
+version: 12.12

data/bin/README

@@ -14,46 +14,47 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DPX   r     | ISO   r     | O     r     | RAW   r/w
-  3G2   r/w   | DR4   r/w/c | ITC   r     | ODP   r     | RIFF  r
-  3GP   r/w   | DSS   r     | J2C   r     | ODS   r     | RSRC  r
-  A     r     | DV    r     | JNG   r/w   | ODT   r     | RTF   r
-  AA    r     | DVB   r/w   | JP2   r/w   | OFR   r     | RW2   r/w
-  AAE   r     | DVR-MS r    | JPEG  r/w   | OGG   r     | RWL   r/w
-  AAX   r/w   | DYLIB r     | JSON  r     | OGV   r     | RWZ   r
-  ACR   r     | EIP   r     | K25   r     | OPUS  r     | RM    r
-  AFM   r     | EPS   r/w   | KDC   r     | ORF   r/w   | SEQ   r
-  AI    r/w   | EPUB  r     | KEY   r     | OTF   r     | SKETCH r
-  AIFF  r     | ERF   r/w   | LA    r     | PAC   r     | SO    r
-  APE   r     | EXE   r     | LFP   r     | PAGES r     | SR2   r/w
-  ARQ   r/w   | EXIF  r/w/c | LNK   r     | PBM   r/w   | SRF   r
-  ARW   r/w   | EXR   r     | LRV   r/w   | PCD   r     | SRW   r/w
-  ASF   r     | EXV   r/w/c | M2TS  r     | PCX   r     | SVG   r
-  AVI   r     | F4A/V r/w   | M4A/V r/w   | PDB   r     | SWF   r
-  AVIF  r/w   | FFF   r/w   | MAX   r     | PDF   r/w   | THM   r/w
-  AZW   r     | FITS  r     | MEF   r/w   | PEF   r/w   | TIFF  r/w
-  BMP   r     | FLA   r     | MIE   r/w/c | PFA   r     | TORRENT r
-  BPG   r     | FLAC  r     | MIFF  r     | PFB   r     | TTC   r
-  BTF   r     | FLIF  r/w   | MKA   r     | PFM   r     | TTF   r
-  CHM   r     | FLV   r     | MKS   r     | PGF   r     | TXT   r
-  COS   r     | FPF   r     | MKV   r     | PGM   r/w   | VCF   r
-  CR2   r/w   | FPX   r     | MNG   r/w   | PLIST r     | VRD   r/w/c
-  CR3   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | VSD   r
-  CRM   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WAV   r
-  CRW   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WDP   r/w
-  CS1   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBP  r
-  CSV   r     | HDR   r     | MOV   r/w   | PPT   r     | WEBM  r
-  CZI   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMA   r
-  DCM   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WMV   r
-  DCP   r/w   | HTML  r     | MPC   r     | PSB   r/w   | WTV   r
-  DCR   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | WV    r
-  DFONT r     | ICS   r     | MPO   r/w   | PSP   r     | X3F   r/w
-  DIVX  r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XCF   r
-  DJVU  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLS   r
-  DLL   r     | IND   r/w   | MXF   r     | RA    r     | XLSX  r
-  DNG   r/w   | INSP  r/w   | NEF   r/w   | RAF   r/w   | XMP   r/w/c
-  DOC   r     | INSV  r     | NRW   r/w   | RAM   r     | ZIP   r
-  DOCX  r     | INX   r     | NUMBERS r   | RAR   r     |
+  360   r/w   | DPX   r     | ITC   r     | ODP   r     | RIFF  r
+  3FR   r     | DR4   r/w/c | J2C   r     | ODS   r     | RSRC  r
+  3G2   r/w   | DSS   r     | JNG   r/w   | ODT   r     | RTF   r
+  3GP   r/w   | DV    r     | JP2   r/w   | OFR   r     | RW2   r/w
+  A     r     | DVB   r/w   | JPEG  r/w   | OGG   r     | RWL   r/w
+  AA    r     | DVR-MS r    | JSON  r     | OGV   r     | RWZ   r
+  AAE   r     | DYLIB r     | K25   r     | ONP   r     | RM    r
+  AAX   r/w   | EIP   r     | KDC   r     | OPUS  r     | SEQ   r
+  ACR   r     | EPS   r/w   | KEY   r     | ORF   r/w   | SKETCH r
+  AFM   r     | EPUB  r     | LA    r     | OTF   r     | SO    r
+  AI    r/w   | ERF   r/w   | LFP   r     | PAC   r     | SR2   r/w
+  AIFF  r     | EXE   r     | LNK   r     | PAGES r     | SRF   r
+  APE   r     | EXIF  r/w/c | LRV   r/w   | PBM   r/w   | SRW   r/w
+  ARQ   r/w   | EXR   r     | M2TS  r     | PCD   r     | SVG   r
+  ARW   r/w   | EXV   r/w/c | M4A/V r/w   | PCX   r     | SWF   r
+  ASF   r     | F4A/V r/w   | MACOS r     | PDB   r     | THM   r/w
+  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | TIFF  r/w
+  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TORRENT r
+  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TTC   r
+  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTF   r
+  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TXT   r
+  BTF   r     | FLV   r     | MKS   r     | PGF   r     | VCF   r
+  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VRD   r/w/c
+  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VSD   r
+  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | WAV   r
+  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WDP   r/w
+  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WEBP  r
+  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBM  r
+  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WMA   r
+  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMV   r
+  CZI   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WTV   r
+  DCM   r     | HTML  r     | MPC   r     | PSB   r/w   | WV    r
+  DCP   r/w   | ICC   r/w/c | MPG   r     | PSD   r/w   | X3F   r/w
+  DCR   r     | ICS   r     | MPO   r/w   | PSP   r     | XCF   r
+  DFONT r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XLS   r
+  DIVX  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLSX  r
+  DJVU  r     | IND   r/w   | MXF   r     | RA    r     | XMP   r/w/c
+  DLL   r     | INSP  r/w   | NEF   r/w   | RAF   r/w   | ZIP   r
+  DNG   r/w   | INSV  r     | NRW   r/w   | RAM   r     |
+  DOC   r     | INX   r     | NUMBERS r   | RAR   r     |
+  DOCX  r     | ISO   r     | O     r     | RAW   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -105,8 +106,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.06.tar.gz | tar -xf -
-  cd Image-ExifTool-12.06
+  gzip -dc Image-ExifTool-12.12.tar.gz | tar -xf -
+  cd Image-ExifTool-12.12
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.06';
+my $version = '12.12';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -136,12 +136,13 @@ my $countSameWr;    # count files written OK but not changed
 my $critical;       # flag for critical operations (disable CTRL-C)
 my $csv;            # flag for CSV option (set to "CSV", or maybe "JSON" when writing)
 my $csvAdd;         # flag to add CSV information to existing lists
+my $csvDelim;       # delimiter for CSV files
 my $csvSaveCount;   # save counter for last CSV file loaded
 my $deleteOrig;     # 0=restore original files, 1=delete originals, 2=delete w/o asking
 my $disableOutput;  # flag to disable normal output
 my $doSetFileName;  # flag set if FileName may be written
 my $doUnzip;        # flag to extract info from .gz and .bz2 files
-my ($end,$endDir);  # flags to end processing
+my ($end,$endDir,%endDir);  # flags to end processing
 my $escapeC;        # C-style escape
 my $escapeHTML;     # flag to escape printed values for html
 my $evalWarning;    # warning from eval
@@ -239,6 +240,7 @@ my %optArgs = (
     '-c' => 1, '-coordformat' => 1,
     '-charset' => 0, # (optional arg; OK because arg cannot begin with "-")
     '-config' => 1,
+    '-csvdelim' => 1,
     '-d' => 1, '-dateformat' => 1,
     '-D' => 0, # necessary to avoid matching lower-case equivalent
     '-echo' => 1, '-echo1' => 1, '-echo2' => 1, '-echo3' => 1, '-echo4' => 1,
@@ -246,11 +248,12 @@ my %optArgs = (
     '-efile!' => 1, '-efile1!' => 1, '-efile2!' => 1, '-efile3!' => 1, '-efile4!' => 1,
     '-ext' => 1, '--ext' => 1, '-ext+' => 1, '--ext+' => 1,
         '-extension' => 1, '--extension' => 1, '-extension+' => 1, '--extension+' => 1,
-    '-fileorder' => 1,
+    '-fileorder' => 1, '-fileorder0' => 1, '-fileorder1' => 1, '-fileorder2' => 1,
+        '-fileorder3' => 1, '-fileorder4' => 1, '-fileorder5' => 1,
     '-geotag' => 1,
     '-globaltimeshift' => 1,
     '-i' => 1, '-ignore' => 1,
-    '-if' => 1, '-if0' => 1, '-if1' => 1, '-if2' => 1, '-if3' => 1, '-if4' => 1,
+    '-if' => 1, '-if0' => 1, '-if1' => 1, '-if2' => 1, '-if3' => 1, '-if4' => 1, '-if5' => 1,
     '-lang' => 0, # (optional arg; cannot begin with "-")
     '-listitem' => 1,
     '-o' => 1, '-out' => 1,
@@ -366,13 +369,21 @@ if (grep /^-common_args$/i, @ARGV) {
 # loop over sets of command-line arguments separated by "-execute"
 Command: for (;;) {
 
-@echo3 and print STDOUT join("\n", @echo3), "\n";
-@echo4 and print STDERR join("\n", @echo4), "\n";
+if (@echo3) {
+    my $str = join "\n", @echo3, "\n";
+    $str =~ s/\$\{status\}/$rtnVal/ig;
+    print STDOUT $str;
+}
+if (@echo4) {
+    my $str = join "\n", @echo4, "\n";
+    $str =~ s/\$\{status\}/$rtnVal/ig;
+    print STDERR $str;
+}
 
 $rafStdin->Close() if $rafStdin;
 undef $rafStdin;
 
-# save or previous return codes
+# save our previous return codes
 $rtnValPrev = $rtnVal;
 $rtnValApp = $rtnVal if $rtnVal;
 
@@ -387,7 +398,7 @@ if ($binaryStdout) {
 
 # flush console and print "{ready}" message if -stay_open is in effect
 if ($stayOpen >= 2) {
-    if ($quiet) {
+    if ($quiet and not defined $executeID) {
         # flush output if possible
         eval { require IO::Handle } and STDERR->flush(), STDOUT->flush();
     } else {
@@ -421,6 +432,7 @@ undef %countLink;
 undef %created;
 undef %csvTags;
 undef %database;
+undef %endDir;
 undef %filterExt;
 undef %ignore;
 undef %printFmt;
@@ -492,6 +504,7 @@ $countGoodCr = 0;
 $countGoodWr = 0;
 $countNewDir = 0;
 $countSameWr = 0;
+$csvDelim = ',';
 $csvSaveCount = 0;
 $fileTrailer = '';
 $filterFlag = 0;
@@ -554,7 +567,7 @@ if (not $preserveTime and $^O eq 'MSWin32') {
 for (;;) {
 
   # execute the command now if no more arguments or -execute is used
-  if (not @ARGV or ($ARGV[0] =~ /^(-|\xe2\x88\x92)execute(\d*)$/i and not $endOfOpts)) {
+  if (not @ARGV or ($ARGV[0] =~ /^(-|\xe2\x88\x92)execute(\d+)?$/i and not $endOfOpts)) {
     if (@ARGV) {
         $executeID = $2;        # save -execute number for "{ready}" response
         $helped = 1;            # don't show help if we used -execute
@@ -813,7 +826,7 @@ for (;;) {
         next;
     }
     /^config$/i and Warn("Ignored -config option (not first on command line)\n"), shift, next;
-    if (/^csv(\+?=.*)?/i) {
+    if (/^csv(\+?=.*)?$/i) {
         my $csvFile = $1;
         # must process on 2nd pass so -f and -charset options are available
         unless ($pass) {
@@ -833,7 +846,7 @@ for (;;) {
             if ($mt->Open(\*CSVFILE, $csvFile)) {
                 binmode CSVFILE;
                 require Image::ExifTool::Import;
-                $msg = Image::ExifTool::Import::ReadCSV(\*CSVFILE, \%database, $forcePrint);
+                $msg = Image::ExifTool::Import::ReadCSV(\*CSVFILE, \%database, $forcePrint, $csvDelim);
                 close(CSVFILE);
             } else {
                 $msg = "Error opening CSV file '${csvFile}'";
@@ -844,6 +857,15 @@ for (;;) {
         $csv = 'CSV';
         next;
     }
+    if (/^csvdelim$/i) {
+        $csvDelim = shift;
+        defined $csvDelim or Error("Expecting argument for -csvDelim option\n"), $badCmd=1, next;
+        $csvDelim =~ /"/ and Error("CSV delimiter can not contain a double quote\n"), $badCmd=1, next;
+        my %unescape = ( 't'=>"\t", 'n'=>"\n", 'r'=>"\r", '\\' => '\\' );
+        $csvDelim =~ s/\\(.)/$unescape{$1}||"\\$1"/sge;
+        $mt->Options(CSVDelim => $csvDelim);
+        next;
+    }
     if (/^d$/ or $a eq 'dateformat') {
         my $fmt = shift;
         $fmt or Error("Expecting date format for -d option\n"), $badCmd=1, next;
@@ -1758,10 +1780,12 @@ if (@dbKeys) {
         undef $evalWarning;
         local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
         foreach (@dbKeys) {
+            my $db = $database{$_};
+            tr/\\/\// and $database{$_} = $db;  # allow for backslashes in SourceFile
             # (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};
+                $database{$absPath} = $db unless $database{$absPath};
                 if ($verbose and $verbose > 1) {
                     print $vout "Imported entry for '${_}' (full path: '${absPath}')\n";
                 }
@@ -1972,6 +1996,7 @@ sub GetImageInfo($$)
                 }
                 last unless $result;
             }
+            undef @foundTags if $fastCondition; # ignore if we didn't get all tags
         }
         unless ($result) {
             $verbose and print $vout "-------- $file (failed condition)$progStr\n";
@@ -2225,7 +2250,9 @@ sub GetImageInfo($$)
         my $noDups = ($json or ($xml and $outFormat > 0));
         my $printConv = $et->Options('PrintConv');
         my $lastGroup = '';
+        my $i = -1;
 TAG:    foreach $tag (@foundTags) {
+            ++$i;   # keep track on index in @foundTags
             my $tagName = GetTagName($tag);
             my ($group, $valList);
             # get the value for this tag
@@ -2343,26 +2370,38 @@ TAG:    foreach $tag (@foundTags) {
             }
             # save information for CSV output
             if ($csv) {
-                my $t = $group ? "$group:$tagName" : $tagName;
-                $t .= '#' if $tag =~ /#/;   # add ValueConv "#" suffix if used
+                my $tn = $tagName;
+                $tn .= '#' if $tag =~ /#/;  # add ValueConv "#" suffix if used
+                my $gt = $group ? "$group:$tn" : $tn;
                 # (tag-name case may be different if some tags don't exist
                 # in a file, so all logic must use lower-case tag names)
-                my $lcTag = lc $t;
+                my $lcTag = lc $gt;
                 # override existing entry only if top priority
                 next if defined $csvInfo{$lcTag} and $tag =~ /\(/;
                 $csvInfo{$lcTag} = $val;
                 if (defined $csvTags{$lcTag}) {
                     # overwrite with actual extracted tag name
                     # (note: can't check "if defined $val" here because -f may be used)
-                    $csvTags{$lcTag} = $t if defined $$info{$tag};
-                } else {
-                    # (don't save unextracted tag name unless -f was used)
-                    $csvTags{$lcTag} = defined($val) ? $t : '';
-                    if (@csvFiles == 1) {
-                        push @csvTags, $lcTag; # save order of tags for first file
-                    } elsif (@csvTags) {
-                        undef @csvTags;
-                    }
+                    $csvTags{$lcTag} = $gt if defined $$info{$tag};
+                    next;
+                }
+                # must check for "Unknown" group (for tags that don't exist)
+                if ($group and defined $csvTags[$i] and $csvTags[$i] =~ /^(.*):$tn$/i) {
+                     next if $group eq 'Unknown';   # nothing more to do if we don't know tag group
+                     if ($1 eq 'unknown') {
+                        # replace unknown entry in CSV tag lookup and list
+                        delete $csvTags{$csvTags[$i]};
+                        $csvTags{$lcTag} = defined($val) ? $gt : '';
+                        $csvTags[$i] = $lcTag;
+                        next;
+                     }
+                }
+                # (don't save unextracted tag name unless -f was used)
+                $csvTags{$lcTag} = defined($val) ? $gt : '';
+                if (@csvFiles == 1) {
+                    push @csvTags, $lcTag; # save order of tags for first file
+                } elsif (@csvTags) {
+                    undef @csvTags;
                 }
                 next;
             }
@@ -3288,7 +3327,7 @@ sub FormatCSV($)
     # the -b option is used to encode as Base64.  It is unclear whether or not this
     # is valid CSV, but some readers may not like it.  (If this becomes a problem,
     # in the future values may need to be truncated at the first NULL character.)
-    $val = qq{"$val"} if $val =~ s/"/""/g or $val =~ /(^\s+|\s+$)/ or $val =~ /[,\n\r]/;
+    $val = qq{"$val"} if $val =~ s/"/""/g or $val =~ /(^\s+|\s+$)/ or $val =~ /[\n\r]|\Q$csvDelim/;
     return $val;
 }
 
@@ -3301,9 +3340,9 @@ sub PrintCSV()
     @csvTags or @csvTags = sort keys %csvTags;
     # make a list of tags actually found
     foreach $lcTag (@csvTags) {
-        push @tags, $csvTags{$lcTag} if $csvTags{$lcTag};
+        push @tags, FormatCSV($csvTags{$lcTag}) if $csvTags{$lcTag};
     }
-    print join(',', 'SourceFile', @tags), "\n";
+    print join($csvDelim, 'SourceFile', @tags), "\n";
     my $empty = defined($forcePrint) ? $forcePrint : '';
     foreach $file (@csvFiles) {
         my @vals = (FormatCSV($file)); # start with full file name
@@ -3314,7 +3353,7 @@ sub PrintCSV()
             defined $val or push(@vals,$empty), next;
             push @vals, FormatCSV($val);
         }
-        print join(',', @vals), "\n";
+        print join($csvDelim, @vals), "\n";
     }
 }
 
@@ -3550,8 +3589,18 @@ sub ProcessFiles($;$)
             if ($list) {
                 push(@$list, $file);
             } else {
+                if (%endDir) {
+                    my ($d, $f) = Image::ExifTool::SplitFileName($file);
+                    next if $endDir{$d};
+                }
                 GetImageInfo($et, $file);
                 $end and Warn("End called - $file\n");
+                if ($endDir) {
+                    Warn("EndDir called - $file\n");
+                    my ($d, $f) = Image::ExifTool::SplitFileName($file);
+                    $endDir{$d} = 1;
+                    undef $endDir;
+                }
             }
         }
         $et->Options(CharsetFileName => $enc) if $utf8FileName{$file};
@@ -3566,7 +3615,7 @@ sub ScanDir($$;$)
 {
     local $_;
     my ($et, $dir, $list) = @_;
-    my (@fileList, $done, $file, $utf8Name, $winSurrogate);
+    my (@fileList, $done, $file, $utf8Name, $winSurrogate, $endThisDir);
     my $enc = $et->Options('CharsetFileName');
     # recode as UTF-8 if necessary
     if ($enc) {
@@ -3636,6 +3685,7 @@ sub ScanDir($$;$)
             last if $end;
             next;
         }
+        next if $endThisDir;
         # apply rules from -ext options
         my $accepted;
         if ($filterFlag) {
@@ -3678,9 +3728,11 @@ sub ScanDir($$;$)
                 last;
             }
             if ($endDir) {
-                $dir =~ s(/$)();
+                $path =~ s(/$)();
                 Warn("EndDir called - $path\n");
-                last;
+                $endDir{$path} = 1;
+                $endThisDir = 1;
+                undef $endDir;
             }
         }
     }
@@ -4384,46 +4436,47 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DPX   r     | ISO   r     | O     r     | RAW   r/w
-  3G2   r/w   | DR4   r/w/c | ITC   r     | ODP   r     | RIFF  r
-  3GP   r/w   | DSS   r     | J2C   r     | ODS   r     | RSRC  r
-  A     r     | DV    r     | JNG   r/w   | ODT   r     | RTF   r
-  AA    r     | DVB   r/w   | JP2   r/w   | OFR   r     | RW2   r/w
-  AAE   r     | DVR-MS r    | JPEG  r/w   | OGG   r     | RWL   r/w
-  AAX   r/w   | DYLIB r     | JSON  r     | OGV   r     | RWZ   r
-  ACR   r     | EIP   r     | K25   r     | OPUS  r     | RM    r
-  AFM   r     | EPS   r/w   | KDC   r     | ORF   r/w   | SEQ   r
-  AI    r/w   | EPUB  r     | KEY   r     | OTF   r     | SKETCH r
-  AIFF  r     | ERF   r/w   | LA    r     | PAC   r     | SO    r
-  APE   r     | EXE   r     | LFP   r     | PAGES r     | SR2   r/w
-  ARQ   r/w   | EXIF  r/w/c | LNK   r     | PBM   r/w   | SRF   r
-  ARW   r/w   | EXR   r     | LRV   r/w   | PCD   r     | SRW   r/w
-  ASF   r     | EXV   r/w/c | M2TS  r     | PCX   r     | SVG   r
-  AVI   r     | F4A/V r/w   | M4A/V r/w   | PDB   r     | SWF   r
-  AVIF  r/w   | FFF   r/w   | MAX   r     | PDF   r/w   | THM   r/w
-  AZW   r     | FITS  r     | MEF   r/w   | PEF   r/w   | TIFF  r/w
-  BMP   r     | FLA   r     | MIE   r/w/c | PFA   r     | TORRENT r
-  BPG   r     | FLAC  r     | MIFF  r     | PFB   r     | TTC   r
-  BTF   r     | FLIF  r/w   | MKA   r     | PFM   r     | TTF   r
-  CHM   r     | FLV   r     | MKS   r     | PGF   r     | TXT   r
-  COS   r     | FPF   r     | MKV   r     | PGM   r/w   | VCF   r
-  CR2   r/w   | FPX   r     | MNG   r/w   | PLIST r     | VRD   r/w/c
-  CR3   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | VSD   r
-  CRM   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WAV   r
-  CRW   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WDP   r/w
-  CS1   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBP  r
-  CSV   r     | HDR   r     | MOV   r/w   | PPT   r     | WEBM  r
-  CZI   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMA   r
-  DCM   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WMV   r
-  DCP   r/w   | HTML  r     | MPC   r     | PSB   r/w   | WTV   r
-  DCR   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | WV    r
-  DFONT r     | ICS   r     | MPO   r/w   | PSP   r     | X3F   r/w
-  DIVX  r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XCF   r
-  DJVU  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLS   r
-  DLL   r     | IND   r/w   | MXF   r     | RA    r     | XLSX  r
-  DNG   r/w   | INSP  r/w   | NEF   r/w   | RAF   r/w   | XMP   r/w/c
-  DOC   r     | INSV  r     | NRW   r/w   | RAM   r     | ZIP   r
-  DOCX  r     | INX   r     | NUMBERS r   | RAR   r     |
+  360   r/w   | DPX   r     | ITC   r     | ODP   r     | RIFF  r
+  3FR   r     | DR4   r/w/c | J2C   r     | ODS   r     | RSRC  r
+  3G2   r/w   | DSS   r     | JNG   r/w   | ODT   r     | RTF   r
+  3GP   r/w   | DV    r     | JP2   r/w   | OFR   r     | RW2   r/w
+  A     r     | DVB   r/w   | JPEG  r/w   | OGG   r     | RWL   r/w
+  AA    r     | DVR-MS r    | JSON  r     | OGV   r     | RWZ   r
+  AAE   r     | DYLIB r     | K25   r     | ONP   r     | RM    r
+  AAX   r/w   | EIP   r     | KDC   r     | OPUS  r     | SEQ   r
+  ACR   r     | EPS   r/w   | KEY   r     | ORF   r/w   | SKETCH r
+  AFM   r     | EPUB  r     | LA    r     | OTF   r     | SO    r
+  AI    r/w   | ERF   r/w   | LFP   r     | PAC   r     | SR2   r/w
+  AIFF  r     | EXE   r     | LNK   r     | PAGES r     | SRF   r
+  APE   r     | EXIF  r/w/c | LRV   r/w   | PBM   r/w   | SRW   r/w
+  ARQ   r/w   | EXR   r     | M2TS  r     | PCD   r     | SVG   r
+  ARW   r/w   | EXV   r/w/c | M4A/V r/w   | PCX   r     | SWF   r
+  ASF   r     | F4A/V r/w   | MACOS r     | PDB   r     | THM   r/w
+  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | TIFF  r/w
+  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TORRENT r
+  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TTC   r
+  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTF   r
+  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TXT   r
+  BTF   r     | FLV   r     | MKS   r     | PGF   r     | VCF   r
+  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VRD   r/w/c
+  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VSD   r
+  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | WAV   r
+  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WDP   r/w
+  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WEBP  r
+  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBM  r
+  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WMA   r
+  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMV   r
+  CZI   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WTV   r
+  DCM   r     | HTML  r     | MPC   r     | PSB   r/w   | WV    r
+  DCP   r/w   | ICC   r/w/c | MPG   r     | PSD   r/w   | X3F   r/w
+  DCR   r     | ICS   r     | MPO   r/w   | PSP   r     | XCF   r
+  DFONT r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XLS   r
+  DIVX  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLSX  r
+  DJVU  r     | IND   r/w   | MXF   r     | RA    r     | XMP   r/w/c
+  DLL   r     | INSP  r/w   | NEF   r/w   | RAF   r/w   | ZIP   r
+  DNG   r/w   | INSV  r     | NRW   r/w   | RAM   r     |
+  DOC   r     | INX   r     | NUMBERS r   | RAR   r     |
+  DOCX  r     | ISO   r     | O     r     | RAW   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4473,6 +4526,7 @@ L<Input-output text formatting|/Input-output text formatting>
   -c FMT      (-coordFormat)       Set format for GPS coordinates
   -charset [[TYPE=]CHARSET]        Specify encoding for special characters
   -csv[[+]=CSVFILE]                Export/import tags in CSV format
+  -csvDelim STR                    Set delimiter for CSV file
   -d FMT      (-dateFormat)        Set format for date/time values
   -D          (-decimal)           Show tag ID numbers in decimal
   -E,-ex,-ec  (-escape(HTML|XML|C))Escape tag values for HTML, XML or C
@@ -4992,8 +5046,11 @@ tag names (with optional group names) for each column of the file, and
 values must be separated by commas.  A special "SourceFile" column specifies
 the files associated with each row of information (and a SourceFile of "*"
 may be used to define default tags to be imported for all files which are
-combined with any tags specified for the specific SourceFile processed).
-The following examples demonstrate basic use of this option:
+combined with any tags specified for the specific SourceFile processed). The
+B<-csvDelim> option may be used to change the input/output field delimiter
+if something other than a comma is required.
+
+The following examples demonstrate basic use of the B<-csv> option:
 
     # generate CSV file with common tags from all images in a directory
     exiftool -common -csv dir > out.csv
@@ -5040,6 +5097,13 @@ option.  When processing a large number of files, it is recommended to
 either use the JSON (B<-j>) or XML (B<-X>) output format, or use B<-p> to
 generate a fixed-column CSV file instead of using the B<-csv> option.
 
+=item B<-csvDelim> I<STR>
+
+Set the delimiter for separating CSV entries for CSV file input/output via
+the B<-csv> option.  I<STR> may contain "\t", "\n", "\r" and "\\" to
+represent TAB, LF, CR and '\' respectively.  A double quote is not allowed
+in the delimiter.  Default is ','.
+
 =item B<-d> I<FMT> (B<-dateFormat>)
 
 Set the format for date/time tag values.  The I<FMT> string may contain
@@ -5291,7 +5355,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.06 --
+    -- Generated by ExifTool 12.12 --
     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
@@ -5699,7 +5763,8 @@ extracting any EXIF MakerNote information.  B<-fast3> avoids extracting
 metadata from the file, and returns only pseudo System tags, but still reads
 the file header to obtain an educated guess at FileType.  B<-fast4> doesn't
 even read the file header, and returns only System tags and a FileType based
-on the file extension.  Has no effect when writing.
+on the file extension.  B<-fast5> also disables generation of the Composite
+tags (like B<-e>).  Has no effect when writing.
 
 Note that a separate B<-fast> setting may be used for evaluation of a B<-if>
 condition, or when ordering files with the B<-fileOrder> option.  See the
@@ -5724,7 +5789,9 @@ involves an additional processing pass of each file, but this impact may be
 reduced by specifying a I<NUM> for the B<-fast> level used during the
 metadata-extraction phase.  For example, B<-fileOrder4> may be used if
 I<TAG> is a pseudo System tag.  If multiple B<-fileOrder> options are used,
-the extraction is done at the lowest B<-fast> level.
+the extraction is done at the lowest B<-fast> level.  Note that files are
+sorted across directory boundaries if multiple input directories are
+specified.
 
 =item B<-i> I<DIR> (B<-ignore>)
 
@@ -5765,7 +5832,7 @@ Adding I<NUM> to the B<-if> option causes a separate processing pass to be
 executed for evaluating I<EXPR> at a B<-fast> level given by I<NUM> (see the
 B<-fast> option documentation for details).  Without I<NUM>, only one
 processing pass is done at the level specified by the B<-fast> option.  For
-example, using B<-if4> is possible if I<EXPR> uses only pseudo System tags,
+example, using B<-if5> is possible if I<EXPR> uses only pseudo System tags,
 and may significantly speed processing if enough files fail the condition.
 
 The expression has access to the current ExifTool object through C<$self>,
@@ -5774,7 +5841,8 @@ of the file processing.  Both functions have a return value of 1.  Case is
 significant for function names.
 
     End()    - end processing after this file
-    EndDir() - end processing of files in this directory
+    EndDir() - end processing of files in this directory (not
+               compatible with the B<-fileOrder> option)
 
 Notes:
 
@@ -6236,7 +6304,9 @@ about the configuration file syntax.
 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.
+respectively) after processing is complete.  For B<-echo3> and B<-echo4>,
+"${status}" may be used in the I<TEXT> string to represent the numerical
+exit status of the command (see L</EXIT STATUS>).
 
 =item B<-efile>[I<NUM>][!] I<ERRFILE>
 
@@ -6257,7 +6327,8 @@ commands were executed as separate command lines (with the exception of the
 B<-config> and B<-use> options which remain in effect for subsequent
 commands).  Allows multiple commands to be executed from a single command
 line.  I<NUM> is an optional number that is echoed in the "{ready}" message
-when using the B<-stay_open> feature.
+when using the B<-stay_open> feature.  If a I<NUM> is specified, the B<-q>
+option no longer suppresses the output "{readyNUM}" message.
 
 =item B<-srcfile> I<FMT>
 
@@ -6307,7 +6378,10 @@ received up to this point, send a "{ready}" message to stdout when done
 (unless the B<-q> or B<-T> option is used), and continue trying to read
 arguments for the next command from I<ARGFILE>.  To aid in command/response
 synchronization, any number appended to the C<-execute> option is echoed in
-the "{ready}" message.  For example, C<-execute613> results in "{ready613}".
+the "{ready}" message.  For example, C<-execute613> results in "{ready613}". 
+When this number is added, B<-q> no longer suppresses the "{ready}" message.
+(Also, see the B<-echo3> and B<-echo4> options for additional ways to pass
+signals back to your application.)
 
 4) Repeat steps 2 and 3 for each command.
 
@@ -6322,7 +6396,7 @@ writing the following lines to the currently open I<ARGFILE>:
     -@
     NEWARGFILE
 
-This causes I<ARGFILE> to be closed, and I<NEWARGFILE> to be kept open.
+This causes I<ARGFILE> to be closed, and I<NEWARGFILE> to be kept open. 
 (Without the B<-stay_open> here, exiftool would have returned to reading
 arguments from I<ARGFILE> after reaching the end of I<NEWARGFILE>.)