Refactoring

Author: mafftor

src/Controllers/CropController.php

@@ -24,18 +24,15 @@ public function getCrop()
 
     /**
      * Crop the image (called via ajax).
+     *
+     * @param bool $overWrite
      */
     public function getCropimage($overWrite = true)
     {
         $image_name = request('img');
+        $target_name = $image_name;
         $image_path = $this->lfm->setName($image_name)->path('absolute');
 
-        if (! $overWrite) {
-            $fileParts = explode('.', $image_name);
-            $fileParts[count($fileParts) - 2] = $fileParts[count($fileParts) - 2] . '_cropped_' . time();
-            $crop_name = implode('.', $fileParts);
-        }
-
         event(new ImageIsCropping($image_path));
 
         $crop_info = request()->only('dataWidth', 'dataHeight', 'dataX', 'dataY');
@@ -46,19 +43,24 @@ public function getCropimage($overWrite = true)
             ->stream()
             ->detach();
 
-        if (! $overWrite) {
-            $this->lfm->setName($crop_name)->storage->put($croppedImage);
-            // make new thumbnail
-            $this->lfm->makeThumbnail($crop_name);
-        } else {
-            $this->lfm->setName($image_name)->storage->put($croppedImage);
-            // make new thumbnail
-            $this->lfm->makeThumbnail($image_name);
+        // Overwrite
+        if (!$overWrite) {
+            $fileParts = explode('.', $image_name);
+            $fileParts[count($fileParts) - 2] = $fileParts[count($fileParts) - 2] . '_cropped_' . time();
+            $target_name = implode('.', $fileParts);
         }
 
+        // Replace or create new image
+        $this->lfm->setName($target_name)->storage->put($croppedImage, 'public');
+        // make new thumbnail
+        $this->lfm->makeThumbnail($target_name);
+
         event(new ImageWasCropped($image_path));
     }
 
+    /**
+     * Crop the image (called via ajax).
+     */
     public function getNewCropimage()
     {
         $this->getCropimage(false);

src/Controllers/ResizeController.php

@@ -9,7 +9,7 @@
 class ResizeController extends LfmController
 {
     /**
-     * Dipsplay image for resizing.
+     * Display image for resizing.
      *
      * @return mixed
      */
@@ -52,14 +52,25 @@ public function getResize()
             ->with('ratio', $ratio);
     }
 
+    /**
+     * Perform resize
+     *
+     * @return string
+     */
     public function performResize()
     {
         $image_name = request('img');
         $image_path = $this->lfm->setName($image_name)->path('absolute');
 
         event(new ImageIsResizing($image_path));
-        $resizedImage = Image::make($this->lfm->setName($image_name)->storage->get())->resize(request('dataWidth'), request('dataHeight'))->stream()->detach();
-        $this->lfm->setName($image_name)->storage->put($resizedImage);
+
+        $image = $this->lfm->setName($image_name)->storage->get();
+        $resizedImage = Image::make($image)->resize(request('dataWidth'), request('dataHeight'))
+            ->stream()
+            ->detach();
+
+        // Same new image
+        $this->lfm->setName($image_name)->storage->put($resizedImage, 'public');
         // make new thumbnail
         $this->lfm->makeThumbnail($image_name);