Merge branch 'release/1.6.43' into v1

Author: Andrew Welch

CHANGELOG.md

@@ -1,5 +1,11 @@
 # ImageOptimize Changelog
 
+## 1.6.43 - 2022.03.14
+
+### Fixed
+
+* Fixed an issue where an exception could be thrown when running the `craft resave/assets` console command ([#78](https://github.com/nystudio107/craft-imageoptimize/issues/78))
+
 ## 1.6.42 - 2022.02.23
 
 ### Added

composer.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-imageoptimize",
   "description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like imgix, with zero template changes.",
   "type": "craft-plugin",
-  "version": "1.6.42",
+  "version": "1.6.43",
   "keywords": [
     "craft",
     "cms",

src/fields/OptimizedImages.php

@@ -240,7 +240,8 @@ public function afterElementSave(ElementInterface $asset, bool $isNew)
                      * itself is being updated (via the ImageEditor). If so, update the
                      * variants immediately so the AssetSelectorHud displays the new images
                      */
-                    if (Craft::$app->getRequest()->getPathInfo() === 'actions/assets/save-image') {
+                    $request = Craft::$app->getRequest();
+                    if (!$request->isConsoleRequest && $request->getPathInfo() === 'actions/assets/save-image') {
                         try {
                             ImageOptimize::$plugin->optimizedImages->updateOptimizedImageFieldData($this, $asset);
                         } catch (Exception $e) {
@@ -373,6 +374,89 @@ public function getSettingsHtml()
         return '';
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getInputHtml($value, ElementInterface $element = null): string
+    {
+        if ($element !== null && $element instanceof Asset && $this->handle !== null) {
+            /** @var Asset $element */
+            // Register our asset bundle
+            try {
+                Craft::$app->getView()->registerAssetBundle(ImageOptimizeAsset::class);
+            } catch (InvalidConfigException $e) {
+                Craft::error($e->getMessage(), __METHOD__);
+            }
+
+            // Get our id and namespace
+            if (ImageOptimize::$craft35) {
+                $id = Html::id($this->handle);
+            } else {
+                $id = Craft::$app->getView()->formatInputId($this->handle);
+            }
+            $nameSpaceId = Craft::$app->getView()->namespaceInputId($id);
+
+            // Variables to pass down to our field JavaScript to let it namespace properly
+            $jsonVars = [
+                'id' => $id,
+                'name' => $this->handle,
+                'namespace' => $nameSpaceId,
+                'prefix' => Craft::$app->getView()->namespaceInputId(''),
+            ];
+            $jsonVars = Json::encode($jsonVars);
+            $view = Craft::$app->getView();
+            $view->registerJs(
+                "$('#{$nameSpaceId}-field').ImageOptimizeOptimizedImages(" .
+                $jsonVars .
+                ");"
+            );
+
+            $settings = ImageOptimize::$plugin->getSettings();
+            $createVariants = ImageOptimize::$plugin->optimizedImages->shouldCreateVariants($this, $element);
+
+            // Render the input template
+            try {
+                return Craft::$app->getView()->renderTemplate(
+                    'image-optimize/_components/fields/OptimizedImages_input',
+                    [
+                        'name' => $this->handle,
+                        'value' => $value,
+                        'variants' => $this->variants,
+                        'field' => $this,
+                        'settings' => $settings,
+                        'elementId' => $element->id,
+                        'format' => $element->getExtension(),
+                        'id' => $id,
+                        'nameSpaceId' => $nameSpaceId,
+                        'createVariants' => $createVariants,
+                    ]
+                );
+            } catch (LoaderError $e) {
+                Craft::error($e->getMessage(), __METHOD__);
+            } catch (\yii\base\Exception $e) {
+                Craft::error($e->getMessage(), __METHOD__);
+            }
+        }
+
+        // Render an error template, since the field only works when attached to an Asset
+        try {
+            return Craft::$app->getView()->renderTemplate(
+                'image-optimize/_components/fields/OptimizedImages_error',
+                [
+                ]
+            );
+        } catch (LoaderError $e) {
+            Craft::error($e->getMessage(), __METHOD__);
+        } catch (\yii\base\Exception $e) {
+            Craft::error($e->getMessage(), __METHOD__);
+        }
+
+        return '';
+    }
+
+    // Protected Methods
+    // =========================================================================
+
     /**
      * Returns an array of asset volumes and their sub-folders
      *
@@ -409,9 +493,6 @@ protected function getFieldVolumeInfo($fieldHandle): array
         return $result;
     }
 
-    // Protected Methods
-    // =========================================================================
-
     /**
      * See if the passed $volume has an OptimizedImagesField with the handle $fieldHandle
      *
@@ -461,84 +542,4 @@ protected function assembleSourceList(array $folders, bool $includeNestedFolders
 
         return $sources;
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function getInputHtml($value, ElementInterface $element = null): string
-    {
-        if ($element !== null && $element instanceof Asset && $this->handle !== null) {
-            /** @var Asset $element */
-            // Register our asset bundle
-            try {
-                Craft::$app->getView()->registerAssetBundle(ImageOptimizeAsset::class);
-            } catch (InvalidConfigException $e) {
-                Craft::error($e->getMessage(), __METHOD__);
-            }
-
-            // Get our id and namespace
-            if (ImageOptimize::$craft35) {
-                $id = Html::id($this->handle);
-            } else {
-                $id = Craft::$app->getView()->formatInputId($this->handle);
-            }
-            $nameSpaceId = Craft::$app->getView()->namespaceInputId($id);
-
-            // Variables to pass down to our field JavaScript to let it namespace properly
-            $jsonVars = [
-                'id' => $id,
-                'name' => $this->handle,
-                'namespace' => $nameSpaceId,
-                'prefix' => Craft::$app->getView()->namespaceInputId(''),
-            ];
-            $jsonVars = Json::encode($jsonVars);
-            $view = Craft::$app->getView();
-            $view->registerJs(
-                "$('#{$nameSpaceId}-field').ImageOptimizeOptimizedImages(" .
-                $jsonVars .
-                ");"
-            );
-
-            $settings = ImageOptimize::$plugin->getSettings();
-            $createVariants = ImageOptimize::$plugin->optimizedImages->shouldCreateVariants($this, $element);
-
-            // Render the input template
-            try {
-                return Craft::$app->getView()->renderTemplate(
-                    'image-optimize/_components/fields/OptimizedImages_input',
-                    [
-                        'name' => $this->handle,
-                        'value' => $value,
-                        'variants' => $this->variants,
-                        'field' => $this,
-                        'settings' => $settings,
-                        'elementId' => $element->id,
-                        'format' => $element->getExtension(),
-                        'id' => $id,
-                        'nameSpaceId' => $nameSpaceId,
-                        'createVariants' => $createVariants,
-                    ]
-                );
-            } catch (LoaderError $e) {
-                Craft::error($e->getMessage(), __METHOD__);
-            } catch (\yii\base\Exception $e) {
-                Craft::error($e->getMessage(), __METHOD__);
-            }
-        }
-
-        // Render an error template, since the field only works when attached to an Asset
-        try {
-            return Craft::$app->getView()->renderTemplate(
-                'image-optimize/_components/fields/OptimizedImages_error',
-                [
-                ]
-            );
-        } catch (LoaderError $e) {
-            Craft::error($e->getMessage(), __METHOD__);
-        } catch (\yii\base\Exception $e) {
-            Craft::error($e->getMessage(), __METHOD__);
-        }
-
-        return '';
-    }
 }