File tree Expand file tree Collapse file tree 1 file changed +5
-7
lines changed
Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -499,8 +499,6 @@ sub extractMediaFiles
499499 # create the list of original iCloud filenames
500500 my $icloud_uid_filename_ref = mapICloudUuidToFilename ($dbh , $tmp_manifest_db )
501501 unless $cmd_options {' ignore-icloud-media' };
502- # DEBUG
503- say STDERR Data::Dumper::Dumper ($icloud_uid_filename_ref );
504502
505503 # list all media files
506504 my $eval_ok = eval {
@@ -583,17 +581,17 @@ sub extractMediaFiles
583581 # save the filename and extension from the regex match
584582 my ($re_filename , $re_extension ) = ($+ {filename}, $+ {extension});
585583
584+ my $is_icloud_media = index ($+ {media_location}, ' CPLAssets' ) != - 1 ;
585+
586+ # skip media from iCloud if requested
587+ next if ($is_icloud_media && $cmd_options {' ignore-icloud-media' });
588+
586589 if ($media_location ne $+ {media_location} || $media_subdir ne $+ {media_subdir})
587590 {
588591 ($media_location , $media_subdir ) = ($+ {media_location}, $+ {media_subdir});
589592 say STDERR " ╭────┤Extracting from: [${media_location}$media_subdir]" ;
590593 }
591594
592- my $is_icloud_media = index ($media_location , ' CPLAssets' ) != - 1 ;
593-
594- # skip media from iCloud if requested
595- next if ($is_icloud_media && $cmd_options {' ignore-icloud-media' });
596-
597595 # find the file in the blob storage
598596 my $subdir = $file_id = ~ s/ ^(\w\w ).+ $/ $1 / r
599597 or die qq{Error: Unexpected fileID: $file_id \n };
You can’t perform that action at this time.
0 commit comments