Add thumbnail_in_storage config, to handle thumbnails creation in /st…

…orage dir

resources/config/sharp.php

@@ -5,8 +5,12 @@
 
     "upload_storage_disk" => "local",
     "upload_storage_base_path" => "data",
+    "thumbnail_in_storage" => false,
     "thumbnail_relative_path" => "sharp/thumbnails",
     "upload_tmp_base_path" => "tmp/sharp",
+    "file_queue_name" => null,
+
+    "user_login_field_name" => "login",
 
     "categories" => []
 ];

src/helpers/sharp_helper.php

@@ -25,8 +25,6 @@ function sharp_thumbnail($source, $w, $h, $params = [], $relativeFolder=null, $i
         $source = config("sharp.upload_storage_base_path") . "/" . $source;
     }
 
-    $thumbnailPath = config("sharp.thumbnail_relative_path");
-
     $sizeMin = isset($params["size_min"]) && $params["size_min"];
 
     if ($w == 0) {
@@ -36,8 +34,20 @@ function sharp_thumbnail($source, $w, $h, $params = [], $relativeFolder=null, $i
         $h = null;
     }
 
-    $thumbName = "$thumbnailPath/$relativeFolder/$w-$h" . ($sizeMin ? "_min" : "") . "/" . basename($source);
-    $thumbFile = public_path($thumbName);
+    $thumbName = "$relativeFolder/$w-$h"
+        . ($sizeMin ? "_min" : "")
+        . "/" . basename($source);
+
+    $thumbnailPath = config("sharp.thumbnail_relative_path");
+
+    if(config("sharp.thumbnail_in_storage", false)) {
+        $thumbFile = storage_path(
+            "app/public/$thumbnailPath/".config('sharp.upload_storage_base_path')."/$thumbName"
+        );
+
+    } else {
+        $thumbFile = public_path("$thumbnailPath/$thumbName");
+    }
 
     if (!file_exists($thumbFile)) {
 
@@ -74,7 +84,11 @@ function sharp_thumbnail($source, $w, $h, $params = [], $relativeFolder=null, $i
         }
     }
 
-    return url($thumbName);
+    if(config("sharp.thumbnail_in_storage", false)) {
+        return url("storage/$thumbnailPath/".config('sharp.upload_storage_base_path')."/$thumbName");
+    }
+
+    return url("$thumbnailPath/$thumbName");
 }
 
 /**

version.txt

@@ -1 +1 @@
-3.1.26
+3.1.27