Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/Libraries/Storage/Drivers/MinioDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,18 @@ public function __construct(string $disk = 'minio')
/**
* Upload a file to MinIO.
*
* @param UploadedFile $file file to upload
* @param string $dirpath destination directory path
* @param UploadedFile $file file to upload
* @param string $dirpath destination directory path
* @param string $filename optionally override file name
*
* @throws RuntimeException when the upload fails
*
* @return StorageResult upload result
*/
public function upload(UploadedFile $file, string $dirpath): StorageResult
public function upload(UploadedFile $file, string $dirpath, string $filename = ''): StorageResult
{
$filename = $file->getClientOriginalName();
$destPath = rtrim($dirpath, '/') . '/' . $filename;
$fileName = $filename === '' ? $file->getClientOriginalName() : $filename;
$destPath = rtrim($dirpath, '/') . '/' . $fileName;

if (!LaravelStorage::disk($this->disk)->put($destPath, $file->getContent())) {
throw new RuntimeException("Failed to upload file to MinIO: {$destPath}");
Expand All @@ -71,7 +72,7 @@ public function upload(UploadedFile $file, string $dirpath): StorageResult
$result->driver = $this->disk === 'minio_brimen'
? StorageManager::MINIO_BRIMEN
: StorageManager::MINIO;
$result->pathFile = $filename;
$result->pathFile = $fileName;
$result->fullPath = $destPath;
$result->folder = rtrim($dirpath, '/') . '/';

Expand Down
15 changes: 8 additions & 7 deletions src/Libraries/Storage/Drivers/NfsDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,26 +68,27 @@ private function resolvePath(string $path): string
/**
* Upload a file to an NFS directory.
*
* @param UploadedFile $file file to upload
* @param string $dirpath destination directory path
* @param UploadedFile $file file to upload
* @param string $dirpath destination directory path
* @param string $filename optionally override file name
*
* @throws RuntimeException when the destination directory cannot be created
*
* @return StorageResult upload result
*/
public function upload(UploadedFile $file, string $dirpath): StorageResult
public function upload(UploadedFile $file, string $dirpath, string $filename = ''): StorageResult
{
if (!is_dir($dirpath) && !mkdir($dirpath, 0755, true)) {
throw new RuntimeException("Failed to create destination directory: {$dirpath}");
}

$filename = $file->getClientOriginalName();
$file->move($dirpath, $filename);
$fileName = $filename === '' ? $file->getClientOriginalName() : $filename;
$file->move($dirpath, $fileName);

$result = new StorageResult();
$result->driver = Storage::NFS;
$result->pathFile = $filename;
$result->fullPath = rtrim($dirpath, '/') . '/' . $filename;
$result->pathFile = $fileName;
$result->fullPath = rtrim($dirpath, '/') . '/' . $fileName;
$result->folder = rtrim($dirpath, '/') . '/';

return $result;
Expand Down
7 changes: 4 additions & 3 deletions src/Libraries/Storage/StorageDriverInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ interface StorageDriverInterface
/**
* Upload a file to the storage driver.
*
* @param UploadedFile $file file to upload
* @param string $dirpath destination directory path
* @param UploadedFile $file file to upload
* @param string $dirpath destination directory path
* @param string $filename optionally override file name
*
* @throws RuntimeException when the upload fails
*
* @return StorageResult upload result
*/
public function upload(UploadedFile $file, string $dirpath): StorageResult;
public function upload(UploadedFile $file, string $dirpath, string $filename = ''): StorageResult;

/**
* Copy a file within the same storage driver.
Expand Down
19 changes: 19 additions & 0 deletions tests/Libraries/Storage/Drivers/MinioDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,25 @@ public function testUploadSuccess(): void
$this->assertEquals('/tmp/dir/test.txt', $result->fullPath);
}

public function testUploadSuccessWithFilenameOverride(): void
{
$diskMock = Mockery::mock();
LaravelStorage::shouldReceive('disk')->with('minio')->andReturn($diskMock);

$diskMock->shouldReceive('put')->with('/tmp/dir/custom.txt', 'content')->once()->andReturn(true);

$fileMock = Mockery::mock(UploadedFile::class);
$fileMock->shouldReceive('getClientOriginalName')->andReturn('test.txt');
$fileMock->shouldReceive('getContent')->andReturn('content');

$driver = new MinioDriver();
$result = $driver->upload($fileMock, '/tmp/dir', 'custom.txt');

$this->assertEquals(StorageManager::MINIO, $result->driver);
$this->assertEquals('custom.txt', $result->pathFile);
$this->assertEquals('/tmp/dir/custom.txt', $result->fullPath);
}

public function testUploadFailure(): void
{
$diskMock = Mockery::mock();
Expand Down
13 changes: 13 additions & 0 deletions tests/Libraries/Storage/Drivers/NfsDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,19 @@ public function testUpload(): void
$this->assertEquals('test.txt', $result->pathFile);
}

public function testUploadWithFilenameOverride(): void
{
$fileMock = Mockery::mock(UploadedFile::class);
$fileMock->shouldReceive('getClientOriginalName')->andReturn('test.txt');
$fileMock->shouldReceive('move')->with($this->tempDir . '/uploads', 'custom.txt')->once();

$driver = new NfsDriver();
$result = $driver->upload($fileMock, $this->tempDir . '/uploads', 'custom.txt');

$this->assertEquals(Storage::NFS, $result->driver);
$this->assertEquals('custom.txt', $result->pathFile);
}

public function testWriteStream(): void
{
$driver = new NfsDriver();
Expand Down
Loading