change hook params and only trigger once per image.

Author: tijmenbruggeman

…ks/tiny_image_size_before_compression.md …s/hooks/tiny_image_before_compression.mddocs/hooks/tiny_image_size_before_compression.md renamed to docs/hooks/tiny_image_before_compression.md docs/hooks/tiny_image_size_before_compression.md renamed to docs/hooks/tiny_image_before_compression.md

@@ -8,15 +8,13 @@ Action that is done before compressing an single image size.
 ## Arguments
 
 1. `int        $attachment_id` - The attachment ID.
-2. `int|string $size_name` - The image size name. 0 for the original.
-3. `string     $filepath` - The file path to the image being compressed.
 
 ## Example
 
 ```php
 add_filter(
-	'tiny_image_size_before_compression',
-	function ( $attachment_id, $size_name, $filename ) {
+	'tiny_image_before_compression',
+	function ( $id ) {
 		// notify system of compression
 	}
 );

src/class-tiny-image.php

@@ -196,6 +196,19 @@ public function compress() {
 				'name'     => $this->name,
 			)
 		);
+
+		/**
+		 * Fires before an image is sent for compression.
+		 *
+		 * @since 3.6.8
+		 *
+		 * @param int   The attachment ID
+		 */
+		do_action(
+			'tiny_image_before_compression',
+			$this->id
+		);
+
 		if ( $this->settings->get_compressor() === null || ! $this->file_type_allowed() ) {
 			return;
 		}
@@ -222,22 +235,6 @@ public function compress() {
 				$size->add_tiny_meta_start();
 				$this->update_tiny_post_meta();
 
-				/**
-				 * Fires before an image size is sent for compression.
-				 *
-				 * @since 3.6.8
-				 *
-				 * @param int        $attachment_id  The attachment ID.
-				 * @param int|string $size_name The image size name. 0 for the original.
-				 * @param string     $filepath  The file path to the image being compressed.
-				 */
-				do_action(
-					'tiny_image_size_before_compression',
-					$this->id,
-					$size_name,
-					$size->filename
-				);
-
 				$resize   = $this->settings->get_resize_options( $size_name );
 				$preserve = $this->settings->get_preserve_options( $size_name );
 				Tiny_Logger::debug(

src/class-tiny-plugin.php

@@ -68,10 +68,10 @@ public function init() {
 		add_action( 'delete_attachment', $this->get_method( 'clean_attachment' ), 10, 2 );
 
 		add_action(
-			'tiny_image_size_before_compression',
-			$this->get_method( 'backup_image_size' ),
+			'tiny_image_before_compression',
+			$this->get_method( 'backup_original_image' ),
 			10,
-			3
+			1
 		);
 
 		load_plugin_textdomain(
@@ -871,38 +871,40 @@ public function clean_attachment( $post_id ) {
 	/**
 	 * Creates a backup of an image size before compression.
 	 *
-	 * Hooked to the `tiny_image_size_before_compression` action. Only creates
+	 * Hooked to the `tiny_image_before_compression` action. Only creates
 	 * a backup for the original image size when the backup setting is enabled.
 	 * The backup is stored under {upload_dir}/tinify_backup/, preserving the
 	 * original path structure relative to the uploads base directory.
 	 *
 	 * @since 3.6.8
 	 *
-	 * @param int        $image_id  The attachment ID.
-	 * @param int|string $size_name The image size name. 0 for the original.
-	 * @param string     $filepath  The file path to the image to be backed up.
-	 * @return bool      return true on backup created
+	 * @param int       $attachment_id The ID of the attachment
+	 * @return bool             return true on backup created
 	 */
-	public function backup_image_size( $image_id, $size_name, $filepath ) {
-		if ( ! Tiny_Image::is_original( $size_name ) ) {
-			return false;
-		}
-
+	public function backup_original_image( $attachment_id ) {
 		if ( ! $this->settings->get_backup_enabled() ) {
 			return false;
 		}
 
+		$tiny_image     = new Tiny_Image( $this->settings, $attachment_id );
+		$original_image = $tiny_image->get_image_size();
+
 		$upload_dir    = wp_upload_dir();
 		$upload_base   = trailingslashit( $upload_dir['basedir'] );
-		$relative_path = ltrim( str_replace( $upload_base, '', $filepath ), '/' );
+		$relative_path = ltrim( str_replace( $upload_base, '', $original_image->filename ), '/' );
 		$backup_file   = $upload_base . 'tinify_backup/' . $relative_path;
-		$backup_dir    = dirname( $backup_file );
+
+		if ( file_exists( $backup_file ) ) {
+			return false;
+		}
+
+		$backup_dir = dirname( $backup_file );
 
 		if ( ! wp_mkdir_p( $backup_dir ) ) {
 			return false;
 		}
 
-		return copy( $filepath, $backup_file );
+		return copy( $original_image->filename, $backup_file );
 	}
 
 	public static function request_review() {

test/unit/TinyPluginTest.php

@@ -503,7 +503,7 @@ public function test_init_adds_backup_image_size_action() {
 		$tiny_plugin->init();
 
 		// assert that backup is hooked into `tiny_image_size_before_compression`
-		WordPressStubs::assertHook('tiny_image_size_before_compression', array($tiny_plugin, 'backup_image_size'));
+		WordPressStubs::assertHook('tiny_image_before_compression', array($tiny_plugin, 'backup_original_image'));
 	}
 
 	public function test_will_copy_original_file_on_backup() {
@@ -520,15 +520,49 @@ public function test_will_copy_original_file_on_backup() {
 		$mock_settings->method('get_backup_enabled')->willReturn(true);
 		$settings_prop->setValue($tiny_plugin, $mock_settings);
 
-		$tiny_plugin->backup_image_size(1, 0, $og_file_path);
+		$this->wp->stub('wp_get_attachment_metadata', function ($i) {
+			return array(
+				'width' => 1256,
+				'height' => 1256,
+				'file' => '2026/04/testfile.png',
+				'sizes' => array(),
+			);
+		});
+
+		$backup_made = $tiny_plugin->backup_original_image(1);
 
+		assertTrue($backup_made, 'expected backup to be made');
 		assertTrue(file_exists($expected_backup), 'expected backup to be created');
 	}
 
-	public function test_when_not_original_will_not_backup() {
+	public function test_no_backup_when_backup_exists() {
+		$this->wp->createImage( 37857, '2026/04', 'testfile.png' );
+		$og_file_path = $this->vfs->url() . '/wp-content/uploads/2026/04/testfile.png';
+		$expected_backup = $this->vfs->url() . '/wp-content/uploads/tinify_backup/2026/04/testfile.png';
+
 		$tiny_plugin = new Tiny_Plugin();
-		$created = $tiny_plugin->backup_image_size(1, 'thumbnail', 'filepath');
 
-		assertFalse($created, 'expected backup not te be created');
+		$ref = new \ReflectionClass($tiny_plugin);
+		$settings_prop = $ref->getProperty('settings');
+		$settings_prop->setAccessible(true);
+		$mock_settings = $this->createMock(Tiny_Settings::class);
+		$mock_settings->method('get_backup_enabled')->willReturn(true);
+		$settings_prop->setValue($tiny_plugin, $mock_settings);
+
+		$this->wp->stub('wp_get_attachment_metadata', function ($i) {
+			return array(
+				'width' => 1256,
+				'height' => 1256,
+				'file' => '2026/04/testfile.png',
+				'sizes' => array(),
+			);
+		});
+
+		$this->wp->createImage( 37857, 'tinify_backup/2026/04', 'testfile.png' );
+
+		$backup_made = $tiny_plugin->backup_original_image(1);
+
+		assertFalse($backup_made, 'expected backup not to be made');
+		assertTrue(file_exists($expected_backup), 'expected backup to exist');
 	}
 }