Finished migration of last angular code

[bookstack] / app / Repos / ImageRepo.php

diff --git a/app/Repos/ImageRepo.php b/app/Repos/ImageRepo.php
index 56b0ba98d141be86ed80a25599b35ba18ac23366..8ddde7b0f9aaa3857b44d937a4065595a35e49de 100644 (file)
--- a/app/Repos/ImageRepo.php
+++ b/app/Repos/ImageRepo.php
@@ -2,7 +2,10 @@
 
 
 use BookStack\Image;
+use BookStack\Page;
 use BookStack\Services\ImageService;
+use BookStack\Services\PermissionService;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Setting;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -11,16 +14,22 @@ class ImageRepo
 
     protected $image;
     protected $imageService;
+    protected $restrictionService;
+    protected $page;
 
     /**
      * ImageRepo constructor.
-     * @param Image        $image
+     * @param Image $image
      * @param ImageService $imageService
+     * @param PermissionService $permissionService
+     * @param Page $page
      */
-    public function __construct(Image $image,ImageService $imageService)
+    public function __construct(Image $image, ImageService $imageService, PermissionService $permissionService, Page $page)
     {
         $this->image = $image;
         $this->imageService = $imageService;
+        $this->restrictionService = $permissionService;
+        $this->page = $page;
     }
 
 
@@ -34,18 +43,18 @@ class ImageRepo
         return $this->image->findOrFail($id);
     }
 
-
     /**
-     * Gets a load images paginated, filtered by image type.
-     * @param string $type
-     * @param int    $page
-     * @param int    $pageSize
+     * 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
      */
-    public function getPaginatedByType($type, $page = 0, $pageSize = 24)
+    private function returnPaginated($query, $page = 0, $pageSize = 24)
     {
-        $images = $this->image->where('type', '=', strtolower($type))
-            ->orderBy('created_at', 'desc')->skip($pageSize * $page)->take($pageSize + 1)->get();
+        $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);
@@ -54,20 +63,79 @@ class ImageRepo
         });
 
         return [
-            'images' => $returnImages,
+            'images'  => $returnImages,
             'hasMore' => $hasMore
         ];
     }
 
+    /**
+     * Gets a load images paginated, filtered by image type.
+     * @param string $type
+     * @param int $page
+     * @param int $pageSize
+     * @param bool|int $userFilter
+     * @return array
+     */
+    public function getPaginatedByType($type, $page = 0, $pageSize = 24, $userFilter = false)
+    {
+        $images = $this->image->where('type', '=', strtolower($type));
+
+        if ($userFilter !== false) {
+            $images = $images->where('created_by', '=', $userFilter);
+        }
+
+        return $this->returnPaginated($images, $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
+     */
+    public function searchPaginatedByType($type, $page = 0, $pageSize = 24, $searchTerm)
+    {
+        $images = $this->image->where('type', '=', strtolower($type))->where('name', 'LIKE', '%' . $searchTerm . '%');
+        return $this->returnPaginated($images, $page, $pageSize);
+    }
+
+    /**
+     * 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
+     * @return array
+     */
+    public function getGalleryFiltered($pagination = 0, $pageSize = 24, $filter, $pageId)
+    {
+        $images = $this->image->where('type', '=', 'gallery');
+
+        $page = $this->page->findOrFail($pageId);
+
+        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);
+        }
+
+        return $this->returnPaginated($images, $pagination, $pageSize);
+    }
+
     /**
      * Save a new image into storage and return the new image.
      * @param UploadedFile $uploadFile
-     * @param  string      $type
+     * @param  string $type
+     * @param int $uploadedTo
      * @return Image
      */
-    public function saveNew(UploadedFile $uploadFile, $type)
+    public function saveNew(UploadedFile $uploadFile, $type, $uploadedTo = 0)
     {
-        $image = $this->imageService->saveNew($this->image, $uploadFile, $type);
+        $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo);
         $this->loadThumbs($image);
         return $image;
     }
@@ -117,14 +185,19 @@ class ImageRepo
      * 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
+     * @param int $width
+     * @param int $height
+     * @param bool $keepRatio
      * @return string
      */
     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 (FileNotFoundException $exception) {
+            $image->delete();
+            return [];
+        }
     }