refactoring uploader

Author: dosarkz

src/BaseUploader.php

@@ -0,0 +1,36 @@
+<?php
+namespace Dosarkz\LaravelUploader;
+
+/**
+ * Class BaseUploader
+ * @package Dosarkz\LaravelUploader
+ */
+class BaseUploader
+{
+    /**
+     * @param $uploading_file
+     * @param $destination
+     * @return FileUploader
+     */
+    public static function file($uploading_file, $destination = null)
+    {
+        return new FileUploader($uploading_file, $destination);
+    }
+
+    /**
+     * @param $uploading_file
+     * @param null $destination
+     * @param bool $resize
+     * @param $imageWidth
+     * @param $imageHeight
+     * @param $thumbWidth
+     * @param $thumbHeight
+     * @return ImageUploader
+     */
+    public static function image($uploading_file, $destination = null, $resize = false, $imageWidth = 800,
+                                 $imageHeight = null, $thumbWidth = 200, $thumbHeight = null)
+    {
+        return new ImageUploader($uploading_file, $destination, $resize, $imageWidth, $imageHeight,
+            $thumbWidth, $thumbHeight);
+    }
+}

src/Config/laraveluploader.php src/Config/laravel-uploader.phpsrc/Config/laraveluploader.php renamed to src/Config/laravel-uploader.php

@@ -11,6 +11,6 @@ class LaravelUploaderFacade extends Facade {
      */
     protected static function getFacadeAccessor()
     {
-        return 'laraveluploader';
+        return 'uploader';
     }
 }

src/Facade/LaravelUploaderFacade.php

@@ -0,0 +1,29 @@
+<?php
+namespace Dosarkz\LaravelUploader;
+
+use Illuminate\Support\Facades\File;
+
+/**
+ * Class FileUploader
+ * @package Dosarkz\LaravelUploader
+ */
+class FileUploader extends Uploader
+{
+    /**
+     * FileUploader constructor.
+     * @param $uploaded_file
+     * @param null $destination
+     */
+    public function __construct($uploaded_file, $destination = null)
+    {
+        $this->setUploadedFile($uploaded_file);
+        $this->setDestination($destination);
+
+        if (!is_dir(public_path($this->getDestination())))
+        {
+            File::makeDirectory(public_path($this->getDestination()), $mode = 0777, true);
+        }
+
+        parent::__construct();
+    }
+}

src/FileUploader.php

@@ -2,21 +2,52 @@
 namespace Dosarkz\LaravelUploader;
 
 use Illuminate\Support\Facades\File;
+use Intervention\Image\Facades\Image;
 
+/**
+ * Class ImageUploader
+ * @package Dosarkz\LaravelUploader
+ */
 class ImageUploader extends Uploader
 {
-    public function __construct($image = null, $destination = null)
-    {
-        $this->image = $image;
+    /**
+     * @var bool
+     */
+    protected $resize;
+    /**
+     * @var
+     */
+    protected $imageWidth;
+    /**
+     * @var
+     */
+    protected $imageHeight;
+    /**
+     * @var
+     */
+    protected $thumbWidth;
+    /**
+     * @var
+     */
+    protected $thumbHeight;
+    /**
+     * @var
+     */
+    protected $thumb;
 
-        if ($destination == null)
-        {
-            $this->destination = 'uploads/images/';
-        }else{
-            $this->destination = $destination;
-        }
 
-        $this->thumbWidth = 150;
+    public function __construct($uploaded_file, $destination = null, $resize = false, $imageWidth = 800,
+                                $imageHeight = null, $thumbWidth = 200, $thumbHeight = null)
+    {
+        $this->setUploadedFile($uploaded_file);
+        $this->setDestination($destination);
+        $this->setThumb('thumb_' . $this->getFileName());
+
+        $this->resize = $resize;
+        $this->imageWidth = $imageWidth;
+        $this->imageHeight = $imageHeight;
+        $this->thumbWidth  = $thumbWidth;
+        $this->thumbHeight = $thumbHeight;
 
         if (!is_dir(public_path($this->destination)))
         {
@@ -25,4 +56,72 @@ public function __construct($image = null, $destination = null)
 
         parent::__construct();
     }
+
+    /**
+     * @return mixed
+     */
+    public function getThumb()
+    {
+        return $this->thumb;
+    }
+
+    /**
+     * @param mixed $thumb
+     */
+    public function setThumb($thumb)
+    {
+        $this->thumb = $thumb;
+    }
+
+    /**
+     *
+     */
+    public function upload()
+    {
+        $this->uploadImageFile($this->getFileName());
+        $this->uploadImageThumb($this->getThumb());
+    }
+
+
+    /**
+     * @param $filename
+     * @return mixed
+     */
+    public function uploadImageFile($filename)
+    {
+        list($width, $height) = getimagesize($this->getUploadedFile()->getRealPath());
+
+        if ($width > $this->imageWidth)
+        {
+            return Image::make($this->getUploadedFile()->getRealPath())
+                ->resize($this->imageWidth, $this->imageHeight, function ($constraint) {
+                    $constraint->aspectRatio();
+                })->save(public_path($this->getDestination() . $filename));
+        }else {
+            return Image::make($this->getUploadedFile()->getRealPath())
+                ->save(public_path($this->getDestination() . $filename));
+        }
+    }
+    /**
+     * @param $thumb
+     * @return mixed
+     */
+    public function uploadImageThumb($thumb)
+    {
+        list($width, $height) = getimagesize($this->getUploadedFile()->getRealPath());
+
+        if ($width > $this->thumbWidth)
+        {
+            Image::make($this->getUploadedFile()->getRealPath())
+                ->resize($this->thumbWidth, $this->thumbHeight, function ($constraint) {
+                $constraint->aspectRatio();
+            })
+                ->save(public_path($this->getDestination() . $thumb));
+        }else{
+            return Image::make($this->getUploadedFile()->getRealPath())
+                ->save(public_path($this->getDestination() .'/'. $thumb));
+        }
+        return $thumb;
+    }
+
 }

src/ImageUploader.php

@@ -1,10 +1,8 @@
 <?php
 namespace Dosarkz\LaravelUploader\Provider;
 
-use Dosarkz\LaravelUploader\ImageUploader;
-use Illuminate\Support\Facades\App;
+use Dosarkz\LaravelUploader\BaseUploader;
 use Illuminate\Support\ServiceProvider;
-use Intervention\Image\ImageServiceProvider;
 
 class LaravelUploaderServiceProvider extends ServiceProvider
 {
@@ -16,7 +14,7 @@ class LaravelUploaderServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->publishes([
-            __DIR__ . '/config/laraveluploader.php' => config_path('laraveluploader.php'),
+            __DIR__ . '/config/laravel-uploader.php' => config_path('laravel-uploader.php'),
         ]);
 
 
@@ -32,8 +30,8 @@ public function register()
         $this->app->bind('Image', 'Intervention\Image\Facades\Image');
 
 
-        $this->app->singleton('laraveluploader', function ($app) {
-            return new ImageUploader();
+        $this->app->singleton('uploader', function ($app) {
+            return new BaseUploader();
         });
     }