delete items in file request

This commit is contained in:
Čarodej
2022-02-23 10:05:09 +01:00
parent fdfb5f57d7
commit aef715e061
11 changed files with 331 additions and 30 deletions
@@ -65,10 +65,9 @@ class DeleteFileOrFolderAction
Storage::delete("/files/$file->user_id/$file->basename");
// Delete thumbnail if exist
if ($file->thumbnail) {
Storage::delete(
"/files/$file->user_id/{$file->getRawOriginal('thumbnail')}"
);
if ($file->type === 'image') {
getThumbnailFileList($file->basename)
->each(fn ($thumbnail) => Storage::delete("files/$file->user_id/$thumbnail"));
}
// Delete file permanently
@@ -104,10 +103,9 @@ class DeleteFileOrFolderAction
Storage::delete("/files/$file->user_id/$file->basename");
// Delete thumbnail if exist
if ($file->thumbnail) {
Storage::delete(
"/files/$file->user_id/{$file->getRawOriginal('thumbnail')}"
);
if ($file->type === 'image') {
getThumbnailFileList($file->basename)
->each(fn ($thumbnail) => Storage::delete("files/$file->user_id/$thumbnail"));
}
// Delete file permanently
@@ -53,7 +53,7 @@ class TransferContentOwnershipToTeamFolderOwnerAction
// Move image thumbnails
if ($file->type === 'image') {
// Get image thumbnail list
$thumbnailList = get_thumbnail_file_list($file->basename);
$thumbnailList = getThumbnailFileList($file->basename);
// move thumbnails to the new location
$thumbnailList->each(function ($basename) use ($file, $folder) {
@@ -13,7 +13,7 @@ class DumpTrashController extends Controller
public function __invoke(): Response
{
abort_if(
is_demo_account(auth()->user()->email),
is_demo_account(),
204,
'Done.'
);
@@ -0,0 +1,78 @@
<?php
namespace Domain\UploadRequest\Controllers;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\UploadRequest\Models\UploadRequest;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
class DeleteFileOrFolderController
{
public function __invoke(DeleteItemRequest $request, UploadRequest $uploadRequest)
{
// Check if upload request is active
if ($uploadRequest->status !== 'active') {
return response('Gone', 410);
}
foreach ($request->input('items') as $file) {
// Get file or folder item
$item = get_item($file['type'], $file['id']);
// Delete folder
if ($file['type'] === 'folder') {
$this->destroyFolder($item);
}
// Delete file
if ($file['type'] !== 'folder') {
$this->destroyFile($item);
}
}
return response('Done', 204);
}
private function destroyFile(File $file): void
{
// Delete file
Storage::delete("/files/$file->user_id/$file->basename");
// Delete thumbnail if exist
if ($file->type === 'image') {
getThumbnailFileList($file->basename)
->each(fn ($thumbnail) => Storage::delete("files/$file->user_id/$thumbnail"));
}
// Delete file permanently
$file->forceDelete();
}
private function destroyFolder(Folder $folder): void
{
// Get children files
$files = File::whereIn('parent_id', Arr::flatten([filter_folders_ids($folder->folders), $folder->id]))
->get();
// Remove all children files
foreach ($files as $file) {
// Delete file
Storage::delete("/files/$file->user_id/$file->basename");
// Delete thumbnail if exist
if ($file->type === 'image') {
getThumbnailFileList($file->basename)
->each(fn ($thumbnail) => Storage::delete("files/$file->user_id/$thumbnail"));
}
// Delete file permanently
$file->forceDelete();
}
$folder->forceDelete();
}
}