more tweaks

Author: Will Banfield

src/GridFS/Bucket.php

@@ -132,7 +132,7 @@ public function getChunkSizeBytes()
     }
     public function getDatabaseName()
     {
-        return $this->options['chunkSizeBytes'];
+        return $this->databaseName;
     }
     public function find($filter, array $options =[])
     {

src/GridFS/BucketReadWriter.php

@@ -20,6 +20,7 @@ public function openUploadStream($filename, array $options = [])
     {
         $options = [
             'bucket' => $this->bucket,
+            'uploadOptions' => $options
             ];
         $context = stream_context_create(['gridfs' => $options]);
         return fopen(sprintf('gridfs://%s/%s', $this->bucket->getDatabaseName(), $filename), 'w', false, $context);

src/GridFS/GridFsUpload.php

@@ -5,7 +5,7 @@
 use MongoDB\Exception\RuntimeException;
 use MongoDB\Exception\UnexpectedTypeException;
 use MongoDB\Exception\InvalidArgumentException;
-use MongoDB\BSON\ObjectId;
+use MongoDB\BSON;
 /**
  * GridFsupload abstracts the processes of inserting into a GridFSBucket
  *
@@ -16,6 +16,7 @@ class GridFsUpload extends GridFsStream
     private $ctx;
     private $bufferLength;
     private $indexChecker;
+    private $length;
     /**
      * Constructs a GridFS upload stream
      *
@@ -142,9 +143,7 @@ public function close()
         $cached = fread($this->buffer, $this->bucket->getChunkSizeBytes());
 
         if(strlen($cached) > 0) {
-            $toUpload = ["files_id" => $this->file["_id"], "n" => $this->n, "data" => $cached];
-            $this->bucket->chunkInsert($toUpload);
-            $this->n++;
+            insertChunk($cached);
         }
 
         fclose($this->buffer);
@@ -153,16 +152,17 @@ public function close()
     }
     private function insertChunk($data)
     {
-        $toUpload = ["files_id" => $this->file['_id'], "n" => $this->n, "data" => $data];
+        $toUpload = ["files_id" => $this->file['_id'], "n" => $this->n, "data" => new \MongoDB\BSON\Binary($data, \MongoDB\BSON\Binary::TYPE_GENERIC)];
         hash_update($this->ctx, $data);
         $this->bucket->chunkInsert($toUpload);
+        $this->length += strlen($data);
         $this->n++;
     }
 
     private function fileCollectionInsert()
     {
         $md5 = hash_final($this->ctx);
-        $this->file = array_merge($this->file, ['length' => $this->n, 'md5' => $md5]);
+        $this->file = array_merge($this->file, ['length' => $this->length, 'md5' => $md5]);
         $this->bucket->fileInsert($this->file);
         return $this->file['_id'];
     }

src/GridFS/StreamWrapper.php

@@ -101,7 +101,9 @@ public function stream_open($path, $mode, $options, &$openedPath)
     }
 
     public function openWriteStream() {
-        $this->gridFsStream = new GridFsUpload($this->bucket, $this->identifier, []);
+        $context = stream_context_get_options($this->context);
+        $options =$context['gridfs']['uploadOptions'];
+        $this->gridFsStream = new GridFsUpload($this->bucket, $this->identifier, $options);
         return true;
     }