redo the way chunks are buffered

Author: Will Banfield

src/GridFS/Bucket.php

@@ -45,7 +45,7 @@ class Bucket
      */
     public function __construct(Manager $manager, $databaseName, array $options = [])
     {
-        $collectionOptions = array();
+        $collectionOptions = [];
         $options += [
             'bucketName' => 'fs',
             'chunkSizeBytes' => 261120,
@@ -145,7 +145,7 @@ public function openUploadStream($filename, array $options = [])
             'chunkSizeBytes' => $this->getChunkSizeBytes()
             ];
         $context = stream_context_create(['gridfs' => $options]);
-        return fopen('gridfs://$this->databaseName/$filename', 'w', false, $context);
+        return fopen(sprintf('gridfs://%s/%s', $this->databaseName, $filename), 'w', false, $context);
     }
      /**
      * Upload a file to this bucket by specifying the source stream file
@@ -202,7 +202,7 @@ private function isFilesCollectionEmpty()
     }
     public function delete(ObjectId $id)
     {
-        $options = array('writeConcern' => $this->writeConcern);
+        $options = ['writeConcern' => $this->writeConcern];
         $this->chunksCollection->deleteMany(['file_id' => $id], $options);
 
         $this->filesCollection->deleteOne(['_id' => $id], $options);

src/GridFS/GridFsUpload.php

@@ -3,6 +3,8 @@
 
 use MongoDB\Collection;
 use MongoDB\Exception\RuntimeException;
+use MongoDB\Exception\UnexpectedTypeException;
+use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\BSON\ObjectId;
 /**
  * GridFsupload abstracts the processes of inserting into a GridFSBucket
@@ -12,6 +14,7 @@
 class GridFsUpload extends GridFsStream
 {
     private $ctx;
+    private $bufferLength;
     /**
      * Constructs a GridFS upload stream
      *
@@ -44,6 +47,7 @@ public function __construct(
         array $options=[]
         )
     {
+        $this->bufferLength = 0;
         $this->ctx = hash_init('md5');
         $uploadDate = time();
         $objectId = new \MongoDB\BSON\ObjectId();
@@ -77,7 +81,6 @@ public function __construct(
                 throw new InvalidArgumentTypeException('"metadata" option', $options['metadata'], 'object or array');
             }
         }
-
         $this->file = array_merge($main_file, $fileOptions);
         parent::__construct($filesCollection, $chunksCollection, $chunkSizeBytes);
     }
@@ -89,6 +92,14 @@ public function __construct(
     */
     public function uploadFromStream($source)
     {
+        if (!is_resource($source) || get_resource_type($source) != "stream") {
+            throw new UnexpectedTypeException('stream', $source);
+        } else{
+            $streamMetadata = stream_get_meta_data($source);
+        } if (!is_readable($streamMetadata['uri'])) {
+     //       throw new InvalidArgumentException("stream not readable");
+            //issue being that php's is_readable reports native streams as not readable like php://temp
+        }
         while ($data = fread($source, $this->chunkSizeBytes)) {
             $this->insertChunk($data);
         }
@@ -102,6 +113,20 @@ public function uploadFromStream($source)
     */
     public function insertChunks($toWrite)
     {
+        $readBytes = 0;
+
+        while($readBytes != strlen($toWrite)) {
+            $addToBuffer = substr($toWrite, $readBytes, $this->chunkSizeBytes - $this->bufferLength);
+            fwrite($this->buffer, $addToBuffer);
+            $readBytes += strlen($addToBuffer);
+            $this->bufferLength += strlen($addToBuffer);
+            if($this->bufferLength == $this->chunkSizeBytes) {
+                $this->insertChunk(fread($this->buffer, $this->chunkSizeBytes));
+                ftruncate($this->buffer,0);
+                $this->bufferLength = 0;
+            }
+        }
+        /*
         rewind($this->buffer);
         $cached = fread($this->buffer, $this->chunkSizeBytes);
         $toWrite = $cached . $toWrite;
@@ -117,7 +142,8 @@ public function insertChunks($toWrite)
             }
             $this->insertChunk($bytes[$i]);
         }
-        return strlen($toWrite);
+        */
+        return $readBytes;
     }
     /**
     * Close an active stream, pushes all buffered data to GridFS
@@ -138,14 +164,6 @@ public function close()
 
         $this->fileCollectionInsert();
     }
-/*
-    private function insertChunk($data)
-    {
-        $toUpload = ["files_id" => $this->file['_id'], "n" => $this->n, "data" => $data];
-        hash_update($this->ctx, $data);
-        $this->chunksCollection->insertOne($toUpload);
-        $this->n++;
-    } */
     private function insertChunk($data)
     {
         $toUpload = ["files_id" => $this->file['_id'], "n" => $this->n, "data" => $data];