webapp/bookstack
webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-22 16:23:06 +03:00
Code

Added streaming support to API attachment read responses

Browse Source 
Required some special handling due to the content being base64-encoded
within a JSON response.
This commit is contained in:
Dan Brown 2022-04-02 19:20:59 +01:00
parent cb770c534d
commit 08a8c0070e
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/Api/AttachmentApiController.php
View File

@ -87,14 +87,32 @@ class AttachmentApiController extends ApiController
'markdown' => $attachment->markdownLink(), 'markdown' => $attachment->markdownLink(),
]); ]);
if (!$attachment->external) { // Simply return a JSON response of the attachment for link-based attachments
$attachmentContents = $this->attachmentService->getAttachmentFromStorage($attachment); if ($attachment->external) {
$attachment->setAttribute('content', base64_encode($attachmentContents));
} else {
$attachment->setAttribute('content', $attachment->path); $attachment->setAttribute('content', $attachment->path);
return response()->json($attachment);
} }
return response()->json($attachment); // Build and split our core JSON, at point of content.
$splitter = 'CONTENT_SPLIT_LOCATION_' . time() . '_' . rand(1, 40000);
$attachment->setAttribute('content', $splitter);
$json = $attachment->toJson();
$jsonParts = explode($splitter, $json);
// Get a stream for the file data from storage
$stream = $this->attachmentService->streamAttachmentFromStorage($attachment);
return response()->stream(function () use ($jsonParts, $stream) {
// Output the pre-content JSON data
echo $jsonParts[0];
// Stream out our attachment data as base64 content
stream_filter_append($stream, 'convert.base64-encode', STREAM_FILTER_READ);
fpassthru($stream);
fclose($stream);
// Output our post-content JSON data
echo $jsonParts[1];
}, 200, ['Content-Type' => 'application/json']);
} }
/** /**