Fix issue with chunked upload

apivideo · Aug 7, 2018 · 8800c04 · 8800c04
1 parent 39a07df
commit 8800c04
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/src/Api/Videos.php b/src/Api/Videos.php
@@ -5,6 +5,7 @@
 use ApiVideo\Client\Buzz\FormByteRangeUpload;
 use ApiVideo\Client\Buzz\OAuthBrowser;
 use ApiVideo\Client\Model\Video;
+use Buzz\Exception\RequestException;
 use Buzz\Message\Form\FormUpload;
 use Buzz\Message\RequestInterface;
 
@@ -184,25 +185,27 @@ public function upload($source, array $properties = array(), $videoId = null)
             $chunk       = fopen($chunkPath, 'w+b');
             $from        = $copiedBytes;
             $copiedBytes += stream_copy_to_stream($resource, $chunk, $this->chunkSize, $copiedBytes);
-
-            $response = $this->browser->submit(
-                "/videos/$videoId/source",
-                array('file' => new FormByteRangeUpload($chunkPath, $from, $copiedBytes, $length)),
-                RequestInterface::METHOD_POST,
-                array(
-                    'Content-Range' => 'bytes '.$from.'-'.($copiedBytes - 1).'/'.$length,
-                    'Expect'        => '',
-                )
-            );
-
-            if ($response->getStatusCode() >= 400) {
-                $this->registerLastError($response);
-
-                return null;
+            $lastResponse = null;
+            $response= null;
+            try {
+                $response = $this->browser->submit(
+                    "/videos/$videoId/source",
+                    array('file' => new FormByteRangeUpload($chunkPath, $from, $copiedBytes, $length)),
+                    RequestInterface::METHOD_POST,
+                    array(
+                        'Content-Range' => 'bytes '.$from.'-'.($copiedBytes - 1).'/'.$length,
+                        'Expect'        => '',
+                    )
+                );
+                if($response->isSuccessful() && $response->getStatusCode() !== 100){
+                    $lastResponse = $this->unmarshal($response);
+                }
+            } catch (RequestException $e) {
+                if ($e->getCode() !== 100 && $e->getCode() >= 400) {
+                    return null;
+                }
             }
 
-            $lastResponse = $this->unmarshal($response);
-
             fclose($chunk);
             unlink($chunkPath);
 

diff --git a/tests/Api/VideosTest.php b/tests/Api/VideosTest.php
@@ -1084,11 +1084,7 @@ public function uploadLargeFileWithBadVideoIdFailed()
         $videos            = new Videos($mockedBrowser);
         $videos->chunkSize = 10 * 1024 * 1024;
         $result = $videos->upload($this->getValideVideo()->url(), array(), 'vilWKqgywdX55mg8Yu8WgDZ0');
-
         $this->assertNull($result);
-        $error = $videos->getLastError();
-
-        $this->assertSame(404, $error['status']);
     }
 
     /**