display original image when thumbnail is missing

UniSharp · Apr 28, 2017 · c91f416 · c91f416
1 parent bbfe642
commit c91f416
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 23 deletions.
diff --git a/src/controllers/UploadController.php b/src/controllers/UploadController.php
@@ -54,7 +54,7 @@ private function proceedSingleUpload($file)
 
         event(new ImageIsUploading($new_file_path));
         try {
-            if (parent::fileIsImage($file) && parent::isImageToThumb($file)) {
+            if (parent::fileIsImage($file) && !parent::imageShouldNotHaveThumb($file)) {
                 Image::make($file->getRealPath())
                     ->orientate() //Apply orientation from exif data
                     ->save($new_file_path, 90);

diff --git a/src/traits/LfmHelpers.php b/src/traits/LfmHelpers.php
@@ -288,12 +288,12 @@ public function objectPresenter($item)
 
             $thumb_path = $this->getThumbPath($item_name);
             $file_path = $this->getCurrentPath($item_name);
-            if (File::exists($thumb_path)) {
-                $thumb_url = $this->getThumbUrl($item_name) . '?timestamp=' . filemtime($thumb_path);
-            } elseif ($this->isValidImageType($file_path)) {
+            if ($this->imageShouldNotHaveThumb($file_path)) {
                 $thumb_url = $this->getFileUrl($item_name) . '?timestamp=' . filemtime($file_path);
+            } elseif (File::exists($thumb_path)) {
+                $thumb_url = $this->getThumbUrl($item_name) . '?timestamp=' . filemtime($thumb_path);
             } else {
-                $thumb_url = null;
+                $thumb_url = $this->getFileUrl($item_name) . '?timestamp=' . filemtime($file_path);
             }
         } else {
             $extension = strtolower(File::extension($item_name));
@@ -335,28 +335,12 @@ public function fileIsImage($file)
         return starts_with($mime_type, 'image');
     }
 
-    public function isImageToThumb($file)
+    public function imageShouldNotHaveThumb($file)
     {
         $mine_type = $this->getFileType($file);
         $noThumbType = ['image/gif', 'image/svg+xml'];
 
-        if (in_array($mine_type, $noThumbType)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function isValidImageType($file)
-    {
-        $mine_type = $this->getFileType($file);
-        $valid_image_mimetypes = config('lfm.valid_image_mimetypes');
-
-        if (in_array($mine_type, $valid_image_mimetypes)) {
-            return true;
-        }
-
-        return false;
+        return in_array($mine_type, $noThumbType);
     }
 
     public function getFileType($file)