From d01c7d386826402c0718238153307491bc4f1762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Go=CC=88ldi?= Date: Wed, 5 Jun 2024 14:12:54 +0200 Subject: [PATCH] WIP --- database/factories/ImageFactory.php | 10 +++++--- package-lock.json | 37 +---------------------------- 2 files changed, 8 insertions(+), 39 deletions(-) diff --git a/database/factories/ImageFactory.php b/database/factories/ImageFactory.php index cf51bc7..4787e72 100644 --- a/database/factories/ImageFactory.php +++ b/database/factories/ImageFactory.php @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Storage; use Intervention\Image\Laravel\Facades\Image as InterventionImage; use \App\Importers\Image\Jobs\GenerateThumbnail; use \App\Importers\Image\Jobs\GenerateFullscreen; +use Illuminate\Support\Facades\Bus; /** * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Image> @@ -31,10 +32,13 @@ class ImageFactory extends Factory $width = rand(2000, 4000); $image_content = Http::get("https://picsum.photos/{$width}/{$height}")->body(); $encoded = InterventionImage::read($image_content)->toAvif(config('gallery.image.quality')); - Storage::disk('images')->put($image->album->id . '/original/' . $image->id . '.avif', $encoded); + $image_path = $image->album_id . '/original/' . $image->id . '.avif'; + Storage::disk('images')->put($image_path, $encoded); - GenerateThumbnail::dispatch($image); - GenerateFullscreen::dispatch($image); + Bus::batch([ + new GenerateThumbnail($image), + new GenerateFullscreen($image), + ])->name('seeder_import_batch_' . $image->id)->dispatch(); }); } diff --git a/package-lock.json b/package-lock.json index a58bc30..ea017bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,17 +9,14 @@ "filepond-plugin-file-validate-size": "^2.2.8", "filepond-plugin-file-validate-type": "^1.2.9", "filepond-plugin-image-exif-orientation": "^1.0.11", - "filepond-plugin-image-preview": "^4.6.12", - "filepond-plugin-image-transform": "^3.8.7" + "filepond-plugin-image-preview": "^4.6.12" }, "devDependencies": { "@tailwindcss/forms": "^0.5.7", "autoprefixer": "^10.4.19", "axios": "^1.6.4", - "laravel-echo": "^1.16.1", "laravel-vite-plugin": "^1.0", "postcss": "^8.4.38", - "pusher-js": "^8.4.0-rc2", "tailwindcss": "^3.4.3", "vite": "^5.0" } @@ -1204,14 +1201,6 @@ "filepond": ">=4.x <5.x" } }, - "node_modules/filepond-plugin-image-transform": { - "version": "3.8.7", - "resolved": "https://registry.npmjs.org/filepond-plugin-image-transform/-/filepond-plugin-image-transform-3.8.7.tgz", - "integrity": "sha512-vgKwyIDG2y5twanf7YpqZvxkaLudTjwd9vRcoq5sQDB8egUlX5/NA0bQ0823pocrm0fjbFeetICu44mkqeDkIA==", - "peerDependencies": { - "filepond": ">=3.6.0 <5.x" - } - }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -1452,15 +1441,6 @@ "jiti": "bin/jiti.js" } }, - "node_modules/laravel-echo": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.1.tgz", - "integrity": "sha512-++Ylb6M3ariC9Rk5WE5gZjj6wcEV5kvLF8b+geJ5/rRIfdoOA+eG6b9qJPrarMD9rY28Apx+l3eelIrCc2skVg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/laravel-vite-plugin": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz", @@ -1873,15 +1853,6 @@ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "dev": true }, - "node_modules/pusher-js": { - "version": "8.4.0-rc2", - "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.4.0-rc2.tgz", - "integrity": "sha512-d87GjOEEl9QgO5BWmViSqW0LOzPvybvX6WA9zLUstNdB57jVJuR27zHkRnrav2a3+zAMlHbP2Og8wug+rG8T+g==", - "dev": true, - "dependencies": { - "tweetnacl": "^1.0.3" - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -2256,12 +2227,6 @@ "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", "dev": true }, - "node_modules/tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==", - "dev": true - }, "node_modules/update-browserslist-db": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",