Merge branch 'master' of github.com:dilab/resumable.php

Author: dilab

src/Network/SimpleResponse.php

@@ -16,7 +16,7 @@ public function header($statusCode)
         } else if (404==$statusCode) {
             return header("HTTP/1.0 404 Not Found");
         }
-        return header("HTTP/1.0 404 Not Found");
+        return header("HTTP/1.0 204 No Content");
     }
 
 }

src/Resumable.php

@@ -176,10 +176,11 @@ public function handleTestChunk()
         $chunkNumber = $this->resumableParam($this->resumableOption['chunkNumber']);
 
         if (!$this->isChunkUploaded($identifier, $filename, $chunkNumber)) {
-            return $this->response->header(404);
+            return $this->response->header(204);
+        } else {
+            return $this->response->header(200);
         }
 
-        return $this->response->header(200);
     }
 
     public function handleChunk()
@@ -279,7 +280,17 @@ public function tmpChunkDir($identifier)
 
     public function tmpChunkFilename($filename, $chunkNumber)
     {
-        return $filename . '.part' . $chunkNumber;
+        return $filename . '.' . str_pad($chunkNumber, 4, 0, STR_PAD_LEFT);
+    }
+
+    public function getExclusiveFileHandle($name)
+    {
+        // if the file exists, fopen() will raise a warning
+        $previous_error_level = error_reporting();
+        error_reporting(E_ERROR);
+        $handle = fopen($name, 'x');
+        error_reporting($previous_error_level);
+        return $handle;
     }
 
     public function createFileFromChunks($chunkFiles, $destFile)
@@ -288,7 +299,13 @@ public function createFileFromChunks($chunkFiles, $destFile)
 
         natsort($chunkFiles);
 
-        $destFile = new File($destFile, true);
+        $handle = $this->getExclusiveFileHandle($destFile);
+        if (!$handle) {
+            return false;
+        }
+
+        $destFile = new File($destFile);
+        $destFile->handle = $handle;
         foreach ($chunkFiles as $chunkFile) {
             $file = new File($chunkFile);
             $destFile->append($file->read());
@@ -342,3 +359,4 @@ private function removeExtension($filename)
         return str_replace(sprintf('.%s', $ext), '', $filename);
     }
 }
+

test/files/mock.png.part1 renamed to test/files/mock.png.0001

@@ -76,7 +76,7 @@ public function testFile()
        $file = array(
            'name'=> 'mock.png',
            'type'=> 'application/octet-stream',
-           'tmp_name'=>  'test/files/mock.png.part3',
+           'tmp_name'=>  'test/files/mock.png.0003',
            'error'=> 0,
            'size'=> 1048576,
        );

test/files/mock.png.part2 renamed to test/files/mock.png.0002

@@ -26,8 +26,9 @@ public function headerProvider()
     {
         return array(
             array(404,404),
+            array(204,204),
             array(200,200),
-            array(500,404),
+            array(500,204),
         );
     }
 

test/files/mock.png.part3 renamed to test/files/mock.png.0003

@@ -50,7 +50,7 @@ public function testProcessHandleChunk()
         $this->request->method('file')
                     ->will($this->returnValue(array(
                             'name'=> 'mock.png',
-                            'tmp_name'=>  'test/files/mock.png.part3',
+                            'tmp_name'=>  'test/files/mock.png.003',
                             'error'=> 0,
                             'size'=> 27000,
                         )));
@@ -142,7 +142,7 @@ public function testHandleChunk() {
         $this->request->method('file')
                 ->willReturn(array(
                     'name'=> 'mock.png',
-                    'tmp_name'=>  'test/files/mock.png.part3',
+                    'tmp_name'=>  'test/files/mock.png.003',
                     'error'=> 0,
                     'size'=> 27000,
                 ));
@@ -154,7 +154,7 @@ public function testHandleChunk() {
         $this->resumbable->handleChunk();
 
         $this->assertFileExists('test/uploads/mock.png');
-        unlink('test/tmp/identifier/mock.png.part3');
+        file_exists('test/tmp/identifier/mock.png.003') && unlink('test/tmp/identifier/mock.png.003');
         unlink('test/uploads/mock.png');
     }
 
@@ -226,22 +226,22 @@ public function testTmpChunkFile()
     {
         $this->resumbable = new Resumable($this->request,$this->response);
         $filename = 'mock-file.png';
-        $chunkNumber = 1;
-        $expected = $filename.'.part'.$chunkNumber;
+        $chunkNumber = str_pad(1, 4, 0, STR_PAD_LEFT);
+        $expected = $filename.'.'.$chunkNumber;
         $this->assertEquals($expected, $this->resumbable->tmpChunkFilename($filename,$chunkNumber));
     }
 
     public function testCreateFileFromChunks()
     {
         $files = array(
-            'test/files/mock.png.part1',
-            'test/files/mock.png.part2',
-            'test/files/mock.png.part3',
+            'test/files/mock.png.0001',
+            'test/files/mock.png.0002',
+            'test/files/mock.png.0003',
         );
         $totalFileSize = array_sum(array(
-            filesize('test/files/mock.png.part1'),
-            filesize('test/files/mock.png.part2'),
-            filesize('test/files/mock.png.part3')
+            filesize('test/files/mock.png.0001'),
+            filesize('test/files/mock.png.0002'),
+            filesize('test/files/mock.png.0003')
         ));
         $destFile = 'test/files/5.png';
 
@@ -256,7 +256,7 @@ public function testMoveUploadedFile()
     {
         $destFile = 'test/files/4.png';
         $this->resumbable = new Resumable($this->request,$this->response);
-        $this->resumbable->moveUploadedFile('test/files/mock.png.part1', $destFile);
+        $this->resumbable->moveUploadedFile('test/files/mock.png.0001', $destFile);
         $this->assertFileExists($destFile);
         unlink($destFile);
     }