Merge pull request #913 from Codeinwp/fix/media-rename-mimetype

Fix/media rename mimetype

Author: selul

inc/media_rename/attachment_model.php

@@ -74,6 +74,13 @@ class Optml_Attachment_Model {
 	 */
 	private $is_remote_attachment;
 
+	/**
+	 * The attachment mime type.
+	 *
+	 * @var string
+	 */
+	private $mime_type;
+
 	/**
 	 * The attachment metadata.
 	 *
@@ -91,11 +98,9 @@ class Optml_Attachment_Model {
 	public function __construct( int $attachment_id ) {
 		$this->attachment_id = $attachment_id;
 		$this->attachment_metadata = wp_get_attachment_metadata( $this->attachment_id );
+		$this->mime_type = get_post_mime_type( $attachment_id );
 
-		$mime_type = get_post_mime_type( $attachment_id );
-		$is_image = strpos( $mime_type, 'image' ) !== false;
-
-		$this->main_attachment_url          = $is_image ? wp_get_original_image_url( $attachment_id ) : wp_get_attachment_url( $attachment_id );
+		$this->main_attachment_url          = $this->is_image() ? wp_get_original_image_url( $attachment_id ) : wp_get_attachment_url( $attachment_id );
 		$this->origianal_attached_file_path = $this->setup_original_attached_file();
 		$this->dir_path = dirname( $this->origianal_attached_file_path );
 		$this->is_scaled = isset( $this->attachment_metadata['original_image'] );
@@ -286,4 +291,18 @@ public function get_metadata_prefix_path() {
 	public function can_be_renamed_or_replaced() {
 		return ! $this->is_remote_attachment;
 	}
+
+	/**
+	 * Get the attachment mime type.
+	 */
+	public function get_attachment_mimetype() {
+		return $this->mime_type;
+	}
+
+	/**
+	 * Check if the attachment is an image.
+	 */
+	public function is_image() {
+		return strpos( $this->mime_type, 'image' ) !== false;
+	}
 }

inc/media_rename/attachment_rename.php

@@ -98,7 +98,9 @@ public function rename() {
 		}
 
 		try {
-			$replacer = new Optml_Attachment_Db_Renamer();
+			$skip_sizes = ! $this->attachment->is_image();
+
+			$replacer = new Optml_Attachment_Db_Renamer( $skip_sizes );
 			$old_url = $this->attachment->get_main_url();
 			$new_url = $this->get_new_url( $new_unique_filename );
 
@@ -145,6 +147,12 @@ private function update_attachment_metadata( $new_path ) {
 			return false;
 		}
 
+		// We should bail for non-image attachments here.
+		// No need for additional metadata update.
+		if ( ! $this->attachment->is_image() ) {
+			return true;
+		}
+
 		// Get current attachment metadata
 		$metadata = $this->attachment->get_attachment_metadata();