Revamped image system to use driver-agnotstic storage and be more eff…

…icent
rosetta-ai · Dec 7, 2015 · c88096b · c88096b
1 parent 46c905d
commit c88096b
Show file tree

Hide file tree

Showing 12 changed files with 557 additions and 144 deletions.
diff --git a/.env.example b/.env.example
@@ -14,12 +14,23 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
+# Storage
+STORAGE_TYPE=local
+# Amazon S3 Config
+STORAGE_S3_KEY=false
+STORAGE_S3_SECRET=false
+STORAGE_S3_REGION=false
+STORAGE_S3_BUCKET=false
+# Storage URL
+# Used to prefix image urls for when using custom domains/cdns
+STORAGE_URL=false
+
 # Social Authentication information. Defaults as off.
 GITHUB_APP_ID=false
 GITHUB_APP_SECRET=false
 GOOGLE_APP_ID=false
 GOOGLE_APP_SECRET=false
-# URL for social login redirects, NO TRAILING SLASH
+# URL used for social login redirects, NO TRAILING SLASH
 APP_URL=http://bookstack.dev
 
 # Mail settings

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers;
 
+use BookStack\Repos\ImageRepo;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -14,16 +15,19 @@ class ImageController extends Controller
 {
     protected $image;
     protected $file;
+    protected $imageRepo;
 
     /**
      * ImageController constructor.
-     * @param Image $image
-     * @param File  $file
+     * @param Image     $image
+     * @param File      $file
+     * @param ImageRepo $imageRepo
      */
-    public function __construct(Image $image, File $file)
+    public function __construct(Image $image, File $file, ImageRepo $imageRepo)
     {
         $this->image = $image;
         $this->file = $file;
+        $this->imageRepo = $imageRepo;
         parent::__construct();
     }
 
@@ -33,108 +37,31 @@ public function __construct(Image $image, File $file)
      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      */
-    public function getAll($page = 0)
+    public function getAllGallery($page = 0)
     {
-        $pageSize = 30;
-        $images = $this->image->orderBy('created_at', 'desc')
-            ->skip($page * $pageSize)->take($pageSize)->get();
-        foreach ($images as $image) {
-            $this->loadSizes($image);
-        }
-        $hasMore = $this->image->orderBy('created_at', 'desc')
-                ->skip(($page + 1) * $pageSize)->take($pageSize)->count() > 0;
-        return response()->json([
-            'images' => $images,
-            'hasMore' => $hasMore
-        ]);
-    }
-
-    /**
-     * Loads the standard thumbnail sizes for an image.
-     * @param Image $image
-     */
-    private function loadSizes(Image $image)
-    {
-        $image->thumbnail = $this->getThumbnail($image, 150, 150);
-        $image->display = $this->getThumbnail($image, 840, 0, true);
+        $imgData = $this->imageRepo->getAllGallery($page);
+        return response()->json($imgData);
     }
 
-    /**
-     * Get the thumbnail for an image.
-     * If $keepRatio is true only the width will be used.
-     * @param      $image
-     * @param int  $width
-     * @param int  $height
-     * @param bool $keepRatio
-     * @return string
-     */
-    public function getThumbnail($image, $width = 220, $height = 220, $keepRatio = false)
-    {
-        $explodedPath = explode('/', $image->url);
-        $dirPrefix = $keepRatio ? 'scaled-' : 'thumbs-';
-        array_splice($explodedPath, 4, 0, [$dirPrefix . $width . '-' . $height]);
-        $thumbPath = implode('/', $explodedPath);
-        $thumbFilePath = public_path() . $thumbPath;
-
-        // Return the thumbnail url path if already exists
-        if (file_exists($thumbFilePath)) {
-            return $thumbPath;
-        }
-
-        // Otherwise create the thumbnail
-        $thumb = ImageTool::make(public_path() . $image->url);
-        if($keepRatio) {
-            $thumb->resize($width, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            });
-        } else {
-            $thumb->fit($width, $height);
-        }
-
-        // Create thumbnail folder if it does not exist
-        if (!file_exists(dirname($thumbFilePath))) {
-            mkdir(dirname($thumbFilePath), 0775, true);
-        }
-
-        //Save Thumbnail
-        $thumb->save($thumbFilePath);
-        return $thumbPath;
-    }
 
     /**
      * Handles image uploads for use on pages.
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function upload(Request $request)
+    public function uploadGallery(Request $request)
     {
         $this->checkPermission('image-create');
         $this->validate($request, [
             'file' => 'image|mimes:jpeg,gif,png'
         ]);
-        $imageUpload = $request->file('file');
 
-        $name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
-        $storageName = substr(sha1(time()), 0, 10) . '-' . $name;
-        $imagePath = '/uploads/images/' . Date('Y-m-M') . '/';
-        $storagePath = public_path() . $imagePath;
-        $fullPath = $storagePath . $storageName;
-        while (file_exists($fullPath)) {
-            $storageName = substr(sha1(rand()), 0, 3) . $storageName;
-            $fullPath = $storagePath . $storageName;
-        }
-        $imageUpload->move($storagePath, $storageName);
-        // Create and save image object
-        $this->image->name = $name;
-        $this->image->url = $imagePath . $storageName;
-        $this->image->created_by = auth()->user()->id;
-        $this->image->updated_by = auth()->user()->id;
-        $this->image->save();
-        $this->loadSizes($this->image);
-        return response()->json($this->image);
+        $imageUpload = $request->file('file');
+        $image = $this->imageRepo->saveNew($imageUpload, 'gallery');
+        return response()->json($image);
     }
 
+
     /**
      * Update image details
      * @param         $imageId
@@ -147,13 +74,12 @@ public function update($imageId, Request $request)
         $this->validate($request, [
             'name' => 'required|min:2|string'
         ]);
-        $image = $this->image->findOrFail($imageId);
-        $image->fill($request->all());
-        $image->save();
-        $this->loadSizes($image);
-        return response()->json($this->image);
+        $image = $this->imageRepo->getById($imageId);
+        $image = $this->imageRepo->updateImageDetails($image, $request->all());
+        return response()->json($image);
     }
 
+
     /**
      * Deletes an image and all thumbnail/image files
      * @param PageRepo $pageRepo
@@ -164,41 +90,18 @@ public function update($imageId, Request $request)
     public function destroy(PageRepo $pageRepo, Request $request, $id)
     {
         $this->checkPermission('image-delete');
-        $image = $this->image->findOrFail($id);
+        $image = $this->imageRepo->getById($id);
 
         // Check if this image is used on any pages
-        $pageSearch = $pageRepo->searchForImage($image->url);
         $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
-        if ($pageSearch !== false && !$isForced) {
-            return response()->json($pageSearch, 400);
-        }
-
-        // Delete files
-        $folder = public_path() . dirname($image->url);
-        $fileName = basename($image->url);
-
-        // Delete thumbnails
-        foreach (glob($folder . '/*') as $file) {
-            if (is_dir($file)) {
-                $thumbName = $file . '/' . $fileName;
-                if (file_exists($file)) {
-                    unlink($thumbName);
-                }
-                // Remove thumb folder if empty
-                if (count(glob($file . '/*')) === 0) {
-                    rmdir($file);
-                }
+        if (!$isForced) {
+            $pageSearch = $pageRepo->searchForImage($image->url);
+            if ($pageSearch !== false) {
+                return response()->json($pageSearch, 400);
             }
         }
 
-        // Delete file and database entry
-        unlink($folder . '/' . $fileName);
-        $image->delete();
-
-        // Delete parent folder if empty
-        if (count(glob($folder . '/*')) === 0) {
-            rmdir($folder);
-        }
+        $this->imageRepo->destroyImage($image);
         return response()->json('Image Deleted');
     }
 

diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -45,8 +45,6 @@
 
     });
 
-    // Uploads
-    Route::post('/upload/image', 'ImageController@upload');
 
     // Users
     Route::get('/users', 'UserController@index');
@@ -58,10 +56,13 @@
     Route::delete('/users/{id}', 'UserController@destroy');
 
     // Image routes
-    Route::get('/images/all', 'ImageController@getAll');
-    Route::put('/images/update/{imageId}', 'ImageController@update');
-    Route::delete('/images/{imageId}', 'ImageController@destroy');
-    Route::get('/images/all/{page}', 'ImageController@getAll');
+    Route::group(['prefix' => 'images'], function() {
+        Route::get('/gallery/all', 'ImageController@getAllGallery');
+        Route::get('/gallery/all/{page}', 'ImageController@getAllGallery');
+        Route::post('/gallery/upload', 'ImageController@uploadGallery');
+        Route::put('/update/{imageId}', 'ImageController@update');
+        Route::delete('/{imageId}', 'ImageController@destroy');
+    });
 
     // Links
     Route::get('/link/{id}', 'PageController@redirectFromLink');

diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php
@@ -77,6 +77,12 @@ public function getRecentlyViewed($count = 10, $page = 0)
         return Views::getUserRecentlyViewed($count, $page, $this->book);
     }
 
+    /**
+     * Gets the most viewed books.
+     * @param int $count
+     * @param int $page
+     * @return mixed
+     */
     public function getPopular($count = 10, $page = 0)
     {
         return Views::getPopular($count, $page, $this->book);