Merge pull request #35 from ethanclevenger91/handle-query-string

Handle query strings on URL import.
wp-cli · Aug 16, 2017 · 3b3b817 · 3b3b817
2 parents 4a19de5 + db6a9a9
commit 3b3b817
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/features/media-import.feature b/features/media-import.feature
@@ -14,6 +14,17 @@ Feature: Manage WordPress attachments
       Success: Imported 1 of 1 items.
       """
 
+  Scenario: Import media from remote URL with query string
+    When I run `wp media import 'http://via.placeholder.com/350x150.jpg?text=Foo'`
+    Then STDOUT should contain:
+      """
+      Imported file 'http://via.placeholder.com/350x150.jpg?text=Foo' as attachment ID
+      """
+    And STDOUT should contain:
+      """
+      Success: Imported 1 of 1 items.
+      """
+
   Scenario: Fail to import missing image
     When I try `wp media import gobbledygook.png`
     Then STDERR should be:

diff --git a/src/Media_Command.php b/src/Media_Command.php
@@ -250,6 +250,7 @@ function import( $args, $assoc_args = array() ) {
 				} else {
 					$tempfile = $this->make_copy( $file );
 				}
+				$name = Utils\basename( $file );
 			} else {
 				$tempfile = download_url( $file );
 				if ( is_wp_error( $tempfile ) ) {
@@ -260,11 +261,12 @@ function import( $args, $assoc_args = array() ) {
 					$errors++;
 					continue;
 				}
+				$name = strtok( Utils\basename( $file ), '?' );
 			}
 
 			$file_array = array(
 				'tmp_name' => $tempfile,
-				'name' => Utils\basename( $file )
+				'name' => $name,
 			);
 
 			$post_array= array(