Merge pull request #70 from erhanask/2.6

Edited thumbnail of deleted images and showing default image instead of 404
anomalylabs · Jun 7, 2023 · 47af0c1 · 47af0c1
2 parents 8692298 + 5a7c957
commit 47af0c1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/resources/img/types/no-image.png b/resources/img/types/no-image.png
diff --git a/src/File/FilePresenter.php b/src/File/FilePresenter.php
@@ -169,16 +169,19 @@ public function size($unit = null, $decimals = 2)
     public function preview($width = 64, $height = 64)
     {
         if ($this->type() == 'image' && $this->object->canPreview()) {
-            return $this->object->image()
+            $output = $this->object->image()
                 ->width($width . 'px')
                 ->resize(
                     $width,
                     $height,
                     function (Constraint $constraint) {
                         $constraint->aspectRatio();
                     }
-                )
-                ->output();
+                );
+            // Showing user a default image when error returns.
+            if (!str_contains($output->url(),'Image source not readable')) {
+                return $output->output();
+            }
         }
 
         $type = $this->dispatch(new GetType($this->object)) ?: 'document';

diff --git a/src/Http/Controller/FilesController.php b/src/Http/Controller/FilesController.php
@@ -68,7 +68,22 @@ public function read(
             return $generator->generate($image->version(false), Request::get('quality', config('streams::images.quality', 80)));
         }
 
-        return $reader->read($file);
+        // if can not read the file source, redirecting to a default image instead of 404 error.
+        try {
+
+            return $reader->read($file);
+
+        } catch (\Exception $exception) {
+
+            return redirect(
+                $image
+                    ->make('anomaly.module.files::img/types/no-image.png')
+                    ->quality(60)
+                    ->url()
+            );
+
+        }
+
     }
 
     /**