mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-09-19 11:08:11 +00:00
b2d48d9a7f
- Moved thumnbail loading out of repo into ImageResizer. - Updated gallery and editor image handling to show errors where possible to indicate memory issues for resizing/thumbs. - Updated gallery to load image data in a per-image basis via edit form for more resiliant thumb/data fetching. Data was previously provided via gallery listing, which could be affected by failing generation of other images. - Updated image manager double click handling to be more pleasant and not flash away the edit form. - Updated editor handlers to use main URL when thumbs fail to load.
98 lines
2.9 KiB
PHP
98 lines
2.9 KiB
PHP
<?php
|
|
|
|
namespace BookStack\Uploads\Controllers;
|
|
|
|
use BookStack\Exceptions\ImageUploadException;
|
|
use BookStack\Http\Controller;
|
|
use BookStack\Uploads\ImageRepo;
|
|
use BookStack\Uploads\ImageResizer;
|
|
use BookStack\Util\OutOfMemoryHandler;
|
|
use Exception;
|
|
use Illuminate\Http\Request;
|
|
|
|
class DrawioImageController extends Controller
|
|
{
|
|
public function __construct(
|
|
protected ImageRepo $imageRepo
|
|
) {
|
|
}
|
|
|
|
/**
|
|
* Get a list of gallery images, in a list.
|
|
* Can be paged and filtered by entity.
|
|
*/
|
|
public function list(Request $request, ImageResizer $resizer)
|
|
{
|
|
$page = $request->get('page', 1);
|
|
$searchTerm = $request->get('search', null);
|
|
$uploadedToFilter = $request->get('uploaded_to', null);
|
|
$parentTypeFilter = $request->get('filter_type', null);
|
|
|
|
$imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
|
|
$viewData = [
|
|
'warning' => '',
|
|
'images' => $imgData['images'],
|
|
'hasMore' => $imgData['has_more'],
|
|
];
|
|
|
|
new OutOfMemoryHandler(function () use ($viewData) {
|
|
$viewData['warning'] = trans('errors.image_gallery_thumbnail_memory_limit');
|
|
return response()->view('pages.parts.image-manager-list', $viewData, 200);
|
|
});
|
|
|
|
$resizer->loadGalleryThumbnailsForMany($imgData['images']);
|
|
|
|
return view('pages.parts.image-manager-list', $viewData);
|
|
}
|
|
|
|
/**
|
|
* Store a new gallery image in the system.
|
|
*
|
|
* @throws Exception
|
|
*/
|
|
public function create(Request $request)
|
|
{
|
|
$this->validate($request, [
|
|
'image' => ['required', 'string'],
|
|
'uploaded_to' => ['required', 'integer'],
|
|
]);
|
|
|
|
$this->checkPermission('image-create-all');
|
|
$imageBase64Data = $request->get('image');
|
|
|
|
try {
|
|
$uploadedTo = $request->get('uploaded_to', 0);
|
|
$image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
|
|
} catch (ImageUploadException $e) {
|
|
return response($e->getMessage(), 500);
|
|
}
|
|
|
|
return response()->json($image);
|
|
}
|
|
|
|
/**
|
|
* Get the content of an image based64 encoded.
|
|
*/
|
|
public function getAsBase64($id)
|
|
{
|
|
try {
|
|
$image = $this->imageRepo->getById($id);
|
|
} catch (Exception $exception) {
|
|
return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
|
|
}
|
|
|
|
if ($image->type !== 'drawio' || !userCan('page-view', $image->getPage())) {
|
|
return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
|
|
}
|
|
|
|
$imageData = $this->imageRepo->getImageData($image);
|
|
if (is_null($imageData)) {
|
|
return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
|
|
}
|
|
|
|
return response()->json([
|
|
'content' => base64_encode($imageData),
|
|
]);
|
|
}
|
|
}
|