decoupling

Author: Recca Tsai

src/Contracts/Uploader.php

@@ -12,20 +12,11 @@ interface Uploader
     /**
      * __construct.
      *
+     * @param array    $config
      * @param \Illuminate\Http\Request    $request
      * @param \Recca0120\Upload\Filesystem $filesystem
-     * @param string    $path
      */
-    public function __construct(Request $request, Filesystem $filesystem, $path = null);
-
-    /**
-     * setPath.
-     *
-     * @param string $path
-     *
-     * @return static
-     */
-    public function setPath($path = null);
+    public function __construct($config = [], Request $request = null, Filesystem $filesystem = null);
 
     /**
      * receive.

src/Receiver.php

@@ -3,8 +3,8 @@
 namespace Recca0120\Upload;
 
 use Closure;
-use Illuminate\Support\Arr;
 use Recca0120\Upload\Contracts\Uploader;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 
 class Receiver
@@ -16,32 +16,15 @@ class Receiver
      */
     protected $uploader;
 
-    /**
-     * $filesystem.
-     *
-     * @var \Recca0120\Upload\Filesystem
-     */
-    protected $filesystem;
-
-    /**
-     * $config.
-     *
-     * @var array
-     */
-    protected $config;
-
     /**
      * __construct.
      *
      * @param \Recca0120\Upload\Contracts\Uploader   $uploader
-     * @param \Recca0120\Upload\Filesystem $filesystem
-     * @param array     $config
+     * @param \Illuminate\Http\Request $request
      */
-    public function __construct(Uploader $uploader, Filesystem $filesystem, $config = [])
+    public function __construct(Uploader $uploader)
     {
         $this->uploader = $uploader;
-        $this->filesystem = $filesystem;
-        $this->config = $config;
     }
 
     /**
@@ -54,42 +37,28 @@ public function __construct(Uploader $uploader, Filesystem $filesystem, $config
      */
     public function receive($name, Closure $closure)
     {
-        $path = Arr::get($this->config, 'path');
-        if ($this->filesystem->isDirectory($path) === false) {
-            $this->filesystem->makeDirectory($path, 0777, true, true);
-        }
-
         try {
-            $uploadedFile = $this->uploader
-                ->setPath($path)
-                ->receive($name);
+            $uploadedFile = $this->uploader->receive($name);
+            $response = $closure($uploadedFile);
+            $this->deleteUploadedFile($uploadedFile);
+
+            return $this->uploader->completedResponse($response);
         } catch (ChunkedResponseException $e) {
             return $e->getResponse();
         }
-
-        $response = $closure($uploadedFile);
-        $file = $uploadedFile->getPathname();
-        if ($this->filesystem->isFile($file) === true) {
-            $this->filesystem->delete($file);
-        }
-        $this->cleanDirectory($path);
-
-        return $this->uploader->completedResponse($response);
     }
 
     /**
-     * cleanDirectory.
+     * deleteUploadedFile.
      *
-     * @param  string $path
+     * @param  UploadedFile $uploadedFile
      */
-    protected function cleanDirectory($path)
+    protected function deleteUploadedFile(UploadedFile $uploadedFile)
     {
-        $time = time();
-        $maxFileAge = 3600;
-        foreach ($this->filesystem->files($path) as $file) {
-            if ($this->filesystem->exists($file) === true && $this->filesystem->lastModified($file) < ($time - $maxFileAge)) {
-                $this->filesystem->delete($file);
-            }
+        $filesystem = $this->uploader->getFilesystem();
+        $file = $uploadedFile->getPathname();
+        if ($filesystem->isFile($file) === true) {
+            $filesystem->delete($file);
         }
     }
 }

src/UploadManager.php

@@ -2,12 +2,27 @@
 
 namespace Recca0120\Upload;
 
+use Illuminate\Http\Request;
 use Illuminate\Support\Manager;
 use Recca0120\Upload\Uploaders\FileAPI;
 use Recca0120\Upload\Uploaders\Plupload;
 
 class UploadManager extends Manager
 {
+    /**
+     * __construct.
+     *
+     * @param $app
+     * @param $request
+     * @param $filesystem
+     */
+    public function __construct($app, Request $request = null, Filesystem $filesystem = null)
+    {
+        parent::__construct($app);
+        $this->request = is_null($request) === true ? Request::capture() : $request;
+        $this->filesystem = is_null($filesystem) === true ? new Filesystem : $filesystem;
+    }
+
     /**
      * default driver.
      *
@@ -27,10 +42,7 @@ protected function createFileapiDriver()
     {
         $config = $this->app['config']['upload'];
 
-        return $this->app->make(Receiver::class, [
-            $this->app->make(FileAPI::class),
-            'config' => $config,
-        ]);
+        return new Receiver(new FileAPI($config, $this->request, $this->filesystem));
     }
 
     /**
@@ -42,9 +54,6 @@ protected function createPluploadDriver()
     {
         $config = $this->app['config']['upload'];
 
-        return $this->app->make(Receiver::class, [
-            $this->app->make(Plupload::class),
-            'config' => $config,
-        ]);
+        return new Receiver(new Plupload($config, $this->request, $this->filesystem));
     }
 }

src/UploadServiceProvider.php

@@ -15,7 +15,7 @@ public function register()
 
         $this->app->singleton(Filesystem::class, Filesystem::class);
         $this->app->singleton(UploadManager::class, function ($app) {
-            return new UploadManager($app);
+            return new UploadManager($app, $app['request'], $app->make(Filesystem::class));
         });
         $this->app->singleton(Manager::class, UploadManager::class);
     }

src/Uploaders/Base.php

@@ -31,6 +31,13 @@ abstract class Base implements Uploader
      */
     protected $filesystem;
 
+    /**
+     * $config.
+     *
+     * @var array
+     */
+    protected $config;
+
     /**
      * $path.
      *
@@ -41,29 +48,18 @@ abstract class Base implements Uploader
     /**
      * __construct.
      *
+     * @param array    $path
      * @param \Illuminate\Http\Request    $request
      * @param \Recca0120\Upload\Filesystem $filesystem
-     * @param string    $path
-     */
-    public function __construct(Request $request, Filesystem $filesystem, $path = null)
-    {
-        $this->request = $request;
-        $this->filesystem = $filesystem;
-        $this->setPath($path);
-    }
-
-    /**
-     * setPath.
-     *
-     * @param string $path
-     *
-     * @return static
      */
-    public function setPath($path = null)
+    public function __construct($config = [], Request $request = null, Filesystem $filesystem = null)
     {
-        $this->path = is_null($path) === true ? sys_get_temp_dir() : $path;
+        $this->request = is_null($request) === true ? Request::capture() : $request;
+        $this->filesystem = is_null($filesystem) === true ? new Filesystem : $filesystem;
+        $this->config = $config;
 
-        return $this;
+        $path = isset($config['path']) === false ? sys_get_temp_dir().'/temp/' : $config['path'];
+        $this->path = $path;
     }
 
     /**
@@ -109,6 +105,65 @@ protected function receiveChunkedFile($originalName, $input, $start, $mimeType,
         return $this->filesystem->createUploadedFile($tmpfile, $originalName, $mimeType, $size);
     }
 
+    /**
+     * receive.
+     *
+     * @param string $name
+     *
+     * @throws ChunkedResponseException
+     *
+     * @return \Symfony\Component\HttpFoundation\File\UploadedFile
+     */
+    public function receive($name)
+    {
+        $this->makeDirectory();
+        $uploadedFile = $this->doReceive($name);
+        $this->cleanDirectory();
+
+        return $uploadedFile;
+    }
+
+    /**
+     * doReceive.
+     *
+     * @param string $name
+     *
+     * @throws ChunkedResponseException
+     *
+     * @return \Symfony\Component\HttpFoundation\File\UploadedFile
+     */
+    abstract protected function doReceive($name);
+
+    /**
+     * makeDirectory.
+     */
+    protected function makeDirectory()
+    {
+        if ($this->filesystem->isDirectory($this->path) === false) {
+            $this->filesystem->makeDirectory($this->path, 0777, true, true);
+        }
+    }
+
+    /**
+     * cleanDirectory.
+     */
+    protected function cleanDirectory()
+    {
+        $time = time();
+        $maxFileAge = 3600;
+        $files = $this->filesystem->files($this->path);
+        foreach ((array) $files as $file) {
+            if ($this->filesystem->exists($file) === true && $this->filesystem->lastModified($file) < ($time - $maxFileAge)) {
+                $this->filesystem->delete($file);
+            }
+        }
+    }
+
+    public function getFilesystem()
+    {
+        return $this->filesystem;
+    }
+
     /**
      * completedResponse.
      *

src/Uploaders/FileAPI.php

@@ -47,7 +47,7 @@ protected function getMimeType($originalName)
      *
      * @return \Symfony\Component\HttpFoundation\File\UploadedFile
      */
-    public function receive($name)
+    protected function doReceive($name)
     {
         $contentRange = $this->request->header('content-range');
         if (empty($contentRange) === true) {

src/Uploaders/Plupload.php

@@ -16,7 +16,7 @@ class Plupload extends Base
      *
      * @return \Symfony\Component\HttpFoundation\File\UploadedFile
      */
-    public function receive($name)
+    protected function doReceive($name)
     {
         $uploadedFile = $this->request->file($name);
         $chunks = $this->request->get('chunks');