webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-11-03 02:13:16 +03:00
Code Activity

Added streamed uploads for attachments

Browse Source
This commit is contained in:
Dan Brown
2022-04-02 18:46:48 +01:00
parent 6749faa89a
commit cb770c534d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/AttachmentController.php
View File

@@ -10,7 +10,6 @@ use BookStack\Uploads\AttachmentService;
use Exception; use Exception;
use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Contracts\Filesystem\FileNotFoundException;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\MessageBag; use Illuminate\Support\MessageBag;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;

5
app/Uploads/AttachmentService.php
View File

@@ -223,8 +223,6 @@ class AttachmentService
*/ */
protected function putFileInStorage(UploadedFile $uploadedFile): string protected function putFileInStorage(UploadedFile $uploadedFile): string
{ {
$attachmentData = file_get_contents($uploadedFile->getRealPath());
$storage = $this->getStorageDisk(); $storage = $this->getStorageDisk();
$basePath = 'uploads/files/' . date('Y-m-M') . '/'; $basePath = 'uploads/files/' . date('Y-m-M') . '/';
@@ -233,10 +231,11 @@ class AttachmentService
$uploadFileName = Str::random(3) . $uploadFileName; $uploadFileName = Str::random(3) . $uploadFileName;
} }
$attachmentStream = fopen($uploadedFile->getRealPath(), 'r');
$attachmentPath = $basePath . $uploadFileName; $attachmentPath = $basePath . $uploadFileName;
try { try {
$storage->put($this->adjustPathForStorageDisk($attachmentPath), $attachmentData); $storage->writeStream($this->adjustPathForStorageDisk($attachmentPath), $attachmentStream);
} catch (Exception $e) { } catch (Exception $e) {
Log::error('Error when attempting file upload:' . $e->getMessage()); Log::error('Error when attempting file upload:' . $e->getMessage());