Vastly increase the speed with which the transforms are created when …

…done via Twig templating code Signed-off-by: Andrew Welch <[email protected]>
nystudio107 · Apr 7, 2018 · 56350ea · 56350ea
1 parent 622df2f
commit 56350ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/services/Optimize.php b/src/services/Optimize.php
@@ -106,7 +106,7 @@ public function handleGenerateTransformEvent(GenerateTransformEvent $event)
 
         $settings = ImageOptimize::$plugin->getSettings();
         // Only do this for local Craft transforms
-        if ($settings->transformMethod == 'craft' && !empty($event->asset) && ImageOptimize::$generatePlaceholders) {
+        if ($settings->transformMethod == 'craft' && !empty($event->asset)) {
             // Apply any filters to the image
             if (!empty($event->transformIndex->transform)) {
                 $this->applyFiltersToImage($event->transformIndex->transform, $event->asset, $event->image);

diff --git a/src/services/OptimizedImages.php b/src/services/OptimizedImages.php
@@ -51,6 +51,7 @@ class OptimizedImages extends Component
      */
     public function createOptimizedImages(Asset $asset, $variants = [])
     {
+        Craft::beginProfile('createOptimizedImages', __METHOD__);
         if (empty($variants)) {
             $settings = ImageOptimize::$plugin->getSettings();
             if ($settings) {
@@ -60,6 +61,7 @@ public function createOptimizedImages(Asset $asset, $variants = [])
 
         $model = new OptimizedImage();
         $this->populateOptimizedImageModel($asset, $variants, $model);
+        Craft::endProfile('createOptimizedImages', __METHOD__);
 
         return $model;
     }
@@ -71,6 +73,7 @@ public function createOptimizedImages(Asset $asset, $variants = [])
      */
     public function populateOptimizedImageModel(Asset $asset, $variants, OptimizedImage $model)
     {
+        Craft::beginProfile('populateOptimizedImageModel', __METHOD__);
         $settings = ImageOptimize::$plugin->getSettings();
         // Empty our the optimized image URLs
         $model->optimizedImageUrls = [];
@@ -137,6 +140,7 @@ public function populateOptimizedImageModel(Asset $asset, $variants, OptimizedIm
                 );
             }
         }
+        Craft::endProfile('populateOptimizedImageModel', __METHOD__);
     }
 
     // Protected Methods
@@ -219,6 +223,7 @@ protected function getTransformFromVariant(Asset $asset, $variant, $retinaSize):
      */
     protected function addVariantImageToModel(Asset $asset, OptimizedImage $model, $transform, $variant, $aspectRatio)
     {
+        Craft::beginProfile('addVariantImageToModel', __METHOD__);
         // Generate an image transform url
         $url = ImageOptimize::$transformClass::getTransformUrl(
             $asset,
@@ -233,11 +238,11 @@ protected function addVariantImageToModel(Asset $asset, OptimizedImage $model, $
         if (!empty($url)) {
             $model->variantSourceWidths[] = $variant['width'];
             // Store & prefetch image at the image URL
-            ImageOptimize::$transformClass::prefetchRemoteFile($url);
+            //ImageOptimize::$transformClass::prefetchRemoteFile($url);
             $model->optimizedImageUrls[$transform->width] = $url;
             // Store & prefetch image at the webp URL
             $webPUrl = ImageOptimize::$transformClass::getWebPUrl($url);
-            ImageOptimize::$transformClass::prefetchRemoteFile($webPUrl);
+            //ImageOptimize::$transformClass::prefetchRemoteFile($webPUrl);
             $model->optimizedWebPImageUrls[$transform->width] = $webPUrl;
             $model->focalPoint = $asset->focalPoint;
             $model->originalImageWidth = $asset->width;
@@ -253,6 +258,7 @@ protected function addVariantImageToModel(Asset $asset, OptimizedImage $model, $
                 __METHOD__
             );
         }
+        Craft::endProfile('addVariantImageToModel', __METHOD__);
     }
 
     /**