Glide process image assets on upload

config/assets.php

@@ -78,6 +78,7 @@
         | Rather than specifying your manipulation params in your templates with
         | the glide tag, you may define them here and reference their handles.
         | They may also be automatically generated when you upload assets.
+        | Containers can be configured to warm these caches on upload.
         |
         */
 

resources/js/components/fieldtypes/FilesFieldtype.vue

@@ -5,6 +5,7 @@
         <uploader
             ref="uploader"
             :url="meta.uploadUrl"
+            :container="config.container"
             @updated="uploadsUpdated"
             @upload-complete="uploadComplete"
             @error="uploadError"

resources/js/components/fieldtypes/SelectFieldtype.vue

@@ -29,13 +29,22 @@
                         v-bind="attributes"
                     >
                 </template>
+                <template #option="{ label }">
+                    <div v-if="config.label_html" v-html="label"></div>
+                    <template v-else v-text="label"></template>
+                </template>
+                <template #selected-option="{ label }">
+                    <div v-if="config.label_html" v-html="label"></div>
+                    <template v-else v-text="label"></template>
+                </template>
                 <template #no-options>
                     <div class="text-sm text-grey-70 text-left py-1 px-2" v-text="__('No options to choose from.')" />
                 </template>
                 <template #footer="{ deselect }" v-if="config.multiple">
                     <div class="vs__selected-options-outside flex flex-wrap">
                         <span v-for="option in selectedOptions" :key="option.value" class="vs__selected mt-1">
-                            {{ option.label }}
+                            <div v-if="config.label_html" v-html="option.label"></div>
+                            <template v-else>{{ option.label }}</template>
                             <button v-if="!readOnly" @click="deselect(option)" type="button" :aria-label="__('Deselect option')" class="vs__deselect">
                                 <span>×</span>
                             </button>

resources/lang/en/messages.php

@@ -16,6 +16,9 @@
     'asset_container_quick_download_instructions' => 'When enabled will add a quick download button in the Asset Manager.',
     'asset_container_rename_instructions' => 'When enabled will allow users to rename the files in this container.',
     'asset_container_title_instructions' => 'Usually a plural noun, like Images or Documents',
+    'asset_container_source_preset_instructions' => 'Uploaded images will be permanently processed using this preset.',
+    'asset_container_warm_intelligent_instructions' => 'Generate appropriate presets on upload.',
+    'asset_container_warm_presets_instructions' => 'Specify which presets to generate on upload.',
     'asset_folders_directory_instructions' => 'We recommend avoiding spaces and special characters to keep URLs clean.',
     'asset_replace_confirmation' => 'References to this asset within content will be updated to the asset you select below.',
     'asset_reupload_confirmation' => 'Are you sure you want to reupload this asset?',

resources/sass/vendors/vue-select.scss

@@ -64,6 +64,10 @@
     @apply min-w-0;
 }
 
+.vs__selected-options-outside .hidden-outside {
+    display: none;
+}
+
 .v-select:not(.vs--unsearchable) .vs__selected-options {
 	@apply appearance-none text-grey-80 text-sm;
 	@apply flex flex-wrap flex-1 border border-grey-50 border-r-0 rounded-l relative h-full;
@@ -172,7 +176,6 @@
 	cursor: text;
 }
 
-
 .v-select:not(.vs--single) .vs__selected {
 	@include clickable;
 	@apply flex items-center text-sm rounded py-0 px-1 mr-1;

src/Actions/ReuploadAsset.php

@@ -77,6 +77,7 @@ protected function fieldItems()
                 'type' => 'files',
                 'max_files' => 1,
                 'validate' => ['required'],
+                'container' => $this->items->first()->container()->handle(),
             ],
         ];
     }

src/Assets/Asset.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
+use Statamic\Assets\AssetUploader as Uploader;
 use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
 use Statamic\Contracts\Data\Augmentable;
@@ -33,7 +34,6 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
-use Stringy\Stringy;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Mime\MimeTypes;
 
@@ -678,7 +678,7 @@ public function rename($filename, $unique = false)
      */
     public function move($folder, $filename = null)
     {
-        $filename = $this->getSafeFilename($filename ?: $this->filename());
+        $filename = Uploader::getSafeFilename($filename ?: $this->filename());
         $oldPath = $this->path();
         $oldMetaPath = $this->metaPath();
         $newPath = Str::removeLeft(Path::tidy($folder.'/'.$filename.'.'.pathinfo($oldPath, PATHINFO_EXTENSION)), '/');
@@ -844,29 +844,12 @@ public function title()
      */
     public function upload(UploadedFile $file)
     {
-        $ext = $file->getClientOriginalExtension();
-        $filename = $this->getSafeFilename(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME));
+        $path = Uploader::asset($this)->upload($file);
 
-        $directory = $this->folder();
-        $directory = ($directory === '.') ? '/' : $directory;
-        $path = Path::tidy($directory.'/'.$filename.'.'.$ext);
-        $path = ltrim($path, '/');
-
-        // If the file exists, we'll append a timestamp to prevent overwriting.
-        if ($this->disk()->exists($path)) {
-            $basename = $filename.'-'.Carbon::now()->timestamp.'.'.$ext;
-            $path = Str::removeLeft(Path::assemble($directory, $basename), '/');
-        }
-
-        $stream = fopen($file->getRealPath(), 'r');
-        $this->disk()->put($path, $stream);
-        if (is_resource($stream)) {
-            fclose($stream);
-        }
-
-        $this->path($path)->syncOriginal();
-
-        $this->save();
+        $this
+            ->path($path)
+            ->syncOriginal()
+            ->save();
 
         AssetUploaded::dispatch($this);
 
@@ -909,32 +892,6 @@ public function stream()
         return $this->disk()->filesystem()->readStream($this->path());
     }
 
-    /**
-     * Ensure safe filename string.
-     *
-     * @param  string  $string
-     * @return string
-     */
-    private function getSafeFilename($string)
-    {
-        $replacements = [
-            ' ' => '-',
-            '#' => '-',
-        ];
-
-        $str = Stringy::create(urldecode($string))->toAscii();
-
-        foreach ($replacements as $from => $to) {
-            $str = $str->replace($from, $to);
-        }
-
-        if (config('statamic.assets.lowercase')) {
-            $str = strtolower($str);
-        }
-
-        return (string) $str;
-    }
-
     /**
      * Get the asset file contents.
      *
@@ -1066,4 +1023,17 @@ public function getQueryableValue(string $field)
 
         return $field->fieldtype()->toQueryableValue($value);
     }
+
+    public function warmPresets()
+    {
+        if (! $this->isImage()) {
+            return [];
+        }
+
+        $cpPresets = config('statamic.cp.enabled') ? [
+            'cp_thumbnail_small_'.$this->orientation(),
+        ] : [];
+
+        return array_merge($this->container->warmPresets(), $cpPresets);
+    }
 }

src/Assets/AssetContainer.php

@@ -19,6 +19,7 @@
 use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\File;
+use Statamic\Facades\Image;
 use Statamic\Facades\Search;
 use Statamic\Facades\Stache;
 use Statamic\Facades\URL;
@@ -38,6 +39,8 @@ class AssetContainer implements AssetContainerContract, Augmentable, ArrayAccess
     protected $allowMoving;
     protected $allowRenaming;
     protected $createFolders;
+    protected $sourcePreset;
+    protected $warmPresets;
     protected $searchIndex;
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
@@ -527,6 +530,55 @@ public function createFolders($createFolders = null)
             ->args(func_get_args());
     }
 
+    /**
+     * The glide source preset to be permanently applied to source image on upload.
+     *
+     * @param  string|null  $preset
+     * @return string|null|$this
+     */
+    public function sourcePreset($preset = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('sourcePreset')
+            ->args(func_get_args());
+    }
+
+    /**
+     * The specific glide presets to be used when warming glide image cache on upload.
+     *
+     * @param  array|null  $presets
+     * @return array|null|$this
+     */
+    public function warmPresets($preset = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('warmPresets')
+            ->getter(function ($presets) {
+                if ($presets === false) {
+                    return [];
+                }
+
+                if ($presets !== null) {
+                    return $presets;
+                }
+
+                $presets = Image::userManipulationPresets();
+
+                $presets = Arr::except($presets, $this->sourcePreset);
+
+                return array_keys($presets);
+            })
+            ->setter(function ($presets) {
+                return $presets === [] ? false : $presets;
+            })
+            ->args(func_get_args());
+    }
+
+    public function warmsPresetsIntelligently()
+    {
+        return $this->warmPresets === null;
+    }
+
     public function fileData()
     {
         $array = [
@@ -538,6 +590,8 @@ public function fileData()
             'allow_renaming' => $this->allowRenaming,
             'allow_moving' => $this->allowMoving,
             'create_folders' => $this->createFolders,
+            'source_preset' => $this->sourcePreset,
+            'warm_presets' => $this->warmPresets,
         ];
 
         $array = Arr::removeNullValues(array_merge($array, [

src/Assets/AssetUploader.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Statamic\Assets;
+
+use Illuminate\Support\Carbon;
+use Statamic\Facades\Path;
+use Statamic\Support\Str;
+use Stringy\Stringy;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class AssetUploader extends Uploader
+{
+    private $asset;
+
+    public function __construct(Asset $asset)
+    {
+        $this->asset = $asset;
+    }
+
+    public static function asset(Asset $asset)
+    {
+        return new static($asset);
+    }
+
+    protected function uploadPath(UploadedFile $file)
+    {
+        $ext = $file->getClientOriginalExtension();
+        $filename = self::getSafeFilename(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME));
+
+        $directory = $this->asset->folder();
+        $directory = ($directory === '.') ? '/' : $directory;
+        $path = Path::tidy($directory.'/'.$filename.'.'.$ext);
+        $path = ltrim($path, '/');
+
+        // If the file exists, we'll append a timestamp to prevent overwriting.
+        if ($this->disk()->exists($path)) {
+            $basename = $filename.'-'.Carbon::now()->timestamp.'.'.$ext;
+            $path = Str::removeLeft(Path::assemble($directory, $basename), '/');
+        }
+
+        return $path;
+    }
+
+    protected function preset()
+    {
+        return $this->asset->container()->sourcePreset();
+    }
+
+    protected function disk()
+    {
+        return $this->asset->container()->disk();
+    }
+
+    public static function getSafeFilename($string)
+    {
+        $replacements = [
+            ' ' => '-',
+            '#' => '-',
+        ];
+
+        $str = Stringy::create(urldecode($string))->toAscii();
+
+        foreach ($replacements as $from => $to) {
+            $str = $str->replace($from, $to);
+        }
+
+        if (config('statamic.assets.lowercase')) {
+            $str = strtolower($str);
+        }
+
+        return (string) $str;
+    }
+}

src/Assets/FileUploader.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Statamic\Assets;
+
+use Illuminate\Support\Facades\Storage;
+use Statamic\Facades\AssetContainer;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class FileUploader extends Uploader
+{
+    protected $container;
+
+    public function __construct($container)
+    {
+        $this->container = $container ? AssetContainer::find($container) : null;
+    }
+
+    public static function container(string $container = null)
+    {
+        return new static($container);
+    }
+
+    protected function uploadPath(UploadedFile $file)
+    {
+        return now()->timestamp.'/'.$file->getClientOriginalName();
+    }
+
+    protected function uploadPathPrefix()
+    {
+        return 'statamic/file-uploads/';
+    }
+
+    protected function preset()
+    {
+        return optional($this->container)->sourcePreset();
+    }
+
+    protected function disk()
+    {
+        return Storage::disk('local');
+    }
+}