exiftool_vendored 12.18.0 → 12.33.0

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.18';
+my $version = '12.33';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -159,14 +159,17 @@ my $forcePrint;     # string to use for missing tag values (undef to not print t
 my $helped;         # flag to avoid printing help if no tags specified
 my $html;           # flag for html-formatted output (2=html dump)
 my $interrupted;    # flag set if CTRL-C is pressed during a critical process
+my $isBinary;       # true if value is a SCALAR ref
 my $isWriting;      # flag set if we are writing tags
 my $joinLists;      # flag set to join list values into a single string
 my $json;           # flag for JSON/PHP output format (1=JSON, 2=PHP)
 my $langOpt;        # language option
+my $listDir;        # treat a directory as a regular file
 my $listItem;       # item number for extracting single item from a list
 my $listSep;        # list item separator (', ' by default)
 my $mt;             # main ExifTool object
 my $multiFile;      # non-zero if we are scanning multiple files
+my $noBinary;       # flag set to ignore binary tags
 my $outFormat;      # -1=Canon format, 0=same-line, 1=tag names, 2=values only
 my $outOpt;         # output file or directory name
 my $overwriteOrig;  # flag to overwrite original file (1=overwrite, 2=in place)
@@ -203,7 +206,6 @@ 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 $isBinary;       # true if value is a SCALAR ref
 my $xml;            # flag for XML-formatted output
 
 # flag to keep the input -@ argfile open:
@@ -284,6 +286,7 @@ my @recommends = qw(
     Digest::SHA
     IO::Compress::Bzip2
     POSIX::strptime
+    Time::Local
     Unicode::LineBreak
     IO::Compress::RawDeflate
     IO::Uncompress::RawInflate
@@ -474,6 +477,7 @@ undef $joinLists;
 undef $langOpt;
 undef $listItem;
 undef $multiFile;
+undef $noBinary;
 undef $outOpt;
 undef $preserveTime;
 undef $progress;
@@ -691,7 +695,7 @@ for (;;) {
         } else { # 'g(\d*)'
             # list all groups in specified family
             my $family = $2 || 0;
-            PrintTagList("Groups in family $family", GetAllGroups($family));
+            PrintTagList("Groups in family $family", $mt->GetAllGroups($family));
         }
         next;
     }
@@ -792,7 +796,11 @@ for (;;) {
         next;
     }
     /^arg(s|format)$/i and $argFormat = 1, next;
-    /^b(inary)?$/i and $mt->Options(Binary => 1, NoPDFList => 1), $binaryOutput = 1, next;
+    if (/^(-?)b(inary)?$/i) {
+        ($binaryOutput, $noBinary) = $1 ? (undef, 1) : (1, undef);
+        $mt->Options(Binary => $binaryOutput, NoPDFList => $binaryOutput);
+        next;
+    }
     if (/^c(oordFormat)?$/i) {
         my $fmt = shift;
         $fmt or Error("Expecting coordinate format for -c option\n"), $badCmd=1, next;
@@ -876,6 +884,7 @@ for (;;) {
     }
     (/^D$/ or $a eq 'decimal') and $showTagID = 'D', next;
     /^delete_original(!?)$/i and $deleteOrig = ($1 ? 2 : 1), next;
+    /^list_dir$/i and $listDir = 1, next;
     (/^e$/ or $a eq '-composite') and $mt->Options(Composite => 0), next;
     (/^-e$/ or $a eq 'composite') and $mt->Options(Composite => 1), next;
     (/^E$/ or $a eq 'escapehtml') and require Image::ExifTool::HTML and $escapeHTML = 1, next;
@@ -1610,7 +1619,7 @@ if (@newValues) {
             next;
         }
         my %opts = ( Shift => 0 );  # shift values if possible instead of adding/deleting
-        # allow writing of 'unsafe' tags unless specified by wildcard
+        # allow writing of 'Unsafe' tags unless specified by wildcard
         $opts{Protected} = 1 unless $tag =~ /[?*]/;
 
         if ($tag =~ s/<// and defined $newVal) {
@@ -1945,10 +1954,19 @@ sub GetImageInfo($$)
     my $pipe = $file;
     if ($doUnzip) {
         # pipe through gzip or bzip2 if necessary
-        if ($file =~ /\.gz$/i) {
-            $pipe = qq{gzip -dc "$file" |};
-        } elsif ($file =~ /\.bz2$/i) {
-            $pipe = qq{bzip2 -dc "$file" |};
+        if ($file =~ /\.(gz|bz2)$/i) {
+            my $type = lc $1;
+            if ($file =~ /[^-_.'A-Za-z0-9\/\\]/) {
+                Warn "Error: Insecure zip file name. Skipped\n";
+                EFile($file);
+                ++$countBad;
+                return;
+            }
+            if ($type eq 'gz') {
+                $pipe = qq{gzip -dc "$file" |};
+            } else {
+                $pipe = qq{bzip2 -dc "$file" |};
+            }
         }
     }
     # evaluate -if expression for conditional processing
@@ -2209,7 +2227,7 @@ sub GetImageInfo($$)
                 my $f = $file;
                 CleanXML(\$f);
                 print $fp "\n<rdf:Description rdf:about='${f}'";
-                print $fp "\n  xmlns:et='http://ns.exiftool.ca/1.0/'";
+                print $fp "\n  xmlns:et='http://ns.exiftool.org/1.0/'";
                 print $fp " et:toolkit='Image::ExifTool $Image::ExifTool::VERSION'";
                 # define namespaces for all tag groups
                 my (%groups, @groups, $grp0, $grp1);
@@ -2231,7 +2249,7 @@ sub GetImageInfo($$)
                     unless ($grp eq $grp1 and $grp =~ /^(ExifTool|File|Composite|Unknown)$/) {
                         $grp .= "/$grp1";
                     }
-                    print $fp "\n  xmlns:$grp1='http://ns.exiftool.ca/$grp/1.0/'";
+                    print $fp "\n  xmlns:$grp1='http://ns.exiftool.org/$grp/1.0/'";
                 }
                 print $fp '>' if $outFormat < 1; # finish rdf:Description token unless short format
                 $ind = $outFormat >= 0 ? ' ' : '   ';
@@ -2267,10 +2285,11 @@ TAG:    foreach $tag (@foundTags) {
                     # avoid extracting Protected binary tags (eg. data blocks) [insider information]
                     my $lcTag = lc $tag;
                     $lcTag =~ s/ .*//;
-                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag};
+                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag} or ($$et{OPTIONS}{RequestAll} || 0) > 2;
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
-                if ($structOpt) {
+                next unless defined $val;
+                if ($structOpt and ref $val) {
                     # serialize structure if necessary
                     $val = Image::ExifTool::XMP::SerializeStruct($val) unless $xml or $json;
                 } elsif (ref $val eq 'ARRAY') {
@@ -2708,7 +2727,7 @@ sub SetImageInfo($$$)
                 return 0;
             }
         }
-        if (not $isStdout and ($et->IsDirectory($outfile) or $outfile =~ /\/$/)) {
+        if (not $isStdout and (($et->IsDirectory($outfile) and not $listDir) or $outfile =~ /\/$/)) {
             $outfile .= '/' unless $outfile =~ /\/$/;
             my $name = $file;
             $name =~ s/^.*\///s;    # remove directory name
@@ -2911,6 +2930,10 @@ sub SetImageInfo($$$)
         unless (defined $tmpFile) {
             # count the number of tags and pseudo-tags we are writing
             my ($numSet, $numPseudo) = $et->CountNewValues();
+            if ($numSet != $numPseudo and $et->IsDirectory($file)) {
+                print $vout "Can't write real tags to a directory - $infile\n" if defined $verbose;
+                $numSet = $numPseudo;
+            }
             if ($et->Exists($file)) {
                 unless ($numSet) {
                     # no need to write if no tags set
@@ -3227,7 +3250,8 @@ sub FormatXML($$$)
     } elsif (ref $val eq 'HASH') {
         $gt = " rdf:parseType='Resource'>";
         my $val2 = '';
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             # (some variable-namespace XML structure fields may have a different group)
             my $tok = /:/ ? $_ : ($grp . ':' . $_);
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
@@ -3304,7 +3328,8 @@ sub FormatJSON($$$)
     } elsif (ref $val eq 'HASH') {
         my ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
         print $fp $bra;
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             print $fp ',' if $comma;
             my $key = EscapeJSON($_, 1);
             print $fp qq(\n$ind  $key$sep );
@@ -3395,20 +3420,25 @@ sub AddGroups($$$$)
 #------------------------------------------------------------------------------
 # Convert binary data (SCALAR references) for printing
 # Inputs: 0) object reference
-# Returns: converted object
+# Returns: converted object, or undef if we don't want binary objects
 sub ConvertBinary($)
 {
     my $obj = shift;
     my ($key, $val);
     if (ref $obj eq 'HASH') {
         foreach $key (keys %$obj) {
-            $$obj{$key} = ConvertBinary($$obj{$key}) if ref $$obj{$key};
+            next unless ref $$obj{$key};
+            $$obj{$key} = ConvertBinary($$obj{$key});
+            return undef unless defined $$obj{$key};
         }
     } elsif (ref $obj eq 'ARRAY') {
         foreach $val (@$obj) {
-            $val = ConvertBinary($val) if ref $val;
+            next unless ref $val;
+            $val = ConvertBinary($val);
+            return undef unless defined $val;
         }
     } elsif (ref $obj eq 'SCALAR') {
+        return undef if $noBinary;
         # (binaryOutput flag is set to 0 for binary mode of XML/PHP/JSON output formats)
         if (defined $binaryOutput) {
             $obj = $$obj;
@@ -3585,7 +3615,7 @@ sub ProcessFiles($;$)
             ++$progressCount;
             $progStr = " [$progressCount/$progressMax]" if $progress;
         }
-        if ($et->IsDirectory($file)) {
+        if ($et->IsDirectory($file) and not $listDir) {
             $multiFile = $validFile = 1;
             ScanDir($et, $file, $list);
         } elsif ($filterFlag and not AcceptFile($file)) {
@@ -4244,7 +4274,10 @@ sub FilterArgfileLine($)
         # escaped by an odd number of backslashes, and escape a single backslash
         # if it occurs at the end of the string
         $arg =~ s{\\(.)|(["\$\@]|\\$)}{'\\'.($2 || $1)}sge;
-        $arg = eval qq{"$arg"};     # un-escape characters in C string
+        # un-escape characters in C string
+        my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n",
+                    r => "\r", t => "\t", '"' => '"', '\\' => '\\' );
+        $arg =~ s/\\(.)/$esc{$1}||'\\'.$1/egs;
     } else {
         $arg =~ s/^\s+//;           # remove leading white space
         $arg =~ s/[\x0d\x0a]+$//s;  # remove trailing newline
@@ -4450,47 +4483,48 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  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   |
+  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RIFF  r
+  3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RSRC  r
+  3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RTF   r
+  3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RW2   r/w
+  A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWL   r/w
+  AA    r     | DYLIB r     | K25   r     | OGV   r     | RWZ   r
+  AAE   r     | EIP   r     | KDC   r     | ONP   r     | RM    r
+  AAX   r/w   | EPS   r/w   | KEY   r     | OPUS  r     | SEQ   r
+  ACR   r     | EPUB  r     | LA    r     | ORF   r/w   | SKETCH r
+  AFM   r     | ERF   r/w   | LFP   r     | ORI   r/w   | SO    r
+  AI    r/w   | EXE   r     | LIF   r     | OTF   r     | SR2   r/w
+  AIFF  r     | EXIF  r/w/c | LNK   r     | PAC   r     | SRF   r
+  APE   r     | EXR   r     | LRV   r/w   | PAGES r     | SRW   r/w
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PBM   r/w   | SVG   r
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCD   r     | SWF   r
+  ASF   r     | FFF   r/w   | MACOS r     | PCX   r     | THM   r/w
+  AVI   r     | FITS  r     | MAX   r     | PDB   r     | TIFF  r/w
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PDF   r/w   | TORRENT r
+  AZW   r     | FLAC  r     | MIE   r/w/  | PEF   r/w   | TTC   r
+  BMP   r     | FLIF  r/w   | MIFF  r   c | PFA   r     | TTF   r
+  BPG   r     | FLV   r     | MKA   r     | PFB   r     | TXT   r
+  BTF   r     | FPF   r     | MKS   r     | PFM   r     | VCF   r
+  CHM   r     | FPX   r     | MKV   r     | PGF   r     | VRD   r/w/c
+  COS   r     | GIF   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
+  CR2   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
+  CR3   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
+  CRM   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r
+  CRW   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
+  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
+  CSV   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
+  CZI   r     | HTML  r     | MP4   r/w   | PPTX  r     | WTV   r
+  DCM   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WV    r
+  DCP   r/w   | ICS   r     | MPG   r     | PSB   r/w   | X3F   r/w
+  DCR   r     | IDML  r     | MPO   r/w   | PSD   r/w   | XCF   r
+  DFONT r     | IIQ   r/w   | MQV   r/w   | PSP   r     | XLS   r
+  DIVX  r     | IND   r/w   | MRC   r     | QTIF  r/w   | XLSX  r
+  DJVU  r     | INSP  r/w   | MRW   r/w   | R3D   r     | XMP   r/w/c
+  DLL   r     | INSV  r     | MXF   r     | RA    r     | ZIP   r
+  DNG   r/w   | INX   r     | NEF   r/w   | RAF   r/w   |
+  DOC   r     | ISO   r     | NRW   r/w   | RAM   r     |
+  DOCX  r     | ITC   r     | NUMBERS r   | RAR   r     |
+  DPX   r     | J2C   r     | O     r     | RAW   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4624,6 +4658,7 @@ L<Advanced options|/Advanced options>
   -echo[NUM] TEXT                  Echo text to stdout or stderr
   -efile[NUM][!] ERRFILE           Save names of files with errors
   -execute[NUM]                    Execute multiple commands on one line
+  -list_dir                        List directories, not their contents
   -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)
@@ -4697,11 +4732,11 @@ I<TAG> may contain one or more leading family 0, 1, 2 or 7 group names,
 prefixed by optional family numbers, and separated colons.  If no group name
 is specified, the tag is created in the preferred group, and updated in any
 other location where a same-named tag already exists.  The preferred group
-is the first group in the following list where I<TAG> is valid: 1) EXIF, 2)
-IPTC, 3) XMP.
+in JPEG and TIFF-format images is the first group in the following list
+where I<TAG> is valid: 1) EXIF, 2) IPTC, 3) XMP.
 
 The wildcards C<*> and C<?> may be used in tag names to assign the same
-value to multiple tags.  When specified with wildcards, "unsafe" tags are
+value to multiple tags.  When specified with wildcards, "Unsafe" tags are
 not written.  A tag name of C<All> is equivalent to C<*> (except that it
 doesn't require quoting, while arguments with wildcards do on systems with
 shell globbing), and is often used when deleting all metadata (ie. C<-All=>)
@@ -4847,10 +4882,10 @@ See L</COPYING EXAMPLES> for examples using B<-tagsFromFile>.
 Notes:
 
 1) Some tags (generally tags which may affect the appearance of the image)
-are considered "unsafe" to write, and are only copied if specified
+are considered "Unsafe" to write, and are only copied if specified
 explicitly (ie. no wildcards).  See the
 L<tag name documentation|Image::ExifTool::TagNames> for more details about
-"unsafe" tags.
+"Unsafe" tags.
 
 2) Be aware of the difference between excluding a tag from being copied
 (--I<TAG>), and deleting a tag (-I<TAG>=).  Excluding a tag prevents it from
@@ -4932,7 +4967,7 @@ documentation above for a complete description.
 =head3 Input-output text formatting
 
 Note that trailing spaces are removed from extracted values for most output
-text formats.  The exceptions are C<-b>, C<-csv>, C<-j> and C<-X>.
+text formats.  The exceptions are B<-b>, B<-csv>, B<-j> and B<-X>.
 
 =over 5
 
@@ -4948,7 +4983,7 @@ intermediate file (C<out.args> in this example):
     exiftool -@ out.args -sep ', ' dst.jpg
 
 Note:  Be careful when copying information with this technique since it is
-easy to write tags which are normally considered "unsafe".  For instance,
+easy to write tags which are normally considered "Unsafe".  For instance,
 the FileName and Directory tags are excluded in the example above to avoid
 renaming and moving the destination file.  Also note that the second command
 above will produce warning messages for any tags which are not writable.
@@ -4958,17 +4993,21 @@ maintain separate list items when writing metadata back to image files, and
 the B<-struct> option may be used when extracting to preserve structured XMP
 information.
 
-=item B<-b> (B<-binary>)
+=item B<-b>, B<--b> (B<-binary>, B<--binary>)
+
+Output requested metadata in binary format without tag names or descriptions
+(B<-b> or B<-binary>).  This option is mainly used for extracting embedded
+images or other binary data, but it may also be useful for some text strings
+since control characters (such as newlines) are not replaced by '.' as they
+are in the default output.  By default, list items are separated by a
+newline when extracted with the B<-b> option, but this may be changed (see
+the B<-sep> option for details).  May be combined with B<-j>, B<-php> or
+B<-X> to extract binary data in JSON, PHP or XML format, but note that
+"Unsafe" tags are not extracted as binary unless they are specified explicitly or
+the API RequestAll option is set to 3 or higher.
 
-Output requested metadata in binary format without tag names or
-descriptions.  This option is mainly used for extracting embedded images or
-other binary data, but it may also be useful for some text strings since
-control characters (such as newlines) are not replaced by '.' as they are in
-the default output.  By default, list items are separated by a newline when
-extracted with the B<-b> option, but this may be changed (see the B<-sep>
-option for details).  May be combined with C<-j>, C<-php> or C<-X> to
-extract binary data in JSON, PHP or XML format, but note that "unsafe" tags
-must be specified explicitly to be extracted as binary in these formats.
+With a leading double dash (B<--b> or B<--binary>), tags which contain
+binary data are suppressed in the output when reading.
 
 =item B<-c> I<FMT> (B<-coordFormat>)
 
@@ -5166,7 +5205,7 @@ By default the resulting group name is simplified by removing any leading
 C<Main:> and collapsing adjacent identical group names, but this can be
 avoided by placing a colon before the first family number (eg. B<-g:3:1>).
 Use the B<-listg> option to list group names for a specified family.  The
-SavePath and SaveFormat API options are automatically enabled if the
+API SavePath and SaveFormat options are automatically enabled if the
 respective family 5 or 6 group names are requested.  See the
 L<API GetGroup documentation|Image::ExifTool/GetGroup> for more information.
 
@@ -5369,7 +5408,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.18 --
+    -- Generated by ExifTool 12.33 --
     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
@@ -5386,7 +5425,7 @@ are effectively processed as separate input files.
 If a specified tag does not exist, a minor warning is issued and the line
 with the missing tag is not printed.  However, the B<-f> option may be used
 to set the value of missing tags to '-' (but this may be configured via the
-MissingTagValue API option), or the B<-m> option may be used to ignore minor
+API MissingTagValue option), or the B<-m> option may be used to ignore minor
 warnings and leave the missing values empty.  Alternatively, B<-q -q> may be
 used to simply suppress the warning messages.
 
@@ -5685,9 +5724,10 @@ The B<-t> option adds tag table information to the output (see B<-t> for
 details).
 
 Note:  This output is NOT the same as XMP because it uses
-dynamically-generated property names corresponding to the ExifTool tag
-names, and not the standard XMP properties.  To write XMP instead, use the
-B<-o> option with an XMP extension for the output file.
+dynamically-generated property names corresponding to the ExifTool tag names
+with ExifTool family 1 group names as namespaces, and not the standard XMP
+properties and namespaces.  To write XMP instead, use the B<-o> option with
+an XMP extension for the output file.
 
 =back
 
@@ -5729,7 +5769,8 @@ L<https://exiftool.org/geotag.html#Inverse> for examples.
 Setting I<NUM> to 2 causes the H264 video stream in MP4 videos to be parsed
 until the first Supplemental Enhancement Information (SEI) message is
 decoded, or 3 to parse the entire H624 stream and decode all SEI
-information.
+information.  For M2TS videos, a setting of 3 causes the entire file to be
+parsed in search of unlisted programs which may contain timed GPS.
 
 =item B<-ext>[+] I<EXT>, B<--ext> I<EXT> (B<-extension>)
 
@@ -5818,10 +5859,10 @@ Ignore specified directory name.  I<DIR> may be either an individual folder
 name, or a full path.  If a full path is specified, it must match the
 Directory tag exactly to be ignored.  Use multiple B<-i> options to ignore
 more than one directory name.  A special I<DIR> value of C<SYMLINKS> (case
-sensitive) may be specified to ignore symbolic links when the B<-r> option
-is used.  As well, a value of C<HIDDEN> (case sensitive) may be used to
-ignore files with names that start with a "." (ie. hidden files on Unix
-systems) when scanning a directory.
+sensitive) may be specified to avoid recursing into directories which are
+symbolic links when the B<-r> option is used.  As well, a value of C<HIDDEN>
+(case sensitive) may be used to ignore files with names that start with a
+"." (ie. hidden files on Unix systems) when scanning a directory.
 
 =item B<-if>[I<NUM>] I<EXPR>
 
@@ -6247,7 +6288,7 @@ As a convenience, C<-use MWG> is assumed if the C<MWG> group is specified
 for any tag on the command line.  See the L<MWG Tags
 documentation|Image::ExifTool::TagNames/MWG Tags> for more details.  Note
 that this option is not reversible, and remains in effect until the
-application terminates, even across the C<-execute> option.
+application terminates, even across the B<-execute> option.
 
 =back
 
@@ -6333,7 +6374,7 @@ exit status of the command (see L</EXIT STATUS>).
 
 Save the names of files giving errors (I<NUM> missing or 1), files that were
 unchanged (I<NUM> is 2), files that fail the B<-if> condition (I<NUM> is 4),
-or any combination thereof (by summing I<NUM>, eg. B<-efile3> is the same
+or any combination thereof by summing I<NUM> (eg. B<-efile3> is the same
 has having both B<-efile> and B<-efile2> options with the same I<ERRFILE>).
 By default, file names are appended to any existing I<ERRFILE>, but
 I<ERRFILE> is overwritten if an exclamation point is added to the option
@@ -6351,6 +6392,20 @@ line.  I<NUM> is an optional number that is echoed in the "{ready}" message
 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<-list_dir>
+
+List directories themselves instead of their contents.  This option
+effectively causes directories to be treated as normal files when reading
+and writing.  For example, with this option the output of the C<ls -la>
+command on Mac/Linux may be approximated by this exiftool command:
+
+    exiftool -list_dir -T -ls-l -api systemtags -fast5 .* *
+
+(The B<-T> option formats the output in tab-separated columns, B<-ls-l> is a
+L<shortcut tag|Image::ExifTool::Shortcuts>, the API SystemTags option is
+required to extract some necessary tags, and the B<-fast5> option is added
+for speed since only system tags are being extracted.)
+
 =item B<-srcfile> I<FMT>
 
 Specify a different source file to be processed based on the name of the
@@ -6398,7 +6453,7 @@ buffered output.)  ExifTool will then execute the command with the arguments
 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
+synchronization, any number appended to the B<-execute> option is echoed in
 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
@@ -6533,8 +6588,8 @@ complete list).  Setting this triggers the use of Windows wide-character i/o
 routines, thus providing support for most Unicode file names (see note 4). 
 But note that it is not trivial to pass properly encoded file names on the
 Windows command line (see L<https://exiftool.org/faq.html#Q18> for details),
-so placing them in a UTF-8 encoded B<-@> argfile and using C<-charset
-filename=utf8> is recommended if possible.
+so placing them in a UTF-8 encoded B<-@> argfile and using
+C<-charset filename=utf8> is recommended if possible.
 
 A warning is issued if a specified filename contains special characters and
 the filename character set was not provided.  However, the warning may be
@@ -6608,7 +6663,7 @@ Print all meta information in an image, including duplicate and unknown
 tags, sorted by group (for family 1).  For performance reasons, this command
 may not extract all available metadata.  (Metadata in embedded documents,
 metadata extracted by external utilities, and metadata requiring excessive
-processing time may not be extracted).  Add C<-ee> and C<-api RequestAll=3>
+processing time may not be extracted).  Add C<-ee3> and C<-api RequestAll=3>
 to the command to extract absolutely everything available.
 
 =item exiftool -common dir
@@ -6677,7 +6732,7 @@ L<Image::ExifTool::TagNames|Image::ExifTool::TagNames>).
 Print one line of output containing the file name and DateTimeOriginal for
 each image in directory C<dir>.
 
-=item exiftool -ee -p '$gpslatitude, $gpslongitude, $gpstimestamp' a.m2ts
+=item exiftool -ee3 -p '$gpslatitude, $gpslongitude, $gpstimestamp' a.m2ts
 
 Extract all GPS positions from an AVCHD video.
 

data/bin/fmt_files/gpx.fmt

@@ -3,7 +3,7 @@
 #
 # Description:  Example ExifTool print format file to generate a GPX track log
 #
-# Usage:        exiftool -p gpx.fmt -ee FILE [...] > out.gpx
+# Usage:        exiftool -p gpx.fmt -ee3 FILE [...] > out.gpx
 #
 # Requires:     ExifTool version 10.49 or later
 #
@@ -13,7 +13,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

data/bin/fmt_files/gpx_wpt.fmt

@@ -4,7 +4,7 @@
 # Description:  Example ExifTool print format file to generate GPX waypoints
 #               with pictures
 #
-# Usage:        exiftool -p gpx_wpt.fmt -ee FILE [...] > out.gpx
+# Usage:        exiftool -p gpx_wpt.fmt -ee3 FILE [...] > out.gpx
 #
 # Requires:     ExifTool version 10.49 or later
 #
@@ -14,7 +14,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

data/bin/fmt_files/kml.fmt

@@ -15,7 +15,7 @@
 #               2020/01/11 - F. Kotov Limited image preview size to 500px
 #
 # Notes:     1) Input files must contain GPSLatitude and GPSLongitude.
-#            2) Add the -ee option to extract the full track from video files.
+#            2) Add the -ee3 option to extract the full track from video files.
 #            3) For Google Earth to be able to find the images, the input
 #               images must be specified using relative paths, and "out.kml"
 #               must stay in the same directory as where the command was run.

data/bin/fmt_files/kml_track.fmt

@@ -11,7 +11,7 @@
 #
 #               From video files:
 #
-#                 exiftool -p kml.fmt -ee FILEorDIR [...] > out.kml
+#                 exiftool -p kml.fmt -ee3 FILEorDIR [...] > out.kml
 #
 # Requires:     ExifTool version 10.41 or later
 #

data/bin/lib/Image/ExifTool/Apple.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.04';
+$VERSION = '1.05';
 
 # Apple iPhone metadata (ref PH)
 %Image::ExifTool::Apple::Main = (
@@ -72,7 +72,8 @@ $VERSION = '1.04';
     # 0x000f - int32s: 2,3
     # 0x0010 - int32s: 1
     0x0011 => {
-        Name => 'ContentIdentifier', #forum8750
+        Name => 'MediaGroupUUID', #NealKrawetz private communication
+        # (changed in 12.19 from Name => 'ContentIdentifier', #forum8750)
         Writable => 'string',
     },
     # 0x0014 - int32s: 1,2,3,4,5 (iPhone 6s, iOS 6.1)