Fix --skip-duplicates to use --file_name for duplicate check; add @require-wp-5.3 Behat scenario

Agent-Logs-Url: https://github.com/wp-cli/media-command/sessions/43c9f132-60d4-48c3-93e9-1e252883fa46

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>

Author: Copilot

features/media-import.feature

@@ -430,3 +430,54 @@ Feature: Manage WordPress attachments
       Success: Imported 1 of 2 items (1 skipped).
       """
     And the return code should be 0
+
+  @require-wp-5.3
+  Scenario: Skip importing a file that was stored with a scaled suffix by WP 5.3+
+    Given download:
+      | path                        | url                                                    |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
+    And I run `wp option update uploads_use_yearmonth_folders 0`
+
+    When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`
+    Then save STDOUT as {ATTACHMENT_ID}
+    And STDOUT should not be empty
+    And the wp-content/uploads/large-image-scaled.jpg file should exist
+
+    When I run `wp media import {CACHE_DIR}/large-image.jpg --skip-duplicates`
+    Then STDOUT should contain:
+      """
+      Skipped importing file
+      """
+    And STDOUT should contain:
+      """
+      already exists as attachment ID {ATTACHMENT_ID}
+      """
+    And STDOUT should contain:
+      """
+      Success: Imported 0 of 1 items (1 skipped).
+      """
+    And the return code should be 0
+
+  Scenario: Skip importing a file when a custom --file_name was used in the original import
+    Given download:
+      | path                        | url                                                    |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
+
+    When I run `wp media import {CACHE_DIR}/large-image.jpg --file_name=custom --porcelain`
+    Then save STDOUT as {ATTACHMENT_ID}
+    And STDOUT should not be empty
+
+    When I run `wp media import {CACHE_DIR}/large-image.jpg --file_name=custom --skip-duplicates`
+    Then STDOUT should contain:
+      """
+      Skipped importing file
+      """
+    And STDOUT should contain:
+      """
+      already exists as attachment ID {ATTACHMENT_ID}
+      """
+    And STDOUT should contain:
+      """
+      Success: Imported 0 of 1 items (1 skipped).
+      """
+    And the return code should be 0

src/Media_Command.php

@@ -607,8 +607,16 @@ public function import( $args, $assoc_args = array() ) {
 						++$errors;
 						continue;
 					}
+					$src_basename = Path::basename( $file );
 					if ( Utils\get_flag_value( $assoc_args, 'skip-duplicates' ) ) {
-						$existing = $this->find_duplicate_attachment( Path::basename( $file ) );
+						$check_basename = $src_basename;
+						if ( ! empty( $assoc_args['file_name'] ) ) {
+							$resolved_name = $this->get_image_name( $src_basename, $assoc_args['file_name'] );
+							if ( ! empty( $resolved_name ) ) {
+								$check_basename = $resolved_name;
+							}
+						}
+						$existing = $this->find_duplicate_attachment( $check_basename );
 						if ( false !== $existing ) {
 							if ( ! $porcelain ) {
 								WP_CLI::log( "Skipped importing file '$orig_filename'. Reason: already exists as attachment ID $existing." );
@@ -622,14 +630,22 @@ public function import( $args, $assoc_args = array() ) {
 					} else {
 						$tempfile = $this->make_copy( $file );
 					}
-					$name = Path::basename( $file );
+					$name = $src_basename;
 
 					if ( Utils\get_flag_value( $assoc_args, 'preserve-filetime' ) ) {
 						$file_time = @filemtime( $file );
 					}
 				} else {
+					$src_basename = (string) explode( '?', Path::basename( $file ), 2 )[0];
 					if ( Utils\get_flag_value( $assoc_args, 'skip-duplicates' ) ) {
-						$existing = $this->find_duplicate_attachment( (string) explode( '?', Path::basename( $file ), 2 )[0] );
+						$check_basename = $src_basename;
+						if ( ! empty( $assoc_args['file_name'] ) ) {
+							$resolved_name = $this->get_image_name( $src_basename, $assoc_args['file_name'] );
+							if ( ! empty( $resolved_name ) ) {
+								$check_basename = $resolved_name;
+							}
+						}
+						$existing = $this->find_duplicate_attachment( $check_basename );
 						if ( false !== $existing ) {
 							if ( ! $porcelain ) {
 								WP_CLI::log( "Skipped importing file '$orig_filename'. Reason: already exists as attachment ID $existing." );
@@ -650,7 +666,7 @@ public function import( $args, $assoc_args = array() ) {
 						++$errors;
 						continue;
 					}
-					$name = (string) explode( '?', Path::basename( $file ), 2 )[0];
+					$name = $src_basename;
 				}
 			}