refactor thumbnails related functions

Author: streamtw

src/LfmItem.php

@@ -153,17 +153,35 @@ public function hasThumb()
             return false;
         }
 
-        if (in_array($this->mimeType(), ['image/gif', 'image/svg+xml'])) {
+        if (!$this->lfm->thumb()->exists()) {
             return false;
         }
 
-        if (!$this->lfm->thumb()->exists()) {
+        return true;
+    }
+
+    public function shouldCreateThumb()
+    {
+        if (!$this->helper->config('should_create_thumbnails')) {
+            return false;
+        }
+
+        if (!$this->isImage()) {
+            return false;
+        }
+
+        if (in_array($this->mimeType(), ['image/gif', 'image/svg+xml'])) {
             return false;
         }
 
         return true;
     }
 
+    public function get()
+    {
+        return $this->lfm->get();
+    }
+
     /**
      * Make file size readable.
      *

src/LfmPath.php

@@ -201,20 +201,20 @@ public function error($error_type, $variables = [])
     public function upload($file)
     {
         $this->uploadValidator($file);
-        $new_filename = $this->getNewName($file);
-        $new_file_path = $this->setName($new_filename)->path('absolute');
+        $new_file_name = $this->getNewName($file);
+        $new_file_path = $this->setName($new_file_name)->path('absolute');
 
         event(new ImageIsUploading($new_file_path));
         try {
-            $new_filename = $this->saveFile($file, $new_filename);
+            $new_file_name = $this->saveFile($file, $new_file_name);
         } catch (\Exception $e) {
             \Log::info($e);
             return $this->error('invalid');
         }
         // TODO should be "FileWasUploaded"
         event(new ImageWasUploaded($new_file_path));
 
-        return $new_filename;
+        return $new_file_name;
     }
 
     private function uploadValidator($file)
@@ -229,9 +229,9 @@ private function uploadValidator($file)
             throw new \Exception('File failed to upload. Error code: ' . $file->getError());
         }
 
-        $new_filename = $this->getNewName($file) . '.' . $file->getClientOriginalExtension();
+        $new_file_name = $this->getNewName($file) . '.' . $file->getClientOriginalExtension();
 
-        if ($this->setName($new_filename)->exists()) {
+        if ($this->setName($new_file_name)->exists()) {
             return $this->error('file-exist');
         }
 
@@ -255,54 +255,48 @@ private function uploadValidator($file)
 
     private function getNewName($file)
     {
-        $new_filename = $this->helper->translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
+        $new_file_name = $this->helper->translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
 
         if (config('lfm.rename_file') === true) {
-            $new_filename = uniqid();
+            $new_file_name = uniqid();
         } elseif (config('lfm.alphanumeric_filename') === true) {
-            $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $new_filename);
+            $new_file_name = preg_replace('/[^A-Za-z0-9\-\']/', '_', $new_file_name);
         }
 
         $extension = $file->getClientOriginalExtension();
 
         if ($extension) {
-            $new_filename .= '.' . $extension;
+            $new_file_name .= '.' . $extension;
         }
 
-        return $new_filename;
+        return $new_file_name;
     }
 
-    private function saveFile($file, $new_filename)
+    private function saveFile($file, $new_file_name)
     {
-        $should_create_thumbnail = $this->shouldCreateThumb($file);
+        $this->setName($new_file_name)->storage->save(file_get_contents($file));
 
-        $this->setName($new_filename)->thumb(false)->storage->save(file_get_contents($file));
+        $this->makeThumbnail($new_file_name);
 
-        if ($should_create_thumbnail) {
-            $this->makeThumbnail($new_filename);
-        }
-
-        return $new_filename;
+        return $new_file_name;
     }
 
-    public function makeThumbnail($filename)
+    public function makeThumbnail($file_name)
     {
+        $original_image = $this->pretty($file_name);
+
+        if (!$original_image->shouldCreateThumb()) {
+            return;
+        }
+
         // create folder for thumbnails
         $this->setName(null)->thumb(true)->createFolder();
 
-        $image_content = $this->thumb(false)->setName($filename)->get();
-
-        // generate cropped thumbnail
-        $image = Image::make($image_content)
+        // generate cropped image content
+        $image_content = Image::make($original_image->get())
             ->fit(config('lfm.thumb_img_width', 200), config('lfm.thumb_img_height', 200))
             ->encode();
 
-        $this->setName($filename)->thumb(true)->storage->save($image);
-    }
-
-    private function shouldCreateThumb($file)
-    {
-        return starts_with($file->getMimeType(), 'image')
-            && !in_array($file->getMimeType(), ['image/gif', 'image/svg+xml']);
+        $this->setName($file_name)->thumb(true)->storage->save($image_content);
     }
 }

src/LfmStorageRepository.php

@@ -54,7 +54,7 @@ public function url($path)
 
     public function makeDirectory()
     {
-        $this->disk->makeDirectory($this->path, ...$arguments);
+        $this->disk->makeDirectory($this->path, ...func_get_args());
 
         $this->disk->setVisibility($this->path, 'public');
     }

src/views/crop.blade.php

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-md-8">
     <div class="crop-container">
-      <img src="{{ $img->path . '?timestamp=' . $img->time }}" class="img img-responsive">
+      <img src="{{ $img->url . '?timestamp=' . $img->time }}" class="img img-responsive">
     </div>
   </div>
   <div class="col-md-4">