nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-22 21:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

- S3 storages compatibility with v2

Browse Source 
- user profile fixes
This commit is contained in:
Peter Papp
2021-04-06 18:01:59 +02:00
parent e40ddbec14
commit bf9581173c
39 changed files with 124 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/FileManagerService.php
+24 -25
View File
@@ -52,13 +52,14 @@ class FileManagerService
// Move file to local storage from external storage service
if (!is_storage_driver('local')) {
$files->each(function ($file) use ($disk_local) {
foreach ($files as $file) {
try {
$disk_local->put("temp/$file->basename", Storage::get("files/$file->user_id/$file->basename"));
$disk_local->put("temp/{$file['basename']}", Storage::get("files/$requested_folder->user_id/{$file['basename']}"));
} catch (FileNotFoundException $e) {
throw new HttpException(404, 'File not found');
}
});
}
}
// Get zip path
@@ -67,17 +68,16 @@ class FileManagerService
// Create zip
$zip = Madzipper::make($disk_local->path("zip/$zip_name"));
// Get files folder on local storage drive
$directory = is_storage_driver('local') ? 'files' : 'temp';
// Add files to zip
foreach ($files as $file) {
$file_path = is_storage_driver('local')
? $disk_local->path("files/$requested_folder->user_id/{$file['basename']}")
: $disk_local->path("temp/{$file['basename']}");
$zip
->folder($file['folder_path'])
->addString(
"{$file['name']}.{$file['mimetype']}",
File::get($disk_local->path("/$directory/$requested_folder->user_id/{$file['basename']}"))
);
->addString("{$file['name']}.{$file['mimetype']}", File::get($file_path));
}
// Close zip
@@ -114,6 +114,7 @@ class FileManagerService
// Move file to local storage from external storage service
if (!is_storage_driver('local')) {
$files->each(function ($file) use ($disk_local) {
try {
$disk_local->put("temp/$file->basename", Storage::get("files/$file->user_id/$file->basename"));
@@ -129,14 +130,14 @@ class FileManagerService
// Create zip
$zip = Madzipper::make($disk_local->path("zip/$zip_name"));
// Get files folder on local storage drive
$directory = is_storage_driver('local') ? 'files' : 'temp';
// Add files to zip
$files->each(function ($file) use ($zip, $directory, $disk_local) {
$zip->addString(
"$file->name.$file->mimetype",
File::get($disk_local->path("/$directory/$file->user_id/$file->basename")));
$files->each(function ($file) use ($zip, $disk_local) {
$file_path = is_storage_driver('local')
? $disk_local->path("files/$file->user_id/$file->basename")
: $disk_local->path("temp/$file->basename");
$zip->addString("$file->name.$file->mimetype", File::get($file_path));
});
// Close zip
@@ -388,27 +389,25 @@ class FileManagerService
$disk_local = Storage::disk('local');
// Get user data
$user_id = $shared ? $shared->user_id : Auth::id();
$user_id = $shared->user_id ?? Auth::id();
// File Info
$file_size = $disk_local->size('chunks/' . $temp_filename);
$file_size = $disk_local->size("chunks/$temp_filename");
$file_mimetype = $disk_local->mimeType('chunks/' . $temp_filename);
$file_mimetype = $disk_local->mimeType("chunks/$temp_filename");
// Check if user has enough space to upload file
$this->helper->check_user_storage_capacity($user_id, $file_size, $temp_filename);
// Create thumbnail
$thumbnail = $this->helper->create_image_thumbnail('chunks/' . $temp_filename, $disk_file_name, $user_id);
$thumbnail = $this->helper->create_image_thumbnail("chunks/$temp_filename", $disk_file_name, $user_id);
// Move finished file from chunk to file-manager directory
$disk_local->move('chunks/' . $temp_filename, "files/$user_id/$disk_file_name");
$disk_local->move("chunks/$temp_filename", "files/$user_id/$disk_file_name");
// Move files to external storage
if (!is_storage_driver(['local'])) {
// Move file to external storage service
$this->helper->move_file_to_external_storage($disk_file_name, $thumbnail);
$this->helper->move_file_to_external_storage($disk_file_name, $user_id);
}
// Store user upload size
app/Services/HelperService.php
+40 -48
View File
@@ -120,66 +120,60 @@ class HelperService
/**
* Move file to external storage if is set
*
* @param string $filename
* @param string|null $thumbnail
* @param string $file
* @param string $user_id
*/
function move_file_to_external_storage($filename, $thumbnail = null): void
function move_file_to_external_storage($file, $user_id): void
{
$disk_local = Storage::disk('local');
foreach ([$filename, $thumbnail] as $file) {
// Get file size
$filesize = $disk_local->size("files/$user_id/$file");
// Check if file exist
if (!$file) continue;
// If file is bigger than 5.2MB then run multipart upload
if ($filesize > 5242880) {
// Get file size
$filesize = $disk_local->size('files/' . $file);
// Get driver
$driver = \Storage::getDriver();
// If file is bigger than 5.2MB then run multipart upload
if ($filesize > 5242880) {
// Get adapter
$adapter = $driver->getAdapter();
// Get driver
$driver = \Storage::getDriver();
// Get client
$client = $adapter->getClient();
// Get adapter
$adapter = $driver->getAdapter();
// Prepare the upload parameters.
// TODO: replace local files with temp folder
$uploader = new MultipartUploader($client, config('filesystems.disks.local.root') . "/files/$user_id/$file", [
'bucket' => $adapter->getBucket(),
'key' => "/files/$user_id/$file"
]);
// Get client
$client = $adapter->getClient();
try {
// Prepare the upload parameters.
// TODO: replace local files with temp folder
$uploader = new MultipartUploader($client, config('filesystems.disks.local.root') . '/files/' . $file, [
'bucket' => $adapter->getBucket(),
'key' => 'files/' . $file
]);
// Upload content
$uploader->upload();
try {
} catch (MultipartUploadException $e) {
// Upload content
$uploader->upload();
// Write error log
Log::error($e->getMessage());
} catch (MultipartUploadException $e) {
// Delete file after error
$disk_local->delete("/files/$user_id/$file");
// Write error log
Log::error($e->getMessage());
// Delete file after error
$disk_local->delete('files/' . $file);
throw new HttpException(409, $e->getMessage());
}
} else {
// Stream file object to s3
// TODO: replace local files with temp folder
Storage::putFileAs('files', config('filesystems.disks.local.root') . '/files/' . $file, $file, 'private');
throw new HttpException(409, $e->getMessage());
}
// Delete file after upload
$disk_local->delete('files/' . $file);
} else {
// Stream file object to s3
// TODO: replace local files with temp folder
Storage::putFileAs("files/$user_id", config('filesystems.disks.local.root') . "/files/$user_id/$file", $file, "private");
}
// Delete file after upload
$disk_local->delete("/files/$user_id/$file");
}
/**
@@ -192,16 +186,14 @@ class HelperService
*/
function create_image_thumbnail($file_path, $filename, $user_id)
{
$local_disk = Storage::disk('local');
// Create thumbnail from image
if (in_array($local_disk->mimeType($file_path), ['image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'])) {
if (in_array(Storage::disk('local')->mimeType($file_path), ['image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'])) {
// Get thumbnail name
$thumbnail = "thumbnail-$filename";
// Create intervention image
$image = Image::make($local_disk->path($file_path))
$image = Image::make(Storage::disk('local')->path($file_path))
->orientate();
// Resize image
@@ -210,11 +202,11 @@ class HelperService
})->stream();
// Store thumbnail to disk
$local_disk->put("files/$user_id/$thumbnail", $image);
Storage::put("files/$user_id/$thumbnail", $image);
}
// Return thumbnail as svg file
if ($local_disk->mimeType($file_path) === 'image/svg+xml') {
if (Storage::disk('local')->mimeType($file_path) === 'image/svg+xml') {
$thumbnail = $filename;
}