Add drop zone support for parallelChunkUploads

pionl · May 8, 2018 · 202eb34 · 202eb34
1 parent 3521fdc
commit 202eb34
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/readme.md b/readme.md
@@ -42,10 +42,10 @@ Setup is composed in 3 steps:
 
 | Library | Wiki | single & chunk upload | simultaneous uploads |
 |---- |----|----|----|
+| [resumable.js](https://github.com/23/resumable.js) | [Wiki](https://github.com/pionl/laravel-chunk-upload/wiki/jquery-file-upload) | :heavy_check_mark: | :heavy_check_mark: |
+| [DropZone](https://gitlab.com/meno/dropzone/) | [Wiki](https://github.com/pionl/laravel-chunk-upload/wiki/dropzone) | :heavy_check_mark: | :heavy_check_mark: |
 | [jQuery-File-Upload](https://github.com/blueimp/jQuery-File-Upload) | [Wiki](https://github.com/pionl/laravel-chunk-upload/wiki/blueimp-file-upload)  | :heavy_check_mark: | :heavy_multiplication_x: |
 | [Plupload](https://github.com/moxiecode/plupload) | [Wiki](https://github.com/pionl/laravel-chunk-upload/wiki/plupload) | :heavy_check_mark: | :heavy_multiplication_x: |
-| [resumable.js](https://github.com/23/resumable.js) | [Wiki](https://github.com/pionl/laravel-chunk-upload/wiki/jquery-file-upload) | :heavy_check_mark: | :heavy_check_mark: |
-| [DropZone](https://gitlab.com/meno/dropzone/) | [Wiki](https://github.com/pionl/laravel-chunk-upload/wiki/dropzone) | :heavy_check_mark: | :heavy_multiplication_x: |
 
 For more detailed information (tips) use the [Wiki](https://github.com/pionl/laravel-chunk-upload/wiki) or for working example continue to separate repository with [example](https://github.com/pionl/laravel-chunk-upload-example).
 

diff --git a/src/Handler/AbstractHandler.php b/src/Handler/AbstractHandler.php
@@ -80,8 +80,8 @@ public static function canUseSession()
      * provide custom additional name at the end of the generated file name. All chunk
      * files has .part extension
      *
-     * @param string|null $additionalName
-     * @param string|null $currentChunkIndex
+     * @param string|null $additionalName Make the name more unique (example: use id from request)
+     * @param string|null $currentChunkIndex Add the chunk index for parallel upload
      *
      * @return string
      *

diff --git a/src/Handler/DropZoneUploadHandler.php b/src/Handler/DropZoneUploadHandler.php
@@ -4,6 +4,9 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use Pion\Laravel\ChunkUpload\Config\AbstractConfig;
+use Pion\Laravel\ChunkUpload\Exceptions\ChunkSaveException;
+use Pion\Laravel\ChunkUpload\Save\ParallelSave;
+use Pion\Laravel\ChunkUpload\Storage\ChunkStorage;
 
 class DropZoneUploadHandler extends ChunksInRequestUploadHandler
 {
@@ -34,9 +37,33 @@ public function __construct(Request $request, $file, $config)
         $this->fileUuid = $request->get(self::CHUNK_UUID_INDEX);
     }
 
+    /**
+     * Returns the chunk save instance for saving
+     *
+     * @param ChunkStorage $chunkStorage the chunk storage
+     *
+     * @return ParallelSave
+     * @throws ChunkSaveException
+     * @throws ChunkSaveException
+     */
+    public function startSaving($chunkStorage)
+    {
+        return new ParallelSave(
+            $this->getTotalChunksFromRequest($this->request),
+            $this->file,
+            $this,
+            $chunkStorage,
+            $this->config
+        );
+    }
+
+    /**
+     * Builds the chunk file name from file uuid and current chunk
+     * @return string
+     */
     public function getChunkFileName()
     {
-        return $this->createChunkFileName($this->fileUuid);
+        return $this->createChunkFileName($this->fileUuid, $this->getCurrentChunk());
     }
 
     /**