added checking on isEnabled

Author: Bohdan Berezhniy

Plugin/Amasty/PageSpeedOptimizer/Model/Output/LazyLoadProcessorPlugin.php

@@ -8,12 +8,26 @@
 
 namespace Magefan\LazyLoad\Plugin\Amasty\PageSpeedOptimizer\Model\Output;
 
+use Magefan\LazyLoad\Model\Config;
+
 /**
  * Class LazyLoadProcessorPlugin
  * @package Magefan\LazyLoad\Plugin\Amasty\PageSpeedOptimizer\Model\Output
  */
 class LazyLoadProcessorPlugin
 {
+/**
+     * @var Config
+     */
+    private $config;
+
+    public function __construct(
+        Config $config
+
+    ) {
+        $this->config = $config;
+    }
+
     /**
      * @param $subject
      * @param callable $proceed
@@ -23,6 +37,10 @@ class LazyLoadProcessorPlugin
      */
     public function aroundReplaceWithPictureTag($subject, callable $proceed, $image, $imagePath)
     {
+        if (!$this->config->getEnabled()) {
+            return $proceed($image, $imagePath);
+        }
+
         $originImagePath = $imagePath;
         if (strpos($imagePath, 'Magefan_LazyLoad/images/pixel.jpg')) {
 

Plugin/Magefan/WebP/Model/WebPPlugin.php

@@ -8,7 +8,9 @@
 
 namespace Magefan\LazyLoad\Plugin\Magefan\WebP\Model;
 
+use Magefan\LazyLoad\Model\Config;
 use Magefan\WebP\Model\WebP;
+use Magento\Framework\Filesystem\Driver\File;
 
 /**
  * Class WebPPlugin
@@ -18,20 +20,32 @@ class WebPPlugin
     const LAZY_TAG = '<!-- MAGEFAN_LAZY_LOAD -->';
 
     /**
-     * @var Convertor
+     * @var WebP 
      */
     private $webp;
 
+    /**
+     * @var Config 
+     */
+    private $config;
+
     public function __construct(
-        WebP  $webp
+        WebP  $webp,
+        Config $config,
+        File $fileDriver
 
     ) {
         $this->webp = $webp;
+        $this->config = $config;
+        $this->fileDriver = $fileDriver;
     }
 
     public function aroundGetPictureTagHtml($subject, callable $proceed, $webpUrl, $imagePath, $htmlTag)
     {
-        $result = false;
+
+        if (!$this->config->getEnabled()) {
+            return $proceed($webpUrl, $imagePath, $htmlTag);
+        }
 
         $originImagePath = $imagePath;
 
@@ -47,13 +61,15 @@ public function aroundGetPictureTagHtml($subject, callable $proceed, $webpUrl, $
                     $imagePath = substr($htmlTag, $p1, $p2 - $p1);
                     $webpUrl = $this->webp->getWebpUrl($imagePath);
 
-                    $result = $this->webp->convert($imagePath, $webpUrl);
-
                 }
             }
+
+        } else {
+
+            return  $proceed($webpUrl, $imagePath, $htmlTag);
         }
 
-        if (!$result) {
+        if (!$this->fileDriver->isExists($this->webp->getPathFromUrl($imagePath))) {
             return $htmlTag;
         }