X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/9969698783e3ae3b449134ece67debf8724266e7..refs/pull/59/head:/app/Http/Controllers/ImageController.php diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index fd7901570..3fff28d3b 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -2,6 +2,8 @@ namespace BookStack\Http\Controllers; +use BookStack\Exceptions\ImageUploadException; +use BookStack\Repos\ImageRepo; use Illuminate\Filesystem\Filesystem as File; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -14,125 +16,84 @@ 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(); } /** - * Get all images, Paginated + * Get all images for a specific type, Paginated * @param int $page * @return \Illuminate\Http\JsonResponse */ - public function getAll($page = 0) + public function getAllByType($type, $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 - ]); + $imgData = $this->imageRepo->getPaginatedByType($type, $page); + return response()->json($imgData); } /** - * Loads the standard thumbnail sizes for an image. - * @param Image $image + * Get all images for a user. + * @param int $page + * @return \Illuminate\Http\JsonResponse */ - private function loadSizes(Image $image) + public function getAllForUserType($page = 0) { - $image->thumbnail = $this->getThumbnail($image, 150, 150); - $image->display = $this->getThumbnail($image, 840, 0, true); + $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id); + 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 string $type * @param Request $request * @return \Illuminate\Http\JsonResponse */ - public function upload(Request $request) + public function uploadByType($type, 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; + try { + $image = $this->imageRepo->saveNew($imageUpload, $type); + } catch (ImageUploadException $e) { + return response($e->getMessage(), 500); } - $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); + + return response()->json($image); + } + + /** + * Generate a sized thumbnail for an image. + * @param $id + * @param $width + * @param $height + * @param $crop + * @return \Illuminate\Http\JsonResponse + */ + public function getThumbnail($id, $width, $height, $crop) + { + $this->checkPermission('image-create'); + $image = $this->imageRepo->getById($id); + $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false'); + return response()->json(['url' => $thumbnailUrl]); } /** @@ -147,13 +108,12 @@ class ImageController extends Controller $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 +124,18 @@ class ImageController extends Controller 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'); }