exiftool_vendored 12.18.0 → 12.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94a7d3e31a469a8fc6a58b020168e7076b56172144d98ffeda12f7b49d65a0a0
-  data.tar.gz: 18000853a1b6ae5728074fa49602ff41851844abbde34022ddc8971218607cf0
+  metadata.gz: e2862287affdad95022ad8df06fd1b420c2861e28f5daefa50c627c42db2e396
+  data.tar.gz: 90b7804c201830e6cacc5b28b9ba29ef4a5fff7bb6a1cb26db1fce970495769e
 SHA512:
-  metadata.gz: c1283d44ee24b5b60c13795ad8868359b616522db3b191060a81df0b8bde2f3f31d5dd57e7bebd05de9e2ac7a0ba1d4eba041d024824fbb077084930484ba49f
-  data.tar.gz: 79356beb3ffe088861e355a00c66439c6a4d28c6dfe7efc4591902da5d5d32649fbf110283507c5259ac77bc73f66d5504b64478b0570dfd5df3fb2eb7805221
+  metadata.gz: 85a74e99266a89cf019066af0227b8d6515b153d2d5612814afa1bac1faffa874e6defa7aa524577a4031154cc81f0b74277136476cf35c6bb2aa9cc35e1148f
+  data.tar.gz: 42911ad4e1f2c03ff6a95cc25f3fcb47f8fbda099d6cfb669e72fefa9c743b002865225d872d179654dc79f3958d6e94feb20d7bfb317e3006c7b8bdee195e98

data/bin/Changes

@@ -7,6 +7,60 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.16. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Mar. 17, 2021 - Version 12.22
+
+  - Added a few new Sony LensTypes and a new SonyModelID (thanks Jos Roost and
+    LibRaw)
+  - Added Extra BaseName tag
+  - Added a new CanonModelID (thanks LibRaw)
+  - Decode timed GPS from unlisted programs in M2TS videos with the -ee3 option
+  - Decode more Sony rtmd tags
+  - Decode some tags for the Sony ILME-FX3 (thanks Jos Roost)
+  - Allow negative values to be written to XMP-aux:LensID
+  - Recognize HEVC video program in M2TS files
+  - Enhanced -b option so --b suppresses tags with binary data
+  - Improved flexibility when writing GPS coordinates:
+      - Now pulls latitude and longitude from a combined GPSCoordinates string
+      - Recognizes the full word "South" and "West" to write negative coordinates
+  - Improved warning when trying to write an integer QuickTime date/time tag and
+    Time::Local is not available
+  - Convert GPSSpeed from mph to km/h in timed GPS from Garmin MP4 videos
+
+Feb. 24, 2021 - Version 12.21
+
+  - Added a few new iOS QuickTime tags
+  - Decode a couple more Sony rtmd tags
+  - Patch to avoid possible "Use of uninitialized value" warning when attempting
+    to write QuickTime date/time tags with an invalid value
+  - Fixed problem writing Microsoft Xtra tags
+  - Fixed Windows daylight savings time patch for file times that was broken in
+    12.19 (however directory times will not yet handle DST properly)
+
+Feb. 23, 2021 - Version 12.20
+
+  - Added ability to write some Microsoft Xtra tags in MOV/MP4 videos
+  - Added two new Canon LensType values (thanks Norbert Wasser)
+  - Added a new Nikon LensID
+  - Fixed problem reading FITS comments that start before column 11
+
+Feb. 18, 2021 - Version 12.19
+
+  - Added -list_dir option
+  - Added the "ls-l" Shortcut tag
+  - Extract Comment and History from FITS files
+  - Enhanced FilePermissions to include device type (similar to "ls -l")
+  - Changed the name of Apple ContentIdentifier tag to MediaGroupUUID
+    (thanks Neal Krawetz)
+  - Fixed a potential "substr outside of string" runtime error when reading
+    corrupted EXIF
+  - Fixed edge case where NikonScanIFD may not be copied properly when copying
+    MakerNotes to another file
+  - API Changes:
+      - Added ability to read/write System tags of directories
+      - Enhanced GetAllGroups() to support family 7 and take optional ExifTool
+        reference
+      - Changed QuickTimeHandler option default to 1
+
 Feb. 9, 2021 - Version 12.18
 
   - Added a new SonyModelID

data/bin/MANIFEST

@@ -759,6 +759,7 @@ t/QuickTime_12.out
 t/QuickTime_13.out
 t/QuickTime_14.out
 t/QuickTime_15.out
+t/QuickTime_16.out
 t/QuickTime_2.out
 t/QuickTime_3.out
 t/QuickTime_4.out

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.18"
+   "version" : "12.22"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.18
+version: 12.22

data/bin/README

@@ -106,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.18.tar.gz | tar -xf -
-  cd Image-ExifTool-12.18
+  gzip -dc Image-ExifTool-12.22.tar.gz | tar -xf -
+  cd Image-ExifTool-12.22
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/config_files/example.config

@@ -165,14 +165,7 @@
         # specified, then at least one of the Desire'd tags must exist.  See
         # the Composite table in Image::ExifTool::Exif for more examples,
         # and lib/Image/ExifTool/README for all of the details.
-        BaseName => {
-            Require => {
-                0 => 'FileName',
-            },
-            # remove the extension from FileName
-            ValueConv => '$val[0] =~ /(.*)\./ ? $1 : $val[0]',
-        },
-        # the next few examples demonstrate simplifications which may be
+        # The first few examples demonstrate simplifications which may be
         # used if only one tag is Require'd or Desire'd:
         # 1) the Require lookup may be replaced with a simple tag name
         # 2) "$val" may be used to represent "$val[0]" in the expression

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.18';
+my $version = '12.22';
 
 # 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:
@@ -474,6 +476,7 @@ undef $joinLists;
 undef $langOpt;
 undef $listItem;
 undef $multiFile;
+undef $noBinary;
 undef $outOpt;
 undef $preserveTime;
 undef $progress;
@@ -691,7 +694,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 +795,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 +883,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;
@@ -2270,6 +2278,7 @@ TAG:    foreach $tag (@foundTags) {
                     next unless $$et{REQ_TAG_LOOKUP}{$lcTag};
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
+                next unless defined $val;
                 if ($structOpt) {
                     # serialize structure if necessary
                     $val = Image::ExifTool::XMP::SerializeStruct($val) unless $xml or $json;
@@ -2708,7 +2717,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 +2920,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
@@ -3395,20 +3408,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 +3603,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)) {
@@ -4624,6 +4642,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)
@@ -4932,7 +4951,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
 
@@ -4958,17 +4977,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 must be specified explicitly to be extracted as binary in
+these formats.
 
-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>)
 
@@ -5369,7 +5392,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.18 --
+    -- Generated by ExifTool 12.22 --
     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
@@ -5729,7 +5752,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 +5842,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 +6271,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
 
@@ -6351,6 +6375,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 +6436,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 +6571,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 +6646,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 +6715,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
 #

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
 #

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.pm

@@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
 
-$VERSION = '12.18';
+$VERSION = '12.22';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -42,7 +42,7 @@ $RELEASE = '';
     DataAccess => [qw(
         ReadValue GetByteOrder SetByteOrder ToggleByteOrder Get8u Get8s Get16u
         Get16s Get32u Get32s Get64u GetFloat GetDouble GetFixed32s Write
-        WriteValue Tell Set8u Set8s Set16u Set32u Set64u
+        WriteValue Tell Set8u Set8s Set16u Set32u Set64u Set64s
     )],
     Utils => [qw(GetTagTable TagTableKeys GetTagInfoList AddTagToTable HexDump)],
     Vars  => [qw(%allTables @tableOrder @fileTypes)],
@@ -70,7 +70,7 @@ sub SetFileName($$;$$$);
 sub SetSystemTags($$);
 sub GetAllTags(;$);
 sub GetWritableTags(;$);
-sub GetAllGroups($);
+sub GetAllGroups($;$);
 sub GetNewGroups($);
 sub GetDeleteGroups();
 sub AddUserDefinedTags($%);
@@ -89,6 +89,7 @@ sub Get64u($$);
 sub GetFixed64s($$);
 sub GetExtended($$);
 sub Set64u(@);
+sub Set64s(@);
 sub DecodeBits($$;$);
 sub EncodeBits($$;$$);
 sub Filter($$$);
@@ -266,6 +267,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     DIB  => ['BMP',  'Device Independent Bitmap'],
     DIC  =>  'DICM',
     DICM => ['DICOM','Digital Imaging and Communications in Medicine'],
+    DIR  => ['DIR',  'Directory'],
     DIVX => ['ASF',  'DivX media format'],
     DJV  =>  'DJVU',
     DJVU => ['AIFF', 'DjVu image'],
@@ -1129,6 +1131,13 @@ my %systemTagsNotes = (
         RawConv => '$self->ConvertFileName($val)',
         ValueConvInv => '$self->InverseFileName($val)',
     },
+    BaseName => {
+        Groups => { 1 => 'System', 2 => 'Other' },
+        Notes => q{
+            file name without extension. Not generated unless specifically requested or
+            the L<RequestAll|../ExifTool.html#RequestAll> API option is set
+        },
+    },
     FilePath => {
         Groups => { 1 => 'System', 2 => 'Other' },
         Notes => q{
@@ -1270,10 +1279,19 @@ my %systemTagsNotes = (
         WritePseudo => 1,
         DelCheck => q{"Can't delete"},
         Protected => 1, # all writable pseudo-tags must be protected!
-        ValueConv => 'sprintf("%.3o", $val & 0777)',
-        ValueConvInv => 'oct($val)',
+        ValueConv => 'sprintf("%.3o", $val)',
+        ValueConvInv => 'oct($val & 07777)',
         PrintConv => sub {
-            my ($mask, $str, $val) = (0400, '', oct(shift));
+            my ($mask, $val) = (0400, oct(shift));
+            my %types = (
+                0010000 => 'p',
+                0020000 => 'c',
+                0040000 => 'd',
+                0060000 => 'b',
+                0120000 => 'l',
+                0140000 => 's',
+            );
+            my $str = $types{$val & 0170000} || '-';
             while ($mask) {
                 foreach (qw(r w x)) {
                     $str .= $val & $mask ? $_ : '-';
@@ -1284,6 +1302,7 @@ my %systemTagsNotes = (
         },
         PrintConvInv => sub {
             my ($bit, $val, $str) = (8, 0, shift);
+            $str = substr($str, 1) if length($str) == 10;
             return undef if length($str) != 9;
             while ($bit >= 0) {
                 foreach (qw(r w x)) {
@@ -2271,7 +2290,7 @@ sub ClearOptions($)
         NoPDFList   => undef,   # flag to avoid splitting PDF List-type tag values
         Password    => undef,   # password for password-protected PDF documents
         PrintConv   => 1,       # flag to enable print conversion
-        QuickTimeHandler => undef,  # flag to add mdir Handler to newly created Meta box
+        QuickTimeHandler => 1,  # flag to add mdir Handler to newly created Meta box
         QuickTimeUTC=> undef,   # assume that QuickTime date/time tags are stored as UTC
         RequestAll  => undef,   # extract all tags that must be specifically requested
         RequestTags => undef,   # extra tags to request (on top of those in the tag list)
@@ -2321,7 +2340,7 @@ sub ExtractInfo($;@)
     my $fast = $$options{FastScan} || 0;
     my $req = $$self{REQ_TAG_LOOKUP};
     my $reqAll = $$options{RequestAll} || 0;
-    my (%saveOptions, $reEntry, $rsize, $type, @startTime, $saveOrder);
+    my (%saveOptions, $reEntry, $rsize, $type, @startTime, $saveOrder, $isDir);
 
     # check for internal ReEntry option to allow recursive calls to ExtractInfo
     if (ref $_[1] eq 'HASH' and $_[1]{ReEntry} and
@@ -2394,6 +2413,11 @@ sub ExtractInfo($;@)
                 $realname =~ /\|$/ and $realname =~ s/^.*?"(.*?)".*/$1/s;
                 my ($dir, $name) = SplitFileName($realname);
                 $self->FoundTag('FileName', $name);
+                if ($$req{basename} or
+                   ($reqAll and not $$self{EXCL_TAG_LOOKUP}{basename}))
+                {
+                    $self->FoundTag('BaseName', $name =~ /(.*)\./ ? $1 : $name);
+                }
                 $self->FoundTag('Directory', $dir) if defined $dir and length $dir;
                 if ($$req{filepath} or
                    ($reqAll and not $$self{EXCL_TAG_LOOKUP}{filepath}))
@@ -2417,6 +2441,8 @@ sub ExtractInfo($;@)
                 # in Windows cmd shell pipe even though it really failed
                 $$raf{TESTED} = -1 if $filename eq '-' or $filename =~ /\|$/;
                 $$self{RAF} = $raf;
+            } elsif ($self->IsDirectory($filename)) {
+                $isDir = 1;
             } else {
                 $self->Error('Error opening file');
             }
@@ -2425,28 +2451,34 @@ sub ExtractInfo($;@)
         }
     }
 
-    while ($raf) {
-        my (@stat, $fileSize);
+    while ($raf or $isDir) {
+        my (@stat, $plainFile);
         if ($reEntry) {
             # we already set these tags
+        } elsif (not $raf) {
+            @stat = stat $filename;
         } elsif (not $$raf{FILE_PT}) {
             # get file size from image in memory
             $self->FoundTag('FileSize', length ${$$raf{BUFF_PT}});
         } elsif (-f $$raf{FILE_PT}) {
             # get file tags if this is a plain file
-            $fileSize = -s _;
             @stat = stat _;
-            my ($aTime, $mTime, $cTime) = $self->GetFileTime($$raf{FILE_PT});
-            $self->FoundTag('FileSize', $fileSize) if defined $fileSize;
-            $self->FoundTag('ResourceForkSize', $rsize) if $rsize;
-            $self->FoundTag('FileModifyDate', $mTime) if defined $mTime;
-            $self->FoundTag('FileAccessDate', $aTime) if defined $aTime;
-            my $cTag = $^O eq 'MSWin32' ? 'FileCreateDate' : 'FileInodeChangeDate';
-            $self->FoundTag($cTag, $cTime) if defined $cTime;
-            $self->FoundTag('FilePermissions', $stat[2]) if defined $stat[2];
+            $plainFile = 1;
+            # hack to patch Windows daylight savings time bug
+            @stat[8,9,10] = $self->GetFileTime($$raf{FILE_PT}) if $^O eq 'MSWin32';
         } else {
+            # (note that Windows directories will still show the
+            #  daylight savings time bug -- should fix this sometime)
             @stat = stat $$raf{FILE_PT};
         }
+        my $fileSize = $stat[7];
+        $self->FoundTag('FileSize', $stat[7]) if defined $stat[7];
+        $self->FoundTag('ResourceForkSize', $rsize) if $rsize;
+        $self->FoundTag('FileModifyDate', $stat[9]) if defined $stat[9];
+        $self->FoundTag('FileAccessDate', $stat[8]) if defined $stat[8];
+        my $cTag = $^O eq 'MSWin32' ? 'FileCreateDate' : 'FileInodeChangeDate';
+        $self->FoundTag($cTag, $stat[10]) if defined $stat[10];
+        $self->FoundTag('FilePermissions', $stat[2]) if defined $stat[2];
         # extract more system info if SystemTags option is set
         if (@stat) {
             my $sys = $$options{SystemTags} || ($reqAll and not defined $$options{SystemTags});
@@ -2486,11 +2518,18 @@ sub ExtractInfo($;@)
             if ($crDate or $mdItem or $xattr) {
                 require Image::ExifTool::MacOS;
                 Image::ExifTool::MacOS::GetFileCreateDate($self, $filename) if $crDate;
-                Image::ExifTool::MacOS::ExtractMDItemTags($self, $filename) if $mdItem;
+                Image::ExifTool::MacOS::ExtractMDItemTags($self, $filename) if $mdItem and $plainFile;
                 Image::ExifTool::MacOS::ExtractXAttrTags($self, $filename) if $xattr;
             }
         }
-
+        # do whatever else we can with directories, then return
+        if ($isDir or (defined $stat[2] and ($stat[2] & 0170000) == 0040000)) {
+            $self->FoundTag('FileType', 'DIR');
+            $self->FoundTag('FileTypeExtension', '');
+            $self->BuildCompositeTags() if $$options{Composite};
+            $raf->Close() if $raf;
+            return 1;
+        }
         # get list of file types to check
         my ($tiffType, %noMagic, $recognizedExt);
         my $ext = $$self{FILE_EXT} = GetFileExtension($realname);
@@ -4079,7 +4118,14 @@ sub GetFileTime($$)
     # open file by name if necessary
     unless (ref $file) {
         local *FH;
-        $self->Open(\*FH, $file) or $self->Warn("GetFileTime error for '${file}'"), return ();
+        unless ($self->Open(\*FH, $file)) {
+            if ($self->IsDirectory($file)) {
+                my @rtn = (stat $file)[8, 9, 10];
+                return @rtn if defined $rtn[0];
+            }
+            $self->Warn("GetFileTime error for '${file}'");
+            return ();
+        }
         $file = *FH;  # (not \*FH, so *FH will be kept open until $file goes out of scope)
     }
     # on Windows, try to work around incorrect file times when daylight saving time is in effect
@@ -5710,7 +5756,11 @@ sub GetUnixTime($;$)
     my ($timeStr, $isLocal) = @_;
     return 0 if $timeStr eq '0000:00:00 00:00:00';
     my @tm = ($timeStr =~ /^(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)(.*)/);
-    return undef unless @tm == 7 and eval { require Time::Local };
+    return undef unless @tm == 7;
+    unless (eval { require Time::Local }) {
+        warn "Time::Local is not installed\n";
+        return undef;
+    }
     my ($tzStr, $tzSec) = (pop(@tm), 0);
     # use specified timezone offset (if given) instead of local system time
     # if we are converting a local time value
@@ -5908,7 +5958,7 @@ sub ProcessTrailers($$)
     for (;;) { # loop through all trailers
         my ($proc, $outBuff);
         if ($dirName eq 'Insta360') {
-            require "Image/ExifTool/QuickTimeStream.pl";
+            require 'Image/ExifTool/QuickTimeStream.pl';
             $proc = 'Image::ExifTool::QuickTime::ProcessInsta360';
         } else {
             require "Image/ExifTool/$dirName.pm";