add and apply fileIsImage() in controllers

Author: streamtw

src/controllers/DeleteController.php

@@ -42,12 +42,12 @@ public function getDelete()
             return $this->success_response;
         }
 
-        File::delete($file_to_delete);
-
-        if ($this->isProcessingImages()) {
+        if ($this->fileIsImage($file_to_delete)) {
             File::delete($thumb_to_delete);
         }
 
+        File::delete($file_to_delete);
+
         event(new ImageWasDeleted($file_to_delete));
 
         return $this->success_response;

src/controllers/ItemsController.php

@@ -34,7 +34,7 @@ private function getFilesWithInfo($path)
             $file_created = filemtime($file);
             $file_size = $this->humanFilesize(File::size($file));
 
-            if ($this->isProcessingImages()) {
+            if ($this->fileIsImage($file)) {
                 $file_type = File::mimeType($file);
                 $icon = 'fa-image';
             } else {

src/controllers/RenameController.php

@@ -55,12 +55,12 @@ public function getRename()
             return $this->success_response;
         }
 
-        File::move($old_file, $new_file);
-
-        if ($this->isProcessingImages()) {
+        if ($this->fileIsImage($old_file)) {
             File::move(parent::getThumbPath($old_name), parent::getThumbPath($new_name));
         }
 
+        File::move($old_file, $new_file);
+
         event(new ImageWasRenamed($old_file, $new_file));
 
         return $this->success_response;

src/controllers/UploadController.php

@@ -55,7 +55,7 @@ private function proceedSingleUpload($file)
 
         event(new ImageIsUploading($new_file_path));
         try {
-            if ($this->isProcessingImages()) {
+            if ($this->fileIsImage($file)) {
                 Image::make($file->getRealPath())
                     ->orientate() //Apply orientation from exif data
                     ->save($new_file_path, 90);

src/traits/LfmHelpers.php

@@ -3,6 +3,7 @@
 namespace Unisharp\Laravelfilemanager\traits;
 
 use Illuminate\Support\Facades\File;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 trait LfmHelpers
 {
@@ -226,6 +227,17 @@ public function directoryIsEmpty($directory_path)
         return count(File::allFiles($directory_path)) == 0;
     }
 
+    public function fileIsImage($file)
+    {
+        if ($file instanceof UploadedFile) {
+            $mime_type = $file->getMimeType();
+        } else {
+            $mime_type = File::mimeType($file);
+        }
+
+        return starts_with($mime_type, 'image');
+    }
+
 
     /****************************
      ***    Miscellaneouses   ***