Merge pull request #9 from Eleven-Miles/bugfix/update-post-meta

Added in remove and add filters in the convert process and fixed dash…

.gitignore

@@ -1 +1,2 @@
 /vendor/
+.DS_Store

src/Helper/IrisHelper.php

@@ -2,7 +2,7 @@
 
 namespace ElevenMiles\Iris\Helper;
 
-define('IRIS_ASSET_PATH', get_template_directory_uri() . '/vendor/eleven-miles/iris/src/assets');
+define('IRIS_ASSET_PATH', '/vendor/eleven-miles/iris/src/assets');
 
 class IrisHelper
 {

src/Iris.php

@@ -57,7 +57,7 @@ public function __construct()
         add_action('plugins_loaded', [__CLASS__, 'check_for_offload_media']);
 
         add_filter('wp_generate_attachment_metadata', [__CLASS__, 'convertImageOnUplodad'], 10, 2);
-        add_filter('wp_generate_attachment_metadata', [__CLASS__, 'webpConverter'], 10, 1);
+        // add_filter('wp_generate_attachment_metadata', [__CLASS__, 'webpConverter'], 10, 1);
         add_action('webp_bulk_process_schedule', [__CLASS__, 'webpBulkConverter'], 10, 1);
     }
 
@@ -92,11 +92,17 @@ public static function webpConverter($attachment_id)
 
     public static function convertImageOnUplodad($image_meta, $attachment_id)
     {
+        // Remove wp_generate_attachment_metadata action
+        remove_filter('wp_generate_attachment_metadata', [__CLASS__, 'convertImageOnUplodad'], 10);
+
         $file = wp_get_original_image_path($attachment_id);
         $image_mime = wp_getimagesize($file)['mime'];
         $editor = wp_get_image_editor($file);
 
         if (is_wp_error($editor)) {
+            // add action wp_generate_attachment_metadata
+            add_filter('wp_generate_attachment_metadata', [__CLASS__, 'convertImageOnUplodad'], 10, 2);
+
             return $image_meta;
         }
 
@@ -121,11 +127,15 @@ public static function convertImageOnUplodad($image_meta, $attachment_id)
 
                 $webp_meta = wp_generate_attachment_metadata($attachment_id, $webp_file);
                 wp_update_attachment_metadata($attachment_id, $webp_meta);
+                update_post_meta($attachment_id, '_wp_attached_file', $webp_file);
             } else {
                 error_log(__('Unable to save the original in webp format ') . $file);
             }
         }
 
+        // add action wp_generate_attachment_metadata
+        add_filter('wp_generate_attachment_metadata', [__CLASS__, 'convertImageOnUplodad'], 10, 2);
+
         return $image_meta;
     }
 }

src/IrisConvert/IrisConvert.php

@@ -4,6 +4,7 @@
 
 use DeliciousBrains\WP_Offload_Media\Items\Media_Library_Item;
 use ElevenMiles\Iris\Debug;
+use ElevenMiles\Iris\Iris;
 
 class IrisConvert
 {
@@ -101,6 +102,8 @@ public function createArrayOfSizesToBeConverted($metadata)
 
     public function convertArrayOfSizes()
     {
+        // Remove wp_generate_attachment_metadata action
+        remove_filter('wp_generate_attachment_metadata', [Iris::class, 'convertImageOnUplodad'], 10);
         switch ($this->file_ext) {
 
             case 'jpeg':
@@ -158,5 +161,8 @@ public function convertArrayOfSizes()
             default:
                 return false;
         }
+
+        // add action wp_generate_attachment_metadata
+        add_filter('wp_generate_attachment_metadata', [Iris::class, 'convertImageOnUplodad'], 10, 2);
     }
 }

src/WordPress/Admin/AdminPanel.php

@@ -9,7 +9,6 @@
 
 class AdminPanel
 {
-    const WP_API_NAMESPACE = 'wyke/v1';
 
     public function __construct()
     {
@@ -52,7 +51,7 @@ public static function render()
         }
 
         $context['iris_scheduled'] = get_option('iris');
-        $context['namespace'] = self::WP_API_NAMESPACE;
+        $context['namespace'] = get_env('WP_API_NAMESPACE');
 
         Timber::render(__DIR__ . "/views/actions.twig", $context);
     }