Add file_path var, tweak url parts

Author: barryvdh

Helper/Data.php

@@ -48,6 +48,7 @@ public function replaceImageUrlWithCustom(Image $image, string $imageUrl)
         }
 
         $params = $image->getImageTransformationParameters();
+        $params['file_path'] = $image->getFilePath();
 
         if ($customType === CustomConfig::TYPE_PATTERN) {
             return $this->getCustomUrlFromPattern($imageUrl, $params);
@@ -67,9 +68,11 @@ public function getCustomUrlFromPattern(string $imageUrl, array $params): string
         $customUrl = $this->customConfig->getCustomPattern();
 
         $urlParts = parse_url($imageUrl);
-        $params = $params + $urlParts;
+        foreach ($urlParts as $part => $value) {
+            $params['url_' . $part] = $value;
+        }
 
-        $params['path'] = ltrim($params['path'], '/');
+        $params['path'] = ltrim($params['url_path'], '/');
         $params['base_url'] = $this->getBaseUrl();
         $params['base_url_media'] = $this->getMediaBaseUrl();
         $params['image_url'] = explode('?', $imageUrl)[0];

etc/adminhtml/system.xml

@@ -16,7 +16,7 @@
                         <field id="catalog_media_url_format_custom_type">pattern</field>
                     </depends>
                     <comment><![CDATA[Custom format to add dynamic parameters.<br/>
-                    <b>Available variables:</b> {{base_url}}, {{base_url_media}}, {{image_url}}, {{path}}, {{width}}, {{height}}, {{image_type}}, {{host}}, {{store}}. <br/><br/>
+                    <b>Available variables:</b> {{base_url}}, {{base_url_media}}, {{image_url}}, {{file_path}}, {{path}}, {{width}}, {{height}}, {{image_type}}, {{url_host}}, {{url_path}}, {{url_query}}, {{store}}. <br/><br/>
                     <b>Filters:</b> {{path|urlencode}}, {{path|rawurlencode}}, {{path|base64}}<br/>
                     <b>Example:</b> {{base_url}}{{path}}?w={{width}}&h={{height}}]]></comment>
                 </field>