added routes for zip export

[bookstack] / app / Uploads / ImageRepo.php

diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index 8770402adbdb0abe465a9fb866bedb932bf3cf32..a16b87bd75b43aef966a913ec94c2283989684fa 100644 (file)
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -2,25 +2,21 @@
 
 namespace BookStack\Uploads;
 
 
 namespace BookStack\Uploads;
 

-use BookStack\Auth\Permissions\PermissionApplicator;
-use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;

 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\ImageUploadException;

+use BookStack\Permissions\PermissionApplicator;

 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRepo
 {
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRepo
 {

-    protected ImageService $imageService;
-    protected PermissionApplicator $permissions;
-
-    /**
-     * ImageRepo constructor.
-     */
-    public function __construct(ImageService $imageService, PermissionApplicator $permissions)
-    {
-        $this->imageService = $imageService;
-        $this->permissions = $permissions;
+    public function __construct(
+        protected ImageService $imageService,
+        protected PermissionApplicator $permissions,
+        protected ImageResizer $imageResizer,
+        protected PageQueries $pageQueries,
+    ) {

     }
 
     /**
     }
 
     /**


@@ -35,19 +31,13 @@ class ImageRepo
      * Execute a paginated query, returning in a standard format.
      * Also runs the query through the restriction system.
      */
      * Execute a paginated query, returning in a standard format.
      * Also runs the query through the restriction system.
      */

-    private function returnPaginated($query, $page = 1, $pageSize = 24): array
+    protected function returnPaginated(Builder $query, int $page = 1, int $pageSize = 24): array

     {
         $images = $query->orderBy('created_at', 'desc')->skip($pageSize * ($page - 1))->take($pageSize + 1)->get();
     {
         $images = $query->orderBy('created_at', 'desc')->skip($pageSize * ($page - 1))->take($pageSize + 1)->get();

-        $hasMore = count($images) > $pageSize;
-
-        $returnImages = $images->take($pageSize);
-        $returnImages->each(function (Image $image) {
-            $this->loadThumbs($image);
-        });

 
         return [
 
         return [

-            'images'   => $returnImages,
-            'has_more' => $hasMore,
+            'images'   => $images->take($pageSize),
+            'has_more' => count($images) > $pageSize,

         ];
     }
 
         ];
     }
 


@@ -59,9 +49,9 @@ class ImageRepo
         string $type,
         int $page = 0,
         int $pageSize = 24,
         string $type,
         int $page = 0,
         int $pageSize = 24,

-        int $uploadedTo = null,
-        string $search = null,
-        callable $whereClause = null
+        ?int $uploadedTo = null,
+        ?string $search = null,
+        ?callable $whereClause = null

     ): array {
         $imageQuery = Image::query()->where('type', '=', strtolower($type));
 
     ): array {
         $imageQuery = Image::query()->where('type', '=', strtolower($type));
 


@@ -88,21 +78,20 @@ class ImageRepo
      */
     public function getEntityFiltered(
         string $type,
      */
     public function getEntityFiltered(
         string $type,

-        string $filterType = null,
-        int $page = 0,
-        int $pageSize = 24,
-        int $uploadedTo = null,
-        string $search = null
+        ?string $filterType,
+        int $page,
+        int $pageSize,
+        int $uploadedTo,
+        ?string $search

     ): array {
     ): array {

-        /** @var Page $contextPage */
-        $contextPage = Page::visible()->findOrFail($uploadedTo);
+        $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);
         $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') {
+                } else if ($filterType === 'book') {

                     $validPageIds = $contextPage->book->pages()
                         ->scopes('visible')
                         ->pluck('id')
                     $validPageIds = $contextPage->book->pages()
                         ->scopes('visible')
                         ->pluck('id')


@@ -120,10 +109,19 @@ class ImageRepo
      *
      * @throws ImageUploadException
      */
      *
      * @throws ImageUploadException
      */

-    public function saveNew(UploadedFile $uploadFile, string $type, int $uploadedTo = 0, int $resizeWidth = null, int $resizeHeight = null, bool $keepRatio = true): Image
-    {
+    public function saveNew(
+        UploadedFile $uploadFile,
+        string $type,
+        int $uploadedTo = 0,
+        ?int $resizeWidth = null,
+        ?int $resizeHeight = null,
+        bool $keepRatio = true
+    ): Image {

         $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio);
         $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio);

-        $this->loadThumbs($image);
+
+        if ($type !== 'system') {
+            $this->imageResizer->loadGalleryThumbnailsForImage($image, true);
+        }

 
         return $image;
     }
 
         return $image;
     }


@@ -136,7 +134,7 @@ class ImageRepo
     public function saveNewFromData(string $imageName, string $imageData, string $type, int $uploadedTo = 0): Image
     {
         $image = $this->imageService->saveNew($imageName, $imageData, $type, $uploadedTo);
     public function saveNewFromData(string $imageName, string $imageData, string $type, int $uploadedTo = 0): Image
     {
         $image = $this->imageService->saveNew($imageName, $imageData, $type, $uploadedTo);

-        $this->loadThumbs($image);
+        $this->imageResizer->loadGalleryThumbnailsForImage($image, true);

 
         return $image;
     }
 
         return $image;
     }


@@ -161,59 +159,58 @@ class ImageRepo
     public function updateImageDetails(Image $image, $updateDetails): Image
     {
         $image->fill($updateDetails);
     public function updateImageDetails(Image $image, $updateDetails): Image
     {
         $image->fill($updateDetails);

+        $image->updated_by = user()->id;

         $image->save();
         $image->save();

-        $this->loadThumbs($image);
+        $this->imageResizer->loadGalleryThumbnailsForImage($image, false);

 
         return $image;
     }
 
     /**
 
         return $image;
     }
 
     /**

-     * Destroys an Image object along with its revisions, files and thumbnails.
-     *
-     * @throws Exception
+     * Update the image file of an existing image in the system.
+     * @throws ImageUploadException

      */
      */

-    public function destroyImage(Image $image = null): void
+    public function updateImageFile(Image $image, UploadedFile $file): void

     {
     {

-        if ($image) {
-            $this->imageService->destroy($image);
+        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);

     }
 
     /**
     }
 
     /**

-     * Destroy all images of a certain type.
+     * Destroys an Image object along with its revisions, files and thumbnails.

      *
      * @throws Exception
      */
      *
      * @throws Exception
      */

-    public function destroyByType(string $imageType): void
+    public function destroyImage(?Image $image = null): void

     {
     {

-        $images = Image::query()->where('type', '=', $imageType)->get();
-        foreach ($images as $image) {
-            $this->destroyImage($image);
+        if ($image) {
+            $this->imageService->destroy($image);

         }
     }
 
     /**
         }
     }
 
     /**

-     * Load thumbnails onto an image object.
+     * Destroy images that have a specific URL and type combination.
+     *
+     * @throws Exception

      */
      */

-    public function loadThumbs(Image $image): void
+    public function destroyByUrlAndType(string $url, string $imageType): void

     {
     {

-        $image->setAttribute('thumbs', [
-            'gallery' => $this->getThumbnail($image, 150, 150, false),
-            'display' => $this->getThumbnail($image, 1680, null, true),
-        ]);
-    }
+        $images = Image::query()
+            ->where('url', '=', $url)
+            ->where('type', '=', $imageType)
+            ->get();

 
 

-    /**
-     * 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.
-     */
-    protected function getThumbnail(Image $image, ?int $width, ?int $height, bool $keepRatio): ?string
-    {
-        try {
-            return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
-        } catch (Exception $exception) {
-            return null;
+        foreach ($images as $image) {
+            $this->destroyImage($image);

         }
     }
 
         }
     }
 


@@ -234,9 +231,9 @@ class ImageRepo
      */
     public function getPagesUsingImage(Image $image): array
     {
      */
     public function getPagesUsingImage(Image $image): array
     {

-        $pages = Page::visible()
+        $pages = $this->pageQueries->visibleForList()

             ->where('html', 'like', '%' . $image->url . '%')
             ->where('html', 'like', '%' . $image->url . '%')

-            ->get(['id', 'name', 'slug', 'book_id']);
+            ->get();

 
         foreach ($pages as $page) {
             $page->setAttribute('url', $page->getUrl());
 
         foreach ($pages as $page) {
             $page->setAttribute('url', $page->getUrl());