Rename var, fix filter callback

Author: swissspidy

features/media-import.feature

@@ -287,11 +287,11 @@ Feature: Manage WordPress attachments
       Error: Invalid value for <porcelain>: invalid. Expected flag or 'url'.
       """
 
-  Scenario: Upload files into a custom directory, relative to ABSPATH, when --destdir flag is applied.
+  Scenario: Upload files into a custom directory, relative to ABSPATH, when --destination-dir flag is applied.
     Given download:
       | path                        | url                                              |
       | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
-    When I run `wp media import --destdir="foo" {CACHE_DIR}/large-image.jpg --porcelain=url`
+    When I run `wp media import --destination-dir="foo" {CACHE_DIR}/large-image.jpg --porcelain=url`
 
     Then STDOUT should not contain:
       """
@@ -303,11 +303,11 @@ Feature: Manage WordPress attachments
       https://example.com/foo/large-image.jpg
       """
 
-  Scenario: Upload files into a custom directory, not relative to ABSPATH, when --destdir flag is applied.
+  Scenario: Upload files into a custom directory, not relative to ABSPATH, when --destination-dir flag is applied.
     Given download:
       | path                        | url                                              |
       | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
-    When I run `wp media import --destdir="{RUN_DIR}/foo" {CACHE_DIR}/large-image.jpg --porcelain=url`
+    When I run `wp media import --destination-dir="{RUN_DIR}/foo" {CACHE_DIR}/large-image.jpg --porcelain=url`
 
     Then STDOUT should not contain:
       """

src/Media_Command.php

@@ -49,6 +49,11 @@ class Media_Command extends WP_CLI_Command {
 	 */
 	const WP_CLEAR_OBJECT_CACHE_INTERVAL = 500;
 
+	/**
+	 * @var string|null
+	 */
+	private $destination_dir;
+
 	/**
 	 * Regenerates thumbnails for one or more attachments.
 	 *
@@ -219,7 +224,7 @@ public function regenerate( $args, $assoc_args = array() ) {
 	 * File names will not be run through wp_unique_filename() with this set. When used, files
 	 * will remain at their current location and will not be copied into any destination directory.
 	 *
-	 * [--destdir=<destdir>]
+	 * [--destination-dir=<destination-dir>]
 	 * : Path to the destination directory for uploaded imported files.
 	 * Can be absolute or relative to ABSPATH. Ignored when used together with --skip-copy, as
 	 * files are not moved on disk in that case.
@@ -272,13 +277,13 @@ public function import( $args, $assoc_args = array() ) {
 		$assoc_args = wp_parse_args(
 			$assoc_args,
 			array(
-				'file_name' => '',
-				'title'     => '',
-				'caption'   => '',
-				'alt'       => '',
-				'desc'      => '',
-				'post_name' => '',
-				'destdir'   => '',
+				'file_name'       => '',
+				'title'           => '',
+				'caption'         => '',
+				'alt'             => '',
+				'desc'            => '',
+				'post_name'       => '',
+				'destination-dir' => '',
 			)
 		);
 
@@ -419,9 +424,10 @@ public function import( $args, $assoc_args = array() ) {
 				wp_update_attachment_metadata( $success, wp_generate_attachment_metadata( $success, $file ) );
 			} else {
 
-				$destdir = Utils\get_flag_value( $assoc_args, 'destdir' );
-				if ( is_string( $destdir ) && $destdir && ! isset( $custom_upload_dir_filter ) ) {
-					$custom_upload_dir_filter = $this->add_upload_dir_filter( $destdir );
+				$destdir = Utils\get_flag_value( $assoc_args, 'destination-dir' );
+				if ( ! empty( $destdir ) ) {
+					$this->destination_dir = $destdir;
+					add_filter( 'upload_dir', [ $this, 'filter_upload_dir' ], PHP_INT_MAX );
 				}
 
 				// Deletes the temporary file.
@@ -481,9 +487,7 @@ public function import( $args, $assoc_args = array() ) {
 			++$successes;
 		}
 
-		if ( ! empty( $custom_upload_dir_filter ) ) {
-			$this->remove_upload_dir_filter( $custom_upload_dir_filter );
-		}
+		remove_filter( 'upload_dir', [ $this, 'filter_upload_dir' ], PHP_INT_MAX );
 
 		// Report the result of the operation
 		if ( ! Utils\get_flag_value( $assoc_args, 'porcelain' ) ) {
@@ -956,43 +960,33 @@ private function remove_image_size_filters( $image_size_filters ) {
 		}
 	}
 
-	private function add_upload_dir_filter( $upload_dir ) {
-
-		$custom_upload_dir_filter = function () use ( $upload_dir ) {
-			static $custom_upload_dir;
-			if ( $custom_upload_dir ) {
-				return $custom_upload_dir;
-			}
-
-			if ( 0 !== strpos( $upload_dir, ABSPATH ) ) {
-				// $dir is absolute, $upload_dir is (maybe) relative to ABSPATH.
-				$dir = path_join( ABSPATH, $upload_dir );
-			} else {
-				$dir = $upload_dir;
-				// normalize $upload_dir.
-				$upload_dir = substr( $upload_dir, strlen( ABSPATH ) );
-			}
-
-			$siteurl = get_option( 'siteurl' );
-			$url     = trailingslashit( $siteurl ) . $upload_dir;
+	public function filter_upload_dir( $uploads ) {
+		if ( ! $this->destination_dir ) {
+			return $uploads;
+		}
 
-			$custom_upload_dir = array(
-				'path'    => $dir,
-				'url'     => $url,
-				'subdir'  => '',
-				'basedir' => $dir,
-				'baseurl' => $url,
-				'error'   => false,
-			);
+		$upload_dir = $this->destination_dir;
 
-			return $custom_upload_dir;
-		};
+		if ( 0 !== strpos( $this->destination_dir, ABSPATH ) ) {
+			// $dir is absolute, $upload_dir is (maybe) relative to ABSPATH.
+			$dir = path_join( ABSPATH, $this->destination_dir );
+		} else {
+			$dir = $this->destination_dir;
+			// normalize $upload_dir.
+			$upload_dir = substr( $this->destination_dir, strlen( ABSPATH ) );
+		}
 
-		add_filter( 'upload_dir', $custom_upload_dir_filter, PHP_INT_MAX, 0 );
-	}
+		$siteurl = get_option( 'siteurl' );
+		$url     = trailingslashit( $siteurl ) . $upload_dir;
 
-	private function remove_upload_dir_filter( $upload_dir_filter ) {
-		remove_filter( 'upload_dir', $upload_dir_filter, PHP_INT_MAX );
+		return [
+			'path'    => $this->destination_dir,
+			'url'     => $url,
+			'subdir'  => '',
+			'basedir' => $this->destination_dir,
+			'baseurl' => $url,
+			'error'   => false,
+		];
 	}
 
 	// Update attachment sizes metadata just for a particular intermediate image size.