From f5e182baf669a88f4aa4a9c197f484cf09a99c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 21 Dec 2021 10:34:15 +0100 Subject: [PATCH] format --- config/vuefilemanager.php | 5 +---- src/App/Users/Resources/UserStorageResource.php | 2 +- .../Files/Actions/GenerateImageThumbnailAction.php | 3 --- .../Files/Actions/ProcessImageThumbnailAction.php | 4 ---- src/Domain/Files/Actions/UploadFileAction.php | 10 ++++------ src/Domain/Trash/Controllers/DumpTrashController.php | 6 ++---- src/Support/helpers.php | 8 ++++---- tests/Domain/Files/FileTest.php | 2 +- tests/Domain/Trash/TrashTest.php | 3 +-- 9 files changed, 14 insertions(+), 29 deletions(-) diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php index b484ac4e..9ac54134 100644 --- a/config/vuefilemanager.php +++ b/config/vuefilemanager.php @@ -29,7 +29,6 @@ return [ ], 'image_sizes' => [ - 'immediately' => [ [ 'size' => 120, @@ -54,8 +53,6 @@ return [ 'size' => 1440, 'name' => 'xl', ], - - ] - + ], ], ]; diff --git a/src/App/Users/Resources/UserStorageResource.php b/src/App/Users/Resources/UserStorageResource.php index a81ec247..453ce552 100644 --- a/src/App/Users/Resources/UserStorageResource.php +++ b/src/App/Users/Resources/UserStorageResource.php @@ -20,7 +20,7 @@ class UserStorageResource extends JsonResource $totalCapacity = match (get_settings('subscription_type')) { 'metered' => $this->usedCapacity / 1000000000, - 'fixed' => $this->limitations->max_storage_amount, + 'fixed' => $this->limitations->max_storage_amount, }; return [ diff --git a/src/Domain/Files/Actions/GenerateImageThumbnailAction.php b/src/Domain/Files/Actions/GenerateImageThumbnailAction.php index 4b13dcc8..c131ce63 100644 --- a/src/Domain/Files/Actions/GenerateImageThumbnailAction.php +++ b/src/Domain/Files/Actions/GenerateImageThumbnailAction.php @@ -1,5 +1,4 @@ each(function ($size) use ($image, $userId, $fileName, $imageWidth) { - if ($imageWidth > $size['size']) { - // Create intervention image $intervention = Image::make($image)->orientate(); diff --git a/src/Domain/Files/Actions/ProcessImageThumbnailAction.php b/src/Domain/Files/Actions/ProcessImageThumbnailAction.php index 5f1ca027..0f687697 100644 --- a/src/Domain/Files/Actions/ProcessImageThumbnailAction.php +++ b/src/Domain/Files/Actions/ProcessImageThumbnailAction.php @@ -3,10 +3,8 @@ namespace Domain\Files\Actions; use Illuminate\Support\Facades\Storage; - class ProcessImageThumbnailAction { - public function __construct( public GenerateImageThumbnailAction $generateImageThumbnail, ) {} @@ -27,10 +25,8 @@ class ProcessImageThumbnailAction $file, string $userId ): void { - // Create thumbnail from image if (in_array($file->getClientMimeType(), $this->availableFormats)) { - // Make copy of file for the thumbnail generation Storage::disk('local')->copy("files/$userId/{$fileName}", "temp/$userId/{$fileName}"); diff --git a/src/Domain/Files/Actions/UploadFileAction.php b/src/Domain/Files/Actions/UploadFileAction.php index fc67b0a1..5fcc55af 100644 --- a/src/Domain/Files/Actions/UploadFileAction.php +++ b/src/Domain/Files/Actions/UploadFileAction.php @@ -14,12 +14,11 @@ use App\Users\Actions\CheckStorageCapacityAction; class UploadFileAction { public function __construct( - public RecordUploadAction $recordUpload, - public CheckStorageCapacityAction $checkStorageCapacity, - public ProcessImageThumbnailAction $createImageThumbnail, + public RecordUploadAction $recordUpload, + public CheckStorageCapacityAction $checkStorageCapacity, + public ProcessImageThumbnailAction $createImageThumbnail, public MoveFileToExternalStorageAction $moveFileToExternalStorage, - ) { - } + ) {} /** * Upload new file @@ -69,7 +68,6 @@ class UploadFileAction // Check if user has enough space to upload file ($this->checkStorageCapacity)($user_id, $fileSize, $chunkName); - // Move finished file from chunk to file-manager directory $disk_local->move("chunks/$chunkName", "files/$user_id/$fileName"); diff --git a/src/Domain/Trash/Controllers/DumpTrashController.php b/src/Domain/Trash/Controllers/DumpTrashController.php index 1c3071b5..a5cddbdf 100644 --- a/src/Domain/Trash/Controllers/DumpTrashController.php +++ b/src/Domain/Trash/Controllers/DumpTrashController.php @@ -39,16 +39,14 @@ class DumpTrashController extends Controller // Delete thumbnail if exist if ($file->thumbnail) { - collect([ config('vuefilemanager.image_sizes.later'), config('vuefilemanager.image_sizes.immediately'), ])->collapse() ->each(function ($size) use ($file) { - Storage::delete("/files/$file->user_id/{$size['name']}-{$file->basename}"); - }); - } + }); + } // Delete file permanently $file->forceDelete(); diff --git a/src/Support/helpers.php b/src/Support/helpers.php index 1d5610f8..c8e18482 100644 --- a/src/Support/helpers.php +++ b/src/Support/helpers.php @@ -602,10 +602,10 @@ if (! function_exists('get_thumbnail_file_list')) { function get_thumbnail_file_list(string $basename): Collection { return collect([ - config('vuefilemanager.image_sizes.later'), - config('vuefilemanager.image_sizes.immediately'), - ])->collapse() - ->map(fn ($item) => $item['name'] . '-' . $basename); + config('vuefilemanager.image_sizes.later'), + config('vuefilemanager.image_sizes.immediately'), + ])->collapse() + ->map(fn ($item) => $item['name'] . '-' . $basename); } } diff --git a/tests/Domain/Files/FileTest.php b/tests/Domain/Files/FileTest.php index f3a2cabd..141f75ec 100644 --- a/tests/Domain/Files/FileTest.php +++ b/tests/Domain/Files/FileTest.php @@ -59,7 +59,7 @@ class FileTest extends TestCase ]) ->collapse() ->each( - fn($item) => $disk->assertExists( + fn ($item) => $disk->assertExists( "files/{$user->id}/{$item['name']}-{$file->basename}" ) ); diff --git a/tests/Domain/Trash/TrashTest.php b/tests/Domain/Trash/TrashTest.php index 108f25bf..5a0f87a4 100644 --- a/tests/Domain/Trash/TrashTest.php +++ b/tests/Domain/Trash/TrashTest.php @@ -115,11 +115,10 @@ class TrashTest extends TestCase "files/$user->id/fake-image.jpg" ); - foreach($thumbnail_sizes as $size) { + foreach ($thumbnail_sizes as $size) { $disk->assertMissing( "files/$user->id/{$size['name']}-fake-image.jpg" ); } - } }