Merge branch 'master' into update_japanese_translation

[bookstack] / app / Repos / ImageRepo.php

diff --git a/app/Repos/ImageRepo.php b/app/Repos/ImageRepo.php
index 435b8bbd795666bddc12d1b8e0e687eecb4bcb8b..245c0f27b35e5c8a8af852f7b4c5092300b8dd8b 100644 (file)
--- a/app/Repos/ImageRepo.php
+++ b/app/Repos/ImageRepo.php
@@ -1,11 +1,9 @@
 <?php namespace BookStack\Repos;
 
 <?php namespace BookStack\Repos;
 

-

 use BookStack\Image;
 use BookStack\Page;
 use BookStack\Services\ImageService;
 use BookStack\Services\PermissionService;
 use BookStack\Image;
 use BookStack\Page;
 use BookStack\Services\ImageService;
 use BookStack\Services\PermissionService;

-use Setting;

 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRepo
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRepo


@@ -94,7 +92,7 @@ class ImageRepo
      * @param string $searchTerm
      * @return array
      */
      * @param string $searchTerm
      * @return array
      */

-    public function searchPaginatedByType($type, $page = 0, $pageSize = 24, $searchTerm)
+    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);
     {
         $images = $this->image->where('type', '=', strtolower($type))->where('name', 'LIKE', '%' . $searchTerm . '%');
         return $this->returnPaginated($images, $page, $pageSize);


@@ -103,13 +101,13 @@ class ImageRepo
     /**
      * Get gallery images with a particular filter criteria such as
      * being within the current book or page.
     /**
      * Get gallery images with a particular filter criteria such as
      * being within the current book or page.

-     * @param int $pagination
-     * @param int $pageSize

      * @param $filter
      * @param $pageId
      * @param $filter
      * @param $pageId

+     * @param int $pageNum
+     * @param int $pageSize

      * @return array
      */
      * @return array
      */

-    public function getGalleryFiltered($pagination = 0, $pageSize = 24, $filter, $pageId)
+    public function getGalleryFiltered($filter, $pageId, $pageNum = 0, $pageSize = 24)

     {
         $images = $this->image->where('type', '=', 'gallery');
 
     {
         $images = $this->image->where('type', '=', 'gallery');
 


@@ -122,7 +120,7 @@ class ImageRepo
             $images = $images->whereIn('uploaded_to', $validPageIds);
         }
 
             $images = $images->whereIn('uploaded_to', $validPageIds);
         }
 

-        return $this->returnPaginated($images, $pagination, $pageSize);
+        return $this->returnPaginated($images, $pageNum, $pageSize);

     }
 
     /**
     }
 
     /**


@@ -131,6 +129,8 @@ class ImageRepo
      * @param  string $type
      * @param int $uploadedTo
      * @return Image
      * @param  string $type
      * @param int $uploadedTo
      * @return Image

+     * @throws \BookStack\Exceptions\ImageUploadException
+     * @throws \Exception

      */
     public function saveNew(UploadedFile $uploadFile, $type, $uploadedTo = 0)
     {
      */
     public function saveNew(UploadedFile $uploadFile, $type, $uploadedTo = 0)
     {


@@ -139,11 +139,39 @@ class ImageRepo
         return $image;
     }
 
         return $image;
     }
 

+    /**
+     * Save a drawing the the database;
+     * @param string $base64Uri
+     * @param int $uploadedTo
+     * @return Image
+     * @throws \BookStack\Exceptions\ImageUploadException
+     */
+    public function saveDrawing(string $base64Uri, int $uploadedTo)
+    {
+        $name = 'Drawing-' . user()->getShortName(40) . '-' . strval(time()) . '.png';
+        $image = $this->imageService->saveNewFromBase64Uri($base64Uri, $name, 'drawio', $uploadedTo);
+        return $image;
+    }
+
+    /**
+     * Replace the image content of a drawing.
+     * @param Image $image
+     * @param string $base64Uri
+     * @return Image
+     * @throws \BookStack\Exceptions\ImageUploadException
+     */
+    public function replaceDrawingContent(Image $image, string $base64Uri)
+    {
+        return $this->imageService->replaceImageDataFromBase64Uri($image, $base64Uri);
+    }
+

     /**
      * Update the details of an image via an array of properties.
      * @param Image $image
      * @param array $updateDetails
      * @return Image
     /**
      * 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

      */
     public function updateImageDetails(Image $image, $updateDetails)
     {
      */
     public function updateImageDetails(Image $image, $updateDetails)
     {


@@ -169,6 +197,8 @@ class ImageRepo
     /**
      * Load thumbnails onto an image object.
      * @param Image $image
     /**
      * Load thumbnails onto an image object.
      * @param Image $image

+     * @throws \BookStack\Exceptions\ImageUploadException
+     * @throws \Exception

      */
     private function loadThumbs(Image $image)
     {
      */
     private function loadThumbs(Image $image)
     {


@@ -182,17 +212,45 @@ class ImageRepo
      * 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.
      * 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
      * @param Image $image
      * @param int $width
      * @param int $height
      * @param bool $keepRatio
      * @return string

+     * @throws \BookStack\Exceptions\ImageUploadException
+     * @throws \Exception

      */
     public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
     {
      */
     public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
     {

-        return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
+        try {
+            return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
+        } catch (\Exception $exception) {
+            return null;
+        }

     }
 
     }
 

+    /**
+     * Get the raw image data from an Image.
+     * @param Image $image
+     * @return null|string
+     */
+    public function getImageData(Image $image)
+    {
+        try {
+            return $this->imageService->getImageData($image);
+        } catch (\Exception $exception) {
+            return null;
+        }
+    }

 
 

-}
\ No newline at end of file
+    /**
+     * Check if the provided image type is valid.
+     * @param $type
+     * @return bool
+     */
+    public function isValidType($type)
+    {
+        $validTypes = ['drawing', 'gallery', 'cover', 'system', 'user'];
+        return in_array($type, $validTypes);
+    }
+}