Merge branch 'master' of https://github.com/pionl/laravel-chunk-upload

Author: pionl

readme.md

@@ -46,6 +46,7 @@ Setup is composed in 3 steps:
 | [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: |
+| [simple uploader](https://github.com/simple-uploader) | :heavy_multiplication_x: | :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).
 

src/Handler/ChunksInRequestSimpleUploadHandler.php

@@ -0,0 +1,27 @@
+<?php
+namespace Pion\Laravel\ChunkUpload\Handler;
+
+
+/**
+ * Class ChunksInRequestSimpleUploadHandler
+ *
+ * Upload receiver that detects the content range from he request value - chunks
+ * Works with:
+ * - simple-uploader: https://github.com/simple-uploader
+ *
+ * @package Pion\Laravel\ChunkUpload\Handler
+ */
+class ChunksInRequestSimpleUploadHandler extends ChunksInRequestUploadHandler
+{
+    /**
+     * Key for number of sending chunk
+     * @static string
+     */
+    const KEY_CHUNK_NUMBER = 'chunkNumber';
+
+    /**
+     * Key for number of all chunks
+     * @static string
+     */
+    const KEY_ALL_CHUNKS = 'totalChunks';
+}

src/Handler/ChunksInRequestUploadHandler.php

@@ -19,6 +19,18 @@
  */
 class ChunksInRequestUploadHandler extends AbstractHandler
 {
+    /**
+     * Key for number of sending chunk
+     * @static string
+     */
+    const KEY_CHUNK_NUMBER = 'chunk';
+
+    /**
+     * Key for number of all chunks
+     * @static string
+     */
+    const KEY_ALL_CHUNKS = 'chunks';
+
     /**
      * The current chunk progress
      * @var int
@@ -56,7 +68,7 @@ public function __construct(Request $request, $file, $config)
      */
     public static function canBeUsedForRequest(Request $request)
     {
-        return $request->has('chunk') && $request->has('chunks');
+        return $request->has(static::KEY_CHUNK_NUMBER) && $request->has(static::KEY_ALL_CHUNKS);
     }
 
     /**
@@ -82,7 +94,7 @@ public function startSaving($chunkStorage)
     protected function getCurrentChunkFromRequest(Request $request)
     {
         // the chunk is indexed from zero (for 5 chunks: 0,1,2,3,4)
-        return intval($request->get('chunk')) + 1;
+        return intval($request->get(static::KEY_CHUNK_NUMBER)) + 1;
     }
 
     /**
@@ -94,7 +106,7 @@ protected function getCurrentChunkFromRequest(Request $request)
      */
     protected function getTotalChunksFromRequest(Request $request)
     {
-        return intval($request->get("chunks"));
+        return intval($request->get(static::KEY_ALL_CHUNKS));
     }
 
     /**

src/Handler/HandlerFactory.php

@@ -13,7 +13,8 @@ class HandlerFactory
         ContentRangeUploadHandler::class,
         ChunksInRequestUploadHandler::class,
         ResumableJSUploadHandler::class,
-        DropZoneUploadHandler::class
+        DropZoneUploadHandler::class,
+        ChunksInRequestSimpleUploadHandler::class
     );
 
     /**

src/Handler/SingleUploadHandler.php

@@ -23,9 +23,9 @@ class SingleUploadHandler extends AbstractHandler
      *
      * @return SingleSave
      */
-    public function startSaving($chunkStorage, $config)
+    public function startSaving($chunkStorage)
     {
-        return new SingleSave($this->file, $this, $config);
+        return new SingleSave($this->file, $this,  $this->config);
     }
 
     /**