Restore backup

src/class-tiny-diagnostics.php

@@ -206,6 +206,12 @@ public function create_diagnostic_zip() {
 		}
 
 		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return new WP_Error(
+				'filesystem_unavailable',
+				__( 'WordPress filesystem could not be initialized.', 'tiny-compress-images' )
+			);
+		}
 		$temp_dir      = trailingslashit( get_temp_dir() ) . 'tiny-compress-temp';
 		if ( ! $wp_filesystem->exists( $temp_dir ) ) {
 			wp_mkdir_p( $temp_dir );
@@ -249,6 +255,9 @@ public function create_diagnostic_zip() {
 	 */
 	public static function download_zip( $zip_path ) {
 		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			wp_die( esc_html__( 'WordPress filesystem could not be initialized.', 'tiny-compress-images' ) );
+		}
 		if ( ! $wp_filesystem->exists( $zip_path ) ) {
 			wp_die( esc_html__( 'Diagnostic file not found.', 'tiny-compress-images' ) );
 		}

src/class-tiny-helpers.php

@@ -115,12 +115,10 @@ public static function get_mimetype( $input ) {
 	 * Gets or initializes the WordPress filesystem instance.
 	 *
 	 * Returns the global WP_Filesystem instance, initializing it if necessary.
-	 * This helper prevents repeated initialization code throughout the plugin.
 	 *
 	 * @since 3.7.0
 	 *
-	 * @return WP_Filesystem_Base The WP_Filesystem instance.
-	 * @throws Exception If the filesystem cannot be initialized.
+	 * @return WP_Filesystem_Base|false The WP_Filesystem instance, or false on failure.
 	 */
 	public static function get_wp_filesystem() {
 		global $wp_filesystem;
@@ -129,14 +127,15 @@ public static function get_wp_filesystem() {
 			return $wp_filesystem;
 		}
 
-		// Initialize the filesystem only if the function isn't available yet.
 		if ( ! function_exists( 'WP_Filesystem' ) ) {
 			require_once ABSPATH . 'wp-admin/includes/file.php';
 		}
 		WP_Filesystem();
 
 		if ( ! ( $wp_filesystem instanceof WP_Filesystem_Base ) ) {
-			throw new Exception( 'Unable to initialize WordPress filesystem.' );
+			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
+			error_log( 'Tiny Compress: Unable to initialize WordPress filesystem.' );
+			return false;
 		}
 
 		return $wp_filesystem;

src/class-tiny-image.php

@@ -675,4 +675,184 @@ public function mark_as_compressed() {
 
 		$this->update_tiny_post_meta();
 	}
+
+	/**
+	 * Retrieves the original image of the Tiny_Image
+	 *
+	 *
+	 * @return Tiny_Image_Size|false the image or false if does not exist
+	 */
+	private function get_original_image() {
+		$original_image = $this->get_image_size( self::ORIGINAL_UNSCALED );
+		if ( null === $original_image ) {
+			$original_image = $this->get_image_size();
+		}
+
+		if ( null === $original_image ) {
+			return false;
+		}
+
+		return $original_image;
+	}
+
+	/**
+	 * Builds the filesystem path where the backup of the original image is
+	 * (or would be) stored.
+	 *
+	 * @return string|false the backup file path, or false if there is no original image
+	 */
+	private function get_backup_path() {
+		$original_image = $this->get_original_image();
+		if ( false === $original_image ) {
+			return false;
+		}
+
+		$file_path  = $original_image->filename;
+		$upload_dir = wp_upload_dir();
+		$basedir    = trailingslashit( $upload_dir['basedir'] );
+		if ( Tiny_Helpers::str_starts_with( $file_path, $basedir ) ) {
+			$file_path = substr( $file_path, strlen( $basedir ) );
+		}
+
+		return $basedir . 'tinify_backup/' . $file_path;
+	}
+
+	/**
+	 * Creates a backup copy of the original image, if one does not already exist.
+	 *
+	 * @return bool true on success, false on failure or if a backup already exists
+	 */
+	public function create_backup() {
+
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return false;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return false;
+		}
+
+		if ( $wp_filesystem->exists( $backup_file_path ) ) {
+			return false;
+		}
+
+		$backup_dir = dirname( $backup_file_path );
+
+		if ( ! wp_mkdir_p( $backup_dir ) ) {
+			return false;
+		}
+
+		$original_image = $this->get_original_image();
+
+		return $wp_filesystem->copy( $original_image->filename, $backup_file_path );
+	}
+
+
+	/**
+	 * Retrieves the public URL of the backup of the original image.
+	 *
+	 * @return string|false the backup URL, or false if no backup exists
+	 */
+	public function get_backup() {
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return false;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return false;
+		}
+
+		if ( ! $wp_filesystem->exists( $backup_file_path ) ) {
+			return false;
+		}
+
+		$upload_dir = wp_upload_dir();
+		$basedir    = trailingslashit( $upload_dir['basedir'] );
+		$baseurl    = trailingslashit( $upload_dir['baseurl'] );
+
+		return str_replace( $basedir, $baseurl, $backup_file_path );
+	}
+
+	/**
+	 * Restores the original image from its backup.
+	 *
+	 * - Copies the backup file over the current original.
+	 * - Clears compression metadata for all image sizes.
+	 * - Regenerates all thumbnail sizes from the restored image.
+	 * - Updates the WordPress attachment metadata.
+	 *
+	 * @since 3.7.0
+	 *
+	 * @return bool True on success, false if no backup exists or the copy fails.
+	 */
+	public function restore_backup() {
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return false;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return false;
+		}
+
+		if ( ! $wp_filesystem->exists( $backup_file_path ) ) {
+			return false;
+		}
+
+		$original_image = $this->get_original_image();
+		if ( false === $original_image ) {
+			return false;
+		}
+
+		if ( ! $wp_filesystem->copy( $backup_file_path, $original_image->filename, true ) ) {
+			return false;
+		}
+
+		// Clear compression metadata for all image sizes.
+		foreach ( $this->sizes as $size ) {
+			$size->meta = array();
+		}
+		$this->update_tiny_post_meta();
+
+		// Regenerate all thumbnail sizes from the restored image.
+		$new_metadata = wp_generate_attachment_metadata( $this->id, $original_image->filename );
+		if ( $new_metadata ) {
+			$this->wp_metadata = $new_metadata;
+			wp_update_attachment_metadata( $this->id, $this->wp_metadata );
+			$this->sizes = array();
+			$this->parse_wp_metadata();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Deletes the backup file of the original image, if it exists.
+	 *
+	 * @since 3.7.0
+	 *
+	 * @return bool True on success or if no backup exists, false on deletion failure.
+	 */
+	public function delete_backup() {
+		$backup_file_path = $this->get_backup_path();
+		if ( false === $backup_file_path ) {
+			return true;
+		}
+
+		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return false;
+		}
+
+		if ( ! $wp_filesystem->exists( $backup_file_path ) ) {
+			return true;
+		}
+
+		return $wp_filesystem->delete( $backup_file_path );
+	}
 }

src/class-tiny-logger.php

@@ -179,6 +179,9 @@ private function log( $level, $message, $context = array() ) {
 		// Ensure log directory exists.
 		$log_dir       = dirname( $this->log_file_path );
 		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return;
+		}
 		if ( ! $wp_filesystem->exists( $log_dir ) ) {
 			wp_mkdir_p( $log_dir );
 			self::create_blocking_files( $log_dir );
@@ -201,6 +204,9 @@ private function log( $level, $message, $context = array() ) {
 	 */
 	private function rotate_logs() {
 		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return;
+		}
 		if ( ! $wp_filesystem->exists( $this->log_file_path ) ) {
 			return;
 		}
@@ -222,6 +228,9 @@ public static function clear_logs() {
 		$instance      = self::get_instance();
 		$log_path      = $instance->get_log_file_path();
 		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return false;
+		}
 		$file_exits    = $wp_filesystem->exists( $log_path );
 		if ( $file_exits ) {
 			return $wp_filesystem->delete( $log_path );
@@ -239,6 +248,9 @@ public static function clear_logs() {
 	 */
 	private static function create_blocking_files( $log_dir ) {
 		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
+		if ( false === $wp_filesystem ) {
+			return;
+		}
 
 		$index_file = trailingslashit( $log_dir ) . 'index.html';
 		if ( ! $wp_filesystem->exists( $index_file ) ) {

src/class-tiny-plugin.php

@@ -119,6 +119,11 @@ public function ajax_init() {
 			$this->get_method( 'mark_image_as_compressed' )
 		);
 
+		add_action(
+			'wp_ajax_tiny_restore_backup',
+			$this->get_method( 'restore_backup_image' )
+		);
+
 		/*
 		When touching any functionality linked to image compressions when
 			uploading images make sure it also works with XML-RPC. See README. */
@@ -746,7 +751,7 @@ public function render_media_column( $column, $id ) {
 		if ( self::MEDIA_COLUMN === $column ) {
 			$tiny_image = new Tiny_Image( $this->settings, $id );
 			if ( $tiny_image->file_type_allowed() ) {
-				echo '<div class="tiny-ajax-container">';
+				echo '<div class="tiny-ajax-container" data-tiny-media-id="' . absint( $id ) . '">';
 				$this->render_compress_details( $tiny_image );
 				echo '</div>';
 			}
@@ -761,7 +766,8 @@ public function show_media_info() {
 			echo '<h4>';
 			esc_html_e( 'JPEG, PNG, & WebP optimization', 'tiny-compress-images' );
 			echo '</h4>';
-			echo '<div class="tiny-ajax-container">';
+			echo '<div class="tiny-ajax-container" data-tiny-media-id="';
+			echo absint( $post->ID ) . '">';
 			$this->render_compress_details( $tiny_image );
 			echo '</div>';
 			echo '</div>';
@@ -909,6 +915,7 @@ public function friendly_user_name() {
 	public function clean_attachment( $post_id ) {
 		$tiny_image = new Tiny_Image( $this->settings, $post_id );
 		$tiny_image->delete_converted_image();
+		$tiny_image->delete_backup();
 	}
 
 	/**
@@ -934,37 +941,7 @@ public function backup_original_image( $attachment_id ) {
 
 		$tiny_image = new Tiny_Image( $this->settings, $attachment_id );
 
-		$original_image = $tiny_image->get_image_size( Tiny_Image::ORIGINAL_UNSCALED );
-		if ( null === $original_image ) {
-			$original_image = $tiny_image->get_image_size();
-		}
-
-		if ( null === $original_image ) {
-			return false;
-		}
-
-		$file_path  = $original_image->filename;
-		$upload_dir = wp_upload_dir();
-		$basedir    = trailingslashit( $upload_dir['basedir'] );
-		if ( Tiny_Helpers::str_starts_with( $file_path, $basedir ) ) {
-			$file_path = substr( $file_path, strlen( $basedir ) );
-		}
-
-		$backup_file = $basedir . 'tinify_backup/' . $file_path;
-
-		$wp_filesystem = Tiny_Helpers::get_wp_filesystem();
-
-		if ( $wp_filesystem->exists( $backup_file ) ) {
-			return false;
-		}
-
-		$backup_dir = dirname( $backup_file );
-
-		if ( ! wp_mkdir_p( $backup_dir ) ) {
-			return false;
-		}
-
-		return $wp_filesystem->copy( $original_image->filename, $backup_file );
+		return $tiny_image->create_backup();
 	}
 
 	public static function request_review() {
@@ -989,6 +966,39 @@ public static function uninstall() {
 		Tiny_Apache_Rewrite::uninstall_rules();
 	}
 
+	/**
+	 * Restores the original image from its backup via AJAX.
+	 *
+	 * Validates the request, calls restore_backup() on the image, then
+	 * re-renders the compression details partial in the response.
+	 *
+	 * @since 3.7.0
+	 *
+	 * @return void
+	 */
+	public function restore_backup_image() {
+		$response = $this->validate_ajax_attachment_request();
+		if ( isset( $response['error'] ) ) {
+			echo esc_html( $response['error'] );
+			exit();
+		}
+
+		list($id, $metadata) = $response['data'];
+		$tiny_image          = new Tiny_Image( $this->settings, $id, $metadata );
+
+		if ( ! $tiny_image->restore_backup() ) {
+			echo esc_html__(
+				'Could not restore backup. The backup file may not exist or could not be written.',
+				'tiny-compress-images'
+			);
+			exit();
+		}
+
+		$this->render_compress_details( $tiny_image );
+
+		exit();
+	}
+
 	public function mark_image_as_compressed() {
 		$response = $this->validate_ajax_attachment_request();
 		if ( isset( $response['error'] ) ) {