-<?php namespace BookStack\Uploads;
+<?php
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Entities\Page;
+namespace BookStack\Uploads;
+
+use BookStack\Entities\Queries\PageQueries;
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Permissions\PermissionApplicator;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class ImageRepo
{
-
- protected $image;
- protected $imageService;
- protected $restrictionService;
- protected $page;
-
- /**
- * ImageRepo constructor.
- * @param Image $image
- * @param ImageService $imageService
- * @param \BookStack\Auth\\BookStack\Auth\Permissions\PermissionService $permissionService
- * @param \BookStack\Entities\Page $page
- */
- public function __construct(Image $image, ImageService $imageService, PermissionService $permissionService, Page $page)
- {
- $this->image = $image;
- $this->imageService = $imageService;
- $this->restrictionService = $permissionService;
- $this->page = $page;
+ public function __construct(
+ protected ImageService $imageService,
+ protected PermissionApplicator $permissions,
+ protected ImageResizer $imageResizer,
+ protected PageQueries $pageQueries,
+ ) {
}
-
/**
* Get an image with the given id.
- * @param $id
- * @return mixed
*/
- public function getById($id)
+ public function getById($id): Image
{
- return $this->image->findOrFail($id);
+ return Image::query()->findOrFail($id);
}
/**
* Execute a paginated query, returning in a standard format.
* Also runs the query through the restriction system.
- * @param $query
- * @param int $page
- * @param int $pageSize
- * @return array
*/
- private function returnPaginated($query, $page = 0, $pageSize = 24)
+ protected function returnPaginated(Builder $query, int $page = 1, int $pageSize = 24): array
{
- $images = $this->restrictionService->filterRelatedPages($query, 'images', 'uploaded_to');
- $images = $images->orderBy('created_at', 'desc')->skip($pageSize * $page)->take($pageSize + 1)->get();
- $hasMore = count($images) > $pageSize;
-
- $returnImages = $images->take(24);
- $returnImages->each(function ($image) {
- $this->loadThumbs($image);
- });
+ $images = $query->orderBy('created_at', 'desc')->skip($pageSize * ($page - 1))->take($pageSize + 1)->get();
return [
- 'images' => $returnImages,
- 'hasMore' => $hasMore
+ 'images' => $images->take($pageSize),
+ 'has_more' => count($images) > $pageSize,
];
}
/**
- * Gets a load images paginated, filtered by image type.
- * @param string $type
- * @param int $page
- * @param int $pageSize
- * @param bool|int $userFilter
- * @return array
+ * Fetch a list of images in a paginated format, filtered by image type.
+ * Can be filtered by uploaded to and also by name.
*/
- public function getPaginatedByType($type, $page = 0, $pageSize = 24, $userFilter = false)
- {
- $images = $this->image->where('type', '=', strtolower($type));
+ public function getPaginatedByType(
+ string $type,
+ int $page = 0,
+ int $pageSize = 24,
+ int $uploadedTo = null,
+ string $search = null,
+ callable $whereClause = null
+ ): array {
+ $imageQuery = Image::query()->where('type', '=', strtolower($type));
+
+ if ($uploadedTo !== null) {
+ $imageQuery = $imageQuery->where('uploaded_to', '=', $uploadedTo);
+ }
- if ($userFilter !== false) {
- $images = $images->where('created_by', '=', $userFilter);
+ if ($search !== null) {
+ $imageQuery = $imageQuery->where('name', 'LIKE', '%' . $search . '%');
}
- return $this->returnPaginated($images, $page, $pageSize);
+ // Filter by page access
+ $imageQuery = $this->permissions->restrictPageRelationQuery($imageQuery, 'images', 'uploaded_to');
+
+ if ($whereClause !== null) {
+ $imageQuery = $imageQuery->where($whereClause);
+ }
+
+ return $this->returnPaginated($imageQuery, $page, $pageSize);
}
/**
- * Search for images by query, of a particular type.
- * @param string $type
- * @param int $page
- * @param int $pageSize
- * @param string $searchTerm
- * @return array
+ * Get paginated gallery images within a specific page or book.
*/
- public function searchPaginatedByType($type, $searchTerm, $page = 0, $pageSize = 24)
- {
- $images = $this->image->where('type', '=', strtolower($type))->where('name', 'LIKE', '%' . $searchTerm . '%');
- return $this->returnPaginated($images, $page, $pageSize);
+ public function getEntityFiltered(
+ string $type,
+ ?string $filterType,
+ int $page,
+ int $pageSize,
+ int $uploadedTo,
+ ?string $search
+ ): array {
+ $contextPage = $this->pageQueries->findVisibleByIdOrFail($uploadedTo);
+ $parentFilter = null;
+
+ if ($filterType === 'book' || $filterType === 'page') {
+ $parentFilter = function (Builder $query) use ($filterType, $contextPage) {
+ if ($filterType === 'page') {
+ $query->where('uploaded_to', '=', $contextPage->id);
+ } elseif ($filterType === 'book') {
+ $validPageIds = $contextPage->book->pages()
+ ->scopes('visible')
+ ->pluck('id')
+ ->toArray();
+ $query->whereIn('uploaded_to', $validPageIds);
+ }
+ };
+ }
+
+ return $this->getPaginatedByType($type, $page, $pageSize, null, $search, $parentFilter);
}
/**
- * Get gallery images with a particular filter criteria such as
- * being within the current book or page.
- * @param $filter
- * @param $pageId
- * @param int $pageNum
- * @param int $pageSize
- * @return array
+ * Save a new image into storage and return the new image.
+ *
+ * @throws ImageUploadException
*/
- public function getGalleryFiltered($filter, $pageId, $pageNum = 0, $pageSize = 24)
+ public function saveNew(UploadedFile $uploadFile, string $type, int $uploadedTo = 0, int $resizeWidth = null, int $resizeHeight = null, bool $keepRatio = true): Image
{
- $images = $this->image->where('type', '=', 'gallery');
-
- $page = $this->page->findOrFail($pageId);
+ $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio);
- if ($filter === 'page') {
- $images = $images->where('uploaded_to', '=', $page->id);
- } elseif ($filter === 'book') {
- $validPageIds = $page->book->pages->pluck('id')->toArray();
- $images = $images->whereIn('uploaded_to', $validPageIds);
+ if ($type !== 'system') {
+ $this->imageResizer->loadGalleryThumbnailsForImage($image, true);
}
- return $this->returnPaginated($images, $pageNum, $pageSize);
+ return $image;
}
/**
- * Save a new image into storage and return the new image.
- * @param UploadedFile $uploadFile
- * @param string $type
- * @param int $uploadedTo
- * @return Image
- * @throws \BookStack\Exceptions\ImageUploadException
- * @throws \Exception
+ * Save a new image from an existing image data string.
+ *
+ * @throws ImageUploadException
*/
- public function saveNew(UploadedFile $uploadFile, $type, $uploadedTo = 0)
+ public function saveNewFromData(string $imageName, string $imageData, string $type, int $uploadedTo = 0): Image
{
- $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo);
- $this->loadThumbs($image);
+ $image = $this->imageService->saveNew($imageName, $imageData, $type, $uploadedTo);
+ $this->imageResizer->loadGalleryThumbnailsForImage($image, true);
+
return $image;
}
/**
- * Save a drawing the the database;
- * @param string $base64Uri
- * @param int $uploadedTo
- * @return Image
- * @throws \BookStack\Exceptions\ImageUploadException
+ * Save a drawing in the database.
+ *
+ * @throws ImageUploadException
*/
- public function saveDrawing(string $base64Uri, int $uploadedTo)
+ public function saveDrawing(string $base64Uri, int $uploadedTo): Image
{
- $name = 'Drawing-' . user()->getShortName(40) . '-' . strval(time()) . '.png';
- $image = $this->imageService->saveNewFromBase64Uri($base64Uri, $name, 'drawio', $uploadedTo);
- return $image;
- }
+ $name = 'Drawing-' . user()->id . '-' . time() . '.png';
+ return $this->imageService->saveNewFromBase64Uri($base64Uri, $name, 'drawio', $uploadedTo);
+ }
/**
* Update the details of an image via an array of properties.
- * @param Image $image
- * @param array $updateDetails
- * @return Image
- * @throws \BookStack\Exceptions\ImageUploadException
- * @throws \Exception
+ *
+ * @throws Exception
*/
- public function updateImageDetails(Image $image, $updateDetails)
+ public function updateImageDetails(Image $image, $updateDetails): Image
{
$image->fill($updateDetails);
+ $image->updated_by = user()->id;
$image->save();
- $this->loadThumbs($image);
+ $this->imageResizer->loadGalleryThumbnailsForImage($image, false);
+
return $image;
}
-
/**
- * Destroys an Image object along with its revisions, files and thumbnails.
- * @param Image $image
- * @return bool
- * @throws \Exception
+ * Update the image file of an existing image in the system.
+ * @throws ImageUploadException
*/
- public function destroyImage(Image $image)
+ public function updateImageFile(Image $image, UploadedFile $file): void
{
- $this->imageService->destroy($image);
- return true;
- }
+ if (strtolower($file->getClientOriginalExtension()) !== strtolower(pathinfo($image->path, PATHINFO_EXTENSION))) {
+ throw new ImageUploadException(trans('errors.image_upload_replace_type'));
+ }
+
+ $image->refresh();
+ $image->updated_by = user()->id;
+ $image->touch();
+ $image->save();
+ $this->imageService->replaceExistingFromUpload($image->path, $image->type, $file);
+ $this->imageResizer->loadGalleryThumbnailsForImage($image, true);
+ }
/**
- * Load thumbnails onto an image object.
- * @param Image $image
- * @throws \BookStack\Exceptions\ImageUploadException
- * @throws \Exception
+ * Destroys an Image object along with its revisions, files and thumbnails.
+ *
+ * @throws Exception
*/
- protected function loadThumbs(Image $image)
+ public function destroyImage(Image $image = null): void
{
- $image->thumbs = [
- 'gallery' => $this->getThumbnail($image, 150, 150),
- 'display' => $this->getThumbnail($image, 840, 0, true)
- ];
+ if ($image) {
+ $this->imageService->destroy($image);
+ }
}
/**
- * Get the thumbnail for an image.
- * If $keepRatio is true only the width will be used.
- * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
- * @param Image $image
- * @param int $width
- * @param int $height
- * @param bool $keepRatio
- * @return string
- * @throws \BookStack\Exceptions\ImageUploadException
- * @throws \Exception
+ * Destroy images that have a specific URL and type combination.
+ *
+ * @throws Exception
*/
- public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
+ public function destroyByUrlAndType(string $url, string $imageType): void
{
- try {
- return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
- } catch (\Exception $exception) {
- return null;
+ $images = Image::query()
+ ->where('url', '=', $url)
+ ->where('type', '=', $imageType)
+ ->get();
+
+ foreach ($images as $image) {
+ $this->destroyImage($image);
}
}
/**
* Get the raw image data from an Image.
- * @param Image $image
- * @return null|string
*/
- public function getImageData(Image $image)
+ public function getImageData(Image $image): ?string
{
try {
return $this->imageService->getImageData($image);
- } catch (\Exception $exception) {
+ } catch (Exception $exception) {
return null;
}
}
/**
- * Check if the provided image type is valid.
- * @param $type
- * @return bool
+ * Get the user visible pages using the given image.
*/
- public function isValidType($type)
+ public function getPagesUsingImage(Image $image): array
{
- $validTypes = ['gallery', 'cover', 'system', 'user'];
- return in_array($type, $validTypes);
+ $pages = $this->pageQueries->visibleForList()
+ ->where('html', 'like', '%' . $image->url . '%')
+ ->get();
+
+ foreach ($pages as $page) {
+ $page->setAttribute('url', $page->getUrl());
+ }
+
+ return $pages->all();
}
}
projects / bookstack / blobdiff