exiftool_vendored 12.50.0 → 12.52.0

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 26027 tags, with 16663 unique tag names.
+They contain a total of 26197 tags, with 16717 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -14436,6 +14436,8 @@ These tags are extracted from encrypted data in images from the Z9.
   60143    PitchAngle                           fixed32u
   60147    YawAngle                             fixed32u
   60491    MenuSettingsZ9                       Nikon MenuSettingsZ9
+                                                -
+                                                Nikon MenuSettingsZ9Firmware3
 
 =head3 Nikon MenuSettingsZ9 Tags
 
@@ -14513,6 +14515,79 @@ These tags are used by the Z9.
    1636    USBPowerDelivery?                    int8u
    1645    SensorShield?                        int8u
 
+=head3 Nikon MenuSettingsZ9Firmware3 Tags
+
+These tags are used by the Z9 firmware 3.00.
+
+  Index1 Tag Name                               Writable
+  ---------------                               --------
+  154    MultipleExposureMode                   int8u
+  156    MultiExposureShots                     int8u
+  204    Intervals                              int32u
+  208    ShotsPerInterval                       int32u
+  248    FocusShiftNumberShots                  int8u
+  252    FocusShiftStepWidth                    int8u
+  256    FocusShiftInterval                     int8u~
+  260    FocusShiftExposureLock?                int8u
+  290    PhotoShootingMenuBank                  int8u
+  292    ExtendedMenuBanks                      int8u
+  328    PhotoShootingMenuBankImageArea         int8u
+  342    AutoISO                                int8u
+  344    ISOAutoHiLimit?                        int16u
+  346    ISOAutoFlashLimit?                     int16u
+  354    ISOAutoShutterTime                     no
+  436    MovieVignetteControl?                  int8u
+  438    DiffractionCompensation                int8u
+  440    FlickerReductionShooting               int8u
+  548    AFAreaMode                             int8u
+  550    VRMode                                 int8u
+  554    BracketSet                             int8u
+  556    BracketProgram                         int8u
+  558    BracketIncrement                       int8u
+  576    SecondarySlotFunction                  int8u
+  592    DXCropAlert                            int8u
+  594    SubjectDetection                       int8u
+  636    HighFrequencyFlickerReductionShooting? int8u
+  646    MovieImageArea?                        int8u & 0x01
+  656    MovieType?                             int8u
+  658    MovieISOAutoHiLimit?                   int16u
+  660    MovieISOAutoControlManualMode?         int8u
+  662    MovieISOAutoManualMode?                int16u
+  736    MovieActiveD-Lighting?                 int8u
+  738    MovieHighISONoiseReduction?            int8u
+  744    MovieFlickerReduction                  int8u
+  746    MovieMeteringMode?                     int8u
+  748    MovieFocusMode?                        int8u
+  750    MovieAFAreaMode                        int8u
+  752    MovieVRMode?                           int8u
+  756    MovieElectronicVR?                     int8u
+  758    MovieSoundRecording?                   int8u
+  760    MicrophoneSensitivity?                 int8u
+  762    MicrophoneAttenuator?                  int8u
+  764    MicrophoneFrequencyResponse?           int8u
+  766    WindNoiseReduction?                    int8u
+  788    MovieToneMap?                          int8u
+  794    MovieFrameSize?                        int8u
+  796    MovieFrameRate?                        int8u
+  802    MicrophoneJackPower?                   int8u
+  803    MovieDXCropAlert?                      int8u
+  804    MovieSubjectDetection?                 int8u
+  812    MovieHighResZoom?                      int8u
+  847    CustomSettingsZ9                       NikonCustom SettingsZ9
+  1474   Language?                              int8u
+  1476   TimeZone                               int8u
+  1482   MonitorBrightness?                     int8u
+  1504   AFFineTune?                            int8u
+  1600   HDMIOutputResolution                   int8u
+  1613   SetClockFromLocationData?              int8u
+  1620   AirplaneMode?                          int8u
+  1621   EmptySlotRelease?                      int8u
+  1656   EnergySavingMode?                      int8u
+  1680   RecordLocationData?                    int8u
+  1684   USBPowerDelivery?                      int8u
+  1693   SensorShield?                          int8u
+  1754   FocusShiftAutoReset?                   int8u
+
 =head3 Nikon ShotInfo Tags
 
 This information is encrypted for ShotInfoVersion 02xx, and some tags are
@@ -16306,7 +16381,9 @@ Custom settings for the Z9.
     191    UseDialWithoutHold?                  int8u
     193    ReverseIndicators?                   int8u
     195    MovieFunc1Button                     int8u
+    199    MovieFunc2Button                     int8u
     203    MovieAF-OnButton                     int8u
+    215    MovieLensControlRing                 int8u
     217    MovieMultiSelector?                  int8u
     221    MovieAFSpeed                         int8u
     223    MovieAFSpeedApply                    int8u
@@ -23588,6 +23665,7 @@ writes only EXIF, IPTC and XMP tags in Jpeg2000 images.
   'bfil'   BinaryFilter                         no
   'bidb'   BinaryData                           no
   'bpcc'   BitsPerComponent                     no
+  'c2sh'   C2PASaltHash                         no
   'cbor'   CBORData                             CBOR
   'cdef'   ComponentDefinition                  no
   'cgrp'   ColorGroup                           no
@@ -25710,6 +25788,7 @@ check if speed is more of a concern.
   'acTL'             AnimationControl           PNG AnimationControl
   'bKGD'             BackgroundColor            no
   'cHRM'             PrimaryChromaticities      PNG PrimaryChromaticities
+  'caBX'             JUMBF                      Jpeg2000
   'dSIG'             DigitalSignature           no
   'eXIf'             eXIf                       EXIF
   'fRAc'             FractalParameters          no
@@ -27543,64 +27622,64 @@ View Camera Motion Metadata of MP4 videos.  See
 L<https://developers.google.com/streetview/publish/camm-spec> for the
 specification.
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    AngleAxis                            no
+  0x0004   AngleAxis                            no
 
 =head3 QuickTime camm1 Tags
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    PixelExposureTime                    no
-      8    RollingShutterSkewTime               no
+  0x0004   PixelExposureTime                    no
+  0x0008   RollingShutterSkewTime               no
 
 =head3 QuickTime camm2 Tags
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    AngularVelocity                      no
+  0x0004   AngularVelocity                      no
 
 =head3 QuickTime camm3 Tags
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    Acceleration                         no
+  0x0004   Acceleration                         no
 
 =head3 QuickTime camm4 Tags
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    Position                             no
+  0x0004   Position                             no
 
 =head3 QuickTime camm5 Tags
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    GPSLatitude                          no
-     12    GPSLongitude                         no
-     20    GPSAltitude                          no
+  0x0004   GPSLatitude                          no
+  0x000c   GPSLongitude                         no
+  0x0014   GPSAltitude                          no
 
 =head3 QuickTime camm6 Tags
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    GPSDateTime                          no
-     12    GPSMeasureMode                       no
-     16    GPSLatitude                          no
-     24    GPSLongitude                         no
-     32    GPSAltitude                          no
-     36    GPSHorizontalAccuracy                no
-     40    GPSVerticalAccuracy                  no
-     44    GPSVelocityEast                      no
-     48    GPSVelocityNorth                     no
-     52    GPSVelocityUp                        no
-     56    GPSSpeedAccuracy                     no
+  0x0004   GPSDateTime                          no
+  0x000c   GPSMeasureMode                       no
+  0x0010   GPSLatitude                          no
+  0x0018   GPSLongitude                         no
+  0x0020   GPSAltitude                          no
+  0x0024   GPSHorizontalAccuracy                no
+  0x0028   GPSVerticalAccuracy                  no
+  0x002c   GPSVelocityEast                      no
+  0x0030   GPSVelocityNorth                     no
+  0x0034   GPSVelocityUp                        no
+  0x0038   GPSSpeedAccuracy                     no
 
 =head3 QuickTime camm7 Tags
 
-  Index1   Tag Name                             Writable
+  Tag ID   Tag Name                             Writable
   ------   --------                             --------
-      4    MagneticField                        no
+  0x0004   MagneticField                        no
 
 =head3 QuickTime marl Tags
 
@@ -27880,7 +27959,7 @@ QuickTimeHandler option may be set to 0 to avoid this.
   'pcst'       Podcast                          int8s
   'perf'       Performer                        string
   'pgap'       PlayGap                          int8s
-  'plID'       PlayListID                       int32s[0.25]
+  'plID'       PlayListID                       int32s[2]
   'prID'       ProductID                        string
   'purd'       PurchaseDate                     string
   'purl'       PodcastURL                       string
@@ -30319,7 +30398,7 @@ Matroska specification.
   0x037e       ChapterCountry                   no
   0x0444       SegmentFamily?                   no
   0x0461       DateTimeOriginal                 no
-  0x047a       TagLanguage                      no
+  0x047a       TagLanguageBCP47                 no
   0x0484       TagDefault                       no
   0x0485       TagBinary                        no
   0x0487       TagString                        no
@@ -30377,10 +30456,10 @@ Matroska specification.
   0x23a2       CodecPrivate?                    no
   0x23c0       Targets                          Matroska
   0x23c3       ChapterPhysicalEquivalent        no
-  0x23c4       TagChapterUID?                   no
-  0x23c5       TagTrackUID?                     no
-  0x23c6       TagAttachmentUID?                no
-  0x23c9       TagEditionUID?                   no
+  0x23c4       TagChapterUID                    no
+  0x23c5       TagTrackUID                      no
+  0x23c6       TagAttachmentUID                 no
+  0x23c9       TagEditionUID                    no
   0x23ca       TargetType                       no
   0x2532       SignedElement?                   no
   0x2624       TrackTranslate                   Matroska
@@ -30408,7 +30487,7 @@ Matroska specification.
   0x3384       SegmentFileName                  no
   0x33a4       SegmentUID?                      no
   0x33c4       ChapterUID?                      no
-  0x33c5       TrackUID?                        no
+  0x33c5       TrackUID                         no
   0x3446       TrackAttachmentUID               no
   0x35a1       BlockAdditions                   Matroska
   0x38b5       OutputAudioSampleRate            no
@@ -30468,6 +30547,116 @@ for the specification.
   0x7674   ProjectionPosePitch                  no
   0x7675   ProjectionPoseRoll                   no
 
+=head3 Matroska  Tags
+
+Standardized Matroska tags (see
+L<https://www.matroska.org/technical/tagging.html>).
+
+  Tag ID                  Tag Name              Writable
+  ------                  --------              --------
+  'ACCOMPANIMENT'         Accompaniment         no
+  'ACTOR'                 Actor                 no
+  'ADDRESS'               Address               no
+  'ARRANGER'              Arranger              no
+  'ARTIST'                Artist                no
+  'ART_DIRECTOR'          ArtDirector           no
+  'ASSISTANT_DIRECTOR'    AssistantDirector     no
+  'BARCODE'               Barcode               no
+  'BPM'                   BPM                   no
+  'BPS'                   BPS                   no
+  'CATALOG_NUMBER'        CatalogNumber         no
+  'CHARACTER'             Character             no
+  'CHOREGRAPHER'          Choregrapher          no
+  'COMMENT'               Comment               no
+  'COMPOSER'              Composer              no
+  'COMPOSER_NATIONALITY'  ComposerNationality   no
+  'COMPOSITION_LOCATION'  CompositionLocation   no
+  'CONDUCTOR'             Conductor             no
+  'CONTENT_TYPE'          ContentType           no
+  'COPRODUCER'            Coproducer            no
+  'COPYRIGHT'             Copyright             no
+  'COSTUME_DESIGNER'      CostumeDesigner       no
+  'COUNTRY'               Country               no
+  'DATE_DIGITIZED'        CreateDate            no
+  'DATE_ENCODED'          DateEncoded           no
+  'DATE_PURCHASED'        DatePurchased         no
+  'DATE_RECORDED'         DateTimeOriginal      no
+  'DATE_RELEASED'         DateReleased          no
+  'DATE_TAGGED'           DateTagged            no
+  'DATE_WRITTEN'          DateWritten           no
+  'DESCRIPTION'           Description           no
+  'DIRECTOR'              Director              no
+  'DIRECTOR_OF_PHOTOGRAPHY'
+                          DirectorOfPhotography no
+  'DISTRIBUTED_BY'        DistributedBy         no
+  'EDITED_BY'             EditedBy              no
+  'EMAIL'                 Email                 no
+  'ENCODED_BY'            EncodedBy             no
+  'ENCODER'               Encoder               no
+  'ENCODER_SETTINGS'      EncoderSettings       no
+  'EXECUTIVE_PRODUCER'    ExecutiveProducer     no
+  'FAX'                   FAX                   no
+  'FPS'                   FPS                   no
+  'GENRE'                 Genre                 no
+  'IMDB'                  IMDB                  no
+  'INITIAL_KEY'           InitialKey            no
+  'INSTRUMENTS'           Instruments           no
+  'ISBN'                  ISBN                  no
+  'ISRC'                  ISRC                  no
+  'KEYWORDS'              Keywords              no
+  'LABEL'                 Label                 no
+  'LABEL_CODE'            LabelCode             no
+  'LAW_RATING'            LawRating             no
+  'LCCN'                  Lccn                  no
+  'LEAD_PERFORMER'        LeadPerformer         no
+  'LICENSE'               License               no
+  'LYRICIST'              Lyricist              no
+  'LYRICS'                Lyrics                no
+  'MASTERED_BY'           MasteredBy            no
+  'MCDI'                  MCDI                  no
+  'MEASURE'               Measure               no
+  'MIXED_BY'              MixedBy               no
+  'MOOD'                  Mood                  no
+  'ORIGINAL'              Original              no
+  'ORIGINAL_MEDIA_TYPE'   OriginalMediaType     no
+  'PART_NUMBER'           PartNumber            no
+  'PART_OFFSET'           PartOffset            no
+  'PERIOD'                Period                no
+  'PHONE'                 Phone                 no
+  'PLAY_COUNTER'          PlayCounter           no
+  'PRODUCER'              Producer              no
+  'PRODUCTION_COPYRIGHT'  ProductionCopyright   no
+  'PRODUCTION_DESIGNER'   ProductionDesigner    no
+  'PRODUCTION_STUDIO'     ProductionStudio      no
+  'PUBLISHER'             Publisher             no
+  'PURCHASE_CURRENCY'     PurchaseCurrency      no
+  'PURCHASE_INFO'         PurchaseInfo          no
+  'PURCHASE_ITEM'         PurchaseItem          no
+  'PURCHASE_OWNER'        PurchaseOwner         no
+  'PURCHASE_PRICE'        PurchasePrice         no
+  'RATING'                Rating                no
+  'RECORDING_LOCATION'    RecordingLocation     no
+  'REMIXED_BY'            RemixedBy             no
+  'REPLAYGAIN_GAIN'       ReplaygainGain        no
+  'REPLAYGAIN_PEAK'       ReplaygainPeak        no
+  'SAMPLE'                Sample                no
+  'SCREENPLAY_BY'         ScreenplayBy          no
+  'SORT_WITH'             SortWith              no
+  'SOUND_ENGINEER'        SoundEngineer         no
+  'SUBJECT'               Subject               no
+  'SUBTITLE'              Subtitle              no
+  'SUMMARY'               Summary               no
+  'SYNOPSIS'              Synopsis              no
+  'TERMS_OF_USE'          TermsOfUse            no
+  'THANKS_TO'             ThanksTo              no
+  'TITLE'                 Title                 no
+  'TMDB'                  TMDB                  no
+  'TOTAL_PARTS'           TotalParts            no
+  'TUNING'                Tuning                no
+  'TVDB'                  TVDB                  no
+  'URL'                   URL                   no
+  'WRITTEN_BY'            WrittenBy             no
+
 =head2 MOI Tags
 
 MOI files store information about associated MOD or TOD files, and are
@@ -37487,6 +37676,7 @@ FileName.
   ProcessingTime             ExifTool           no
   RAFVersion                 File               no
   ResourceForkSize           System             no
+  SphericalVideoXML          GSpherical         yes!
   SymLink                    -                  yes!
   TestName                   -                  yes!
   ThumbnailImage             File               no

data/bin/lib/Image/ExifTool/WriteQuickTime.pl

@@ -306,14 +306,17 @@ sub CheckQTValue($$$)
 
 #------------------------------------------------------------------------------
 # Format QuickTime value for writing
-# Inputs: 0) ExifTool ref, 1) value ref, 2) Format (or undef), 3) Writable (or undef)
-# Returns: Flags for QT data type, and reformats value as required
+# Inputs: 0) ExifTool ref, 1) value ref, 2) tagInfo ref, 3) Format (or undef)
+# Returns: Flags for QT data type, and reformats value as required (sets to undef on error)
 sub FormatQTValue($$;$$)
 {
-    my ($et, $valPt, $format, $writable) = @_;
+    my ($et, $valPt, $tagInfo, $format) = @_;
+    my $writable = $$tagInfo{Writable};
+    my $count = $$tagInfo{Count};
     my $flags;
+    $format or $format = $$tagInfo{Format};
     if ($format and $format ne 'string' or not $format and $writable and $writable ne 'string') {
-        $$valPt = WriteValue($$valPt, $format || $writable);
+        $$valPt = WriteValue($$valPt, $format || $writable, $count);
         if ($writable and $qtFormat{$writable}) {
             $flags = $qtFormat{$writable};
         } else {
@@ -329,6 +332,7 @@ sub FormatQTValue($$;$$)
         $flags = 0x01;  # UTF8
         $$valPt = $et->Encode($$valPt, 'UTF8');
     }
+    defined $$valPt or $et->WarnOnce("Error converting value for $$tagInfo{Name}");
     return $flags;
 }
 
@@ -1139,7 +1143,7 @@ sub WriteQuickTime($$$)
                                         my $newVal = $et->GetNewValue($nvHash);
                                         next unless defined $newVal;
                                         my $prVal = $newVal;
-                                        my $flags = FormatQTValue($et, \$newVal, $format, $$tagInfo{Writable});
+                                        my $flags = FormatQTValue($et, \$newVal, $tagInfo, $format);
                                         next unless defined $newVal;
                                         my ($ctry, $lang) = (0, 0);
                                         if ($$ti{LangCode}) {
@@ -1220,7 +1224,8 @@ sub WriteQuickTime($$$)
                                     }
                                     my $prVal = $newVal;
                                     # format new value for writing (and get new flags)
-                                    $flags = FormatQTValue($et, \$newVal, $format, $$tagInfo{Writable});
+                                    $flags = FormatQTValue($et, \$newVal, $tagInfo, $format);
+                                    next unless defined $newVal;
                                     my $grp = $et->GetGroup($langInfo, 1);
                                     $et->VerboseValue("- $grp:$$langInfo{Name}", $val);
                                     $et->VerboseValue("+ $grp:$$langInfo{Name}", $prVal);
@@ -1463,7 +1468,7 @@ sub WriteQuickTime($$$)
                 my $newVal = $et->GetNewValue($nvHash);
                 next unless defined $newVal;
                 my $prVal = $newVal;
-                my $flags = FormatQTValue($et, \$newVal, $$tagInfo{Format}, $$tagInfo{Writable});
+                my $flags = FormatQTValue($et, \$newVal, $tagInfo);
                 next unless defined $newVal;
                 my ($ctry, $lang) = (0, 0);
                 # handle alternate languages

data/bin/lib/Image/ExifTool/WriteXMP.pl

@@ -561,7 +561,21 @@ sub AddStructType($$$$;$)
 }
 
 #------------------------------------------------------------------------------
-# Hack to use XMP writer for SphericalVideoXML
+# Process SphericalVideoXML (see XMP-GSpherical tags documentation)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: SphericalVideoXML data
+sub ProcessGSpherical($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    # extract SphericalVideoXML as a block if requested
+    if ($$et{REQ_TAG_LOOKUP}{sphericalvideoxml}) {
+        $et->FoundTag(SphericalVideoXML => substr(${$$dirInfo{DataPt}}, 16));
+    }
+    return Image::ExifTool::XMP::ProcessXMP($et, $dirInfo, $tagTablePtr);
+}
+
+#------------------------------------------------------------------------------
+# Hack to use XMP writer for SphericalVideoXML (see XMP-GSpherical tags documentation)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
 # Returns: SphericalVideoXML data
 sub WriteGSpherical($$$)

data/bin/lib/Image/ExifTool/Writer.pl

@@ -707,9 +707,13 @@ TAG: foreach $tagInfo (@matchingTags) {
             $writeGroup or $writeGroup = $group0;
             # get priority for this group
             unless ($priority) {
-                $priority = $$self{WRITE_PRIORITY}{lc($writeGroup)};
-                unless ($priority) {
-                    $priority = $$self{WRITE_PRIORITY}{lc($group0)} || 0;
+                if ($$tagInfo{Avoid} and $$tagInfo{WriteAlso}) {
+                    $priority = 0;
+                } else {
+                    $priority = $$self{WRITE_PRIORITY}{lc($writeGroup)};
+                    unless ($priority) {
+                        $priority = $$self{WRITE_PRIORITY}{lc($group0)} || 0;
+                    }
                 }
             }
             # adjust priority based on Preferred level for this tag
@@ -830,6 +834,8 @@ TAG: foreach $tagInfo (@matchingTags) {
         $tag = $$tagInfo{Name};     # get tag name for warnings
         my $lcTag = lc $tag;
         my $pref = $preferred{$lcTag} || { };
+        # don't write Avoid-ed tags with side effect unless preferred
+        next if not $$pref{$tagInfo} and $$tagInfo{Avoid} and $$tagInfo{WriteAlso};
         my $shift = $options{Shift};
         my $addValue = $options{AddValue};
         if (defined $shift) {
@@ -971,6 +977,7 @@ TAG: foreach $tagInfo (@matchingTags) {
             $self->GetNewValueHash($tagInfo, $writeGroup, 'delete', $options{ProtectSaved});
             # also delete related tag previous new values
             if ($$tagInfo{WriteAlso}) {
+                $$self{INDENT2} = '+';
                 my ($wgrp, $wtag);
                 if ($$tagInfo{WriteGroup} and $$tagInfo{WriteGroup} eq 'All' and $writeGroup) {
                     $wgrp = $writeGroup . ':';
@@ -981,6 +988,7 @@ TAG: foreach $tagInfo (@matchingTags) {
                     my ($n,$e) = $self->SetNewValue($wgrp . $wtag, undef, Replace=>2);
                     $numSet += $n;
                 }
+                $$self{INDENT2} = '';
             }
             $options{Replace} == 2 and ++$numSet, next;
         }
@@ -1022,7 +1030,7 @@ TAG: foreach $tagInfo (@matchingTags) {
                                 require 'Image/ExifTool/XMPStruct.pl';
                                 $_ = Image::ExifTool::XMP::SerializeStruct($_);
                             }
-                            print $out "$verb $wgrp1:$tag$fromList if value is '${_}'\n";
+                            print $out "$$self{INDENT2}$verb $wgrp1:$tag$fromList if value is '${_}'\n";
                         }
                     }
                 }
@@ -1086,15 +1094,25 @@ TAG: foreach $tagInfo (@matchingTags) {
                     push @{$$nvHash{Value}}, ref $val eq 'ARRAY' ? @$val : $val;
                 }
                 if ($verbose > 1) {
-                    my $ifExists = $$nvHash{IsCreating} ? ( $createOnly ?
-                                  ($$nvHash{IsCreating} == 2 ?
-                                    " if $writeGroup exists and tag doesn't" :
-                                    " if tag doesn't exist") :
-                                  ($$nvHash{IsCreating} == 2 ? " if $writeGroup exists" : '')) :
+                    my $ifExists;
+                    if ($$tagInfo{IsComposite}) {
+                        # (composite tags don't technically exist in the file)
+                        if ($$tagInfo{WriteAlso}) {
+                            $ifExists = ' (+' . join(',+',sort keys %{$$tagInfo{WriteAlso}}) . '):';
+                        } else {
+                            $ifExists = '';
+                        }
+                    } else {
+                        $ifExists = $$nvHash{IsCreating} ? ( $createOnly ?
+                                   ($$nvHash{IsCreating} == 2 ?
+                                     " if $writeGroup exists and tag doesn't" :
+                                     " if tag doesn't exist") :
+                                   ($$nvHash{IsCreating} == 2 ? " if $writeGroup exists" : '')) :
                                   (($$nvHash{DelValue} and @{$$nvHash{DelValue}}) ?
-                                    ' if tag was deleted' : ' if tag exists');
+                                     ' if tag was deleted' : ' if tag exists');
+                    }
                     my $verb = ($shift ? 'Shifting' : ($addValue ? 'Adding' : 'Writing'));
-                    print $out "$verb $wgrp1:$tag$ifExists\n";
+                    print $out "$$self{INDENT2}$verb $wgrp1:$tag$ifExists\n";
                 }
             }
         } elsif ($permanent) {
@@ -1109,7 +1127,7 @@ TAG: foreach $tagInfo (@matchingTags) {
             $self->GetNewValueHash($tagInfo, $writeGroup, 'delete');
             my $nvHash = $self->GetNewValueHash($tagInfo, $writeGroup, 'create');
             $$nvHash{WantGroup} = $wantGroup;
-            $verbose > 1 and print $out "Deleting $wgrp1:$tag\n";
+            $verbose > 1 and print $out "$$self{INDENT2}Deleting $wgrp1:$tag\n";
         }
         $$setTags{$tagInfo} = 1 if $setTags;
         $prioritySet = 1 if $$pref{$tagInfo};
@@ -1118,6 +1136,7 @@ WriteAlso:
         # also write related tags
         my $writeAlso = $$tagInfo{WriteAlso};
         if ($writeAlso) {
+            $$self{INDENT2} = '+';  # indicate related tag with a leading "+"
             my ($wgrp, $wtag, $n);
             if ($$tagInfo{WriteGroup} and $$tagInfo{WriteGroup} eq 'All' and $writeGroup) {
                 $wgrp = $writeGroup . ':';
@@ -1137,7 +1156,7 @@ WriteAlso:
                     SetTags     => \%alsoWrote,         # remember tags already written
                 );
                 undef $evalWarning;
-                #### eval WriteAlso ($val)
+                #### eval WriteAlso ($val,%opts)
                 my $v = eval $$writeAlso{$wtag};
                 # we wanted to do the eval in case there are side effect, but we
                 # don't want to write a value for a tag that is being deleted:
@@ -1159,6 +1178,7 @@ WriteAlso:
                     }
                 }
             }
+            $$self{INDENT2} = '';
         }
     }
     # print warning if we couldn't set our priority tag

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION $warnString);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.27';
+$VERSION = '1.28';
 
 sub WarnProc($) { $warnString = $_[0]; }
 
@@ -385,6 +385,18 @@ sub HandleMember($$;$)
     $et->HandleTag($tagTablePtr, '_com', $com) if defined $com and length $com;
 }
 
+#------------------------------------------------------------------------------
+# Extract file from ZIP archive
+# Inputs: 0) ExifTool ref, 1) Zip object ref, 2) file name
+# Returns: zip member or undef it it didn't exist
+sub ExtractFile($$$)
+{
+    my ($et, $zip, $file) = @_;
+    my $result = $zip->memberNamed($file);
+    $et->VPrint(1, "  (Extracting '${file}' from zip archive)\n");
+    return $result;
+}
+
 #------------------------------------------------------------------------------
 # Extract information from a ZIP file
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
@@ -460,7 +472,7 @@ sub ProcessZIP($$)
         # check for an Office Open file (DOCX, etc)
         # --> read '[Content_Types].xml' to determine the file type
         my ($mime, @members);
-        my $cType = $zip->memberNamed('[Content_Types].xml');
+        my $cType = ExtractFile($et, $zip, '[Content_Types].xml');
         if ($cType) {
             ($buff, $status) = $zip->contents($cType);
             if (not $status and (
@@ -501,7 +513,7 @@ sub ProcessZIP($$)
         }
 
         # check for an Open Document, IDML or EPUB file
-        my $mType = $zip->memberNamed('mimetype');
+        my $mType = ExtractFile($et, $zip, 'mimetype');
         if ($mType) {
             ($mime, $status) = $zip->contents($mType);
             if (not $status and $mime =~ /([\x21-\xfe]+)/s) {
@@ -510,9 +522,9 @@ sub ProcessZIP($$)
                 $et->SetFileType($openDocType{$mime} || 'ZIP', $mime);
                 $et->Warn("Unrecognized MIMEType $mime") unless $openDocType{$mime};
                 # extract Open Document metadata from "meta.xml"
-                my $meta = $zip->memberNamed('meta.xml');
+                my $meta = ExtractFile($et, $zip, 'meta.xml');
                 # IDML files have metadata in a different place (ref 6)
-                $meta or $meta = $zip->memberNamed('META-INF/metadata.xml');
+                $meta or $meta = ExtractFile($et, $zip, 'META-INF/metadata.xml');
                 if ($meta) {
                     ($buff, $status) = $zip->contents($meta);
                     unless ($status) {
@@ -532,7 +544,7 @@ sub ProcessZIP($$)
                 # process rootfile of EPUB container if applicable
                 for (;;) {
                     last if $meta and $mime ne 'application/epub+zip';
-                    my $container = $zip->memberNamed('META-INF/container.xml');
+                    my $container = ExtractFile($et, $zip, 'META-INF/container.xml');
                     ($buff, $status) = $zip->contents($container);
                     last if $status;
                     $buff =~ /<rootfile\s+[^>]*?\bfull-path=(['"])(.*?)\1/s or last;
@@ -570,7 +582,7 @@ sub ProcessZIP($$)
                     my $type;
                     my %tag = ( jpg => 'PreviewImage', png => 'PreviewPNG' );
                     foreach $type ('jpg', 'png') {
-                        my $thumb = $zip->memberNamed("Thumbnails/thumbnail.$type");
+                        my $thumb = ExtractFile($et, $zip, "Thumbnails/thumbnail.$type");
                         next unless $thumb;
                         ($buff, $status) = $zip->contents($thumb);
                         $et->FoundTag($tag{$type}, $buff) unless $status;