Merge pull request #6 from pressidium/next

1.0.1

Author: over-engineer

composer.lock

@@ -115,6 +115,56 @@ public function set_quality( int $quality ): Avif_Converter {
         return $this; // chainable
     }
 
+    /**
+     * Return a unique filename suffix to avoid overwriting existing files.
+     *
+     * @throws Image_Conversion_Exception If a unique filename could not be generated after multiple attempts.
+     *
+     * @param string $dir_name  Directory name.
+     * @param string $filename  Filename without extension.
+     * @param string $extension File extension.
+     *
+     * @return string
+     */
+    private function get_unique_suffix( string $dir_name, string $filename, string $extension ): string {
+        $base_suffix = 'optimized';
+        $suffix      = $base_suffix;
+
+        // Initial destination path
+        $destination_path = sprintf(
+            '%s/%s%s.%s',
+            $dir_name,
+            $filename,
+            $suffix,
+            $extension
+        );
+
+        $max_attempts = 5;
+        $counter      = 1;
+
+        while ( file_exists( $destination_path ) ) {
+            $suffix = sprintf( '%s_%d', $base_suffix, $counter );
+
+            $destination_path = sprintf(
+                '%s/%s%s.%s',
+                $dir_name,
+                $filename,
+                $suffix,
+                $extension
+            );
+
+            ++$counter;
+
+            if ( $counter > $max_attempts ) {
+                throw new Image_Conversion_Exception(
+                    'Could not generate a unique filename for the converted image.'
+                );
+            }
+        }
+
+        return $suffix;
+    }
+
     /**
      * Convert the specified image.
      *
@@ -128,17 +178,25 @@ public function convert(): Image {
             throw new Image_Conversion_Exception( 'Image is not loaded' );
         }
 
-        $destination_url = sprintf(
-            '%s.%s',
-            preg_replace( '/\.[^.]+$/', '', $this->image->get_url() ),
+        $path_info = pathinfo( $this->image->get_path() );
+        $suffix    = $this->get_unique_suffix(
+            $path_info['dirname'],
+            $path_info['filename'],
             self::EXTENSION
         );
 
-        $path_info        = pathinfo( $this->image->get_path() );
         $destination_path = sprintf(
-            '%s/%s.%s',
+            '%s/%s_%s.%s',
             $path_info['dirname'],
             $path_info['filename'],
+            $suffix,
+            self::EXTENSION
+        );
+
+        $destination_url = sprintf(
+            '%s_%s.%s',
+            preg_replace( '/\.[^.]+$/', '', $this->image->get_url() ),
+            $suffix,
             self::EXTENSION
         );
 

includes/Optimizations/Image/Converters/Avif_Converter.php

@@ -115,6 +115,56 @@ public function set_quality( int $quality ): Webp_Converter {
         return $this; // chainable
     }
 
+    /**
+     * Return a unique filename suffix to avoid overwriting existing files.
+     *
+     * @throws Image_Conversion_Exception If a unique filename could not be generated after multiple attempts.
+     *
+     * @param string $dir_name  Directory name.
+     * @param string $filename  Filename without extension.
+     * @param string $extension File extension.
+     *
+     * @return string
+     */
+    private function get_unique_suffix( string $dir_name, string $filename, string $extension ): string {
+        $base_suffix = 'optimized';
+        $suffix      = $base_suffix;
+
+        // Initial destination path
+        $destination_path = sprintf(
+            '%s/%s%s.%s',
+            $dir_name,
+            $filename,
+            $suffix,
+            $extension
+        );
+
+        $max_attempts = 5;
+        $counter      = 1;
+
+        while ( file_exists( $destination_path ) ) {
+            $suffix = sprintf( '%s_%d', $base_suffix, $counter );
+
+            $destination_path = sprintf(
+                '%s/%s%s.%s',
+                $dir_name,
+                $filename,
+                $suffix,
+                $extension
+            );
+
+            ++$counter;
+
+            if ( $counter > $max_attempts ) {
+                throw new Image_Conversion_Exception(
+                    'Could not generate a unique filename for the converted image.'
+                );
+            }
+        }
+
+        return $suffix;
+    }
+
     /**
      * Convert the specified image.
      *
@@ -128,17 +178,25 @@ public function convert(): Image {
             throw new Image_Conversion_Exception( 'Image is not loaded' );
         }
 
-        $destination_url = sprintf(
-            '%s.%s',
-            preg_replace( '/\.[^.]+$/', '', $this->image->get_url() ),
+        $path_info = pathinfo( $this->image->get_path() );
+        $suffix    = $this->get_unique_suffix(
+            $path_info['dirname'],
+            $path_info['filename'],
             self::EXTENSION
         );
 
-        $path_info        = pathinfo( $this->image->get_path() );
         $destination_path = sprintf(
-            '%s/%s.%s',
+            '%s/%s_%s.%s',
             $path_info['dirname'],
             $path_info['filename'],
+            $suffix,
+            self::EXTENSION
+        );
+
+        $destination_url = sprintf(
+            '%s_%s.%s',
+            preg_replace( '/\.[^.]+$/', '', $this->image->get_url() ),
+            $suffix,
             self::EXTENSION
         );
 

includes/Optimizations/Image/Converters/Webp_Converter.php

@@ -8,6 +8,8 @@
 
 namespace Pressidium\WP\Performance\Optimizations\Image;
 
+use Pressidium\WP\Performance\Utils\String_Utils;
+
 if ( ! defined( 'ABSPATH' ) ) {
     die( 'Forbidden' );
 }
@@ -64,7 +66,7 @@ public function update( int $attachment_id, string $size_variant_name, Image $op
         $relative_path = $this->ensure_path_is_relative( $optimized_image->get_path() );
 
         if ( $size_variant_name === 'full' ) {
-            $metadata['file']         = $relative_path;
+            $metadata['file']         = String_Utils::unleading_slash_it( $relative_path );
             $metadata['filesize']     = filesize( $optimized_image->get_path() );
             $metadata['mime-type']    = $optimized_image->get_mime_type();
             $metadata['is_optimized'] = true;