Merge branch '1.0'

flownative · Mar 14, 2017 · c326dda · c326dda
2 parents abc9c37 + 5f8669e
commit c326dda
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Classes/Command/GcsCommandController.php b/Classes/Command/GcsCommandController.php
@@ -51,7 +51,8 @@ public function connectCommand($bucket)
 
         $postBody = [
             'data' => 'test',
-            'uploadType' => 'media'
+            'uploadType' => 'media',
+            'mimeType' => 'text/plain'
         ];
 
         $this->outputLine('Writing test object into bucket (%s) ...', [$bucket]);

diff --git a/Classes/GcsStorage.php b/Classes/GcsStorage.php
@@ -220,7 +220,8 @@ public function importResourceFromContent($content, $collectionName)
         $storageObject->setName($this->keyPrefix . $sha1Hash);
         $storageObject->setSize($resource->getFileSize());
 
-        $this->storageService->objects->insert($this->bucketName, $storageObject, ['data' => $content, 'uploadType' => 'media']);
+        $this->storageService->objects->insert($this->bucketName, $storageObject,
+            ['data' => $content, 'uploadType' => 'media', 'mimeType' => $resource->getMediaType()]);
 
         return $resource;
     }
@@ -270,7 +271,8 @@ public function importUploadedResource(array $uploadInfo, $collectionName)
 
         $postBody = [
             'data' => file_get_contents($newSourcePathAndFilename),
-            'uploadType' => 'media'
+            'uploadType' => 'media',
+            'mimeType' => $resource->getMediaType()
         ];
 
         $this->storageService->objects->insert($this->bucketName, $storageObject, $postBody);
@@ -447,7 +449,7 @@ protected function importTemporaryFile($temporaryPathAndFilename, $collectionNam
             $storageObject->setName($this->keyPrefix . $sha1Hash);
             $storageObject->setSize($resource->getFileSize());
 
-            $this->storageService->objects->insert($this->bucketName, $storageObject, ['data' => file_get_contents($temporaryPathAndFilename), 'uploadType' => 'media']);
+            $this->storageService->objects->insert($this->bucketName, $storageObject, ['data' => file_get_contents($temporaryPathAndFilename), 'uploadType' => 'media', 'mimeType' => $resource->getMediaType()]);
             $this->systemLogger->log(sprintf('Successfully imported resource as object "%s" into bucket "%s" with MD5 hash "%s"', $sha1Hash, $this->bucketName, $resource->getMd5() ?: 'unknown'), LOG_INFO);
         } else {
             $this->systemLogger->log(sprintf('Did not import resource as object "%s" into bucket "%s" because that object already existed.', $sha1Hash, $this->bucketName), LOG_INFO);

diff --git a/Classes/GcsTarget.php b/Classes/GcsTarget.php
@@ -203,7 +203,8 @@ public function publishCollection(CollectionInterface $collection)
                 $storageObject->setCacheControl('public, max-age=1209600');
 
                 $parameters = [
-                    'destinationPredefinedAcl' => 'publicRead'
+                    'destinationPredefinedAcl' => 'publicRead',
+                    'mimeType' => $object->getMediaType()
                 ];
                 try {
                     $this->storageService->objects->copy($storageBucketName, $storage->getKeyPrefix() . $object->getSha1(), $this->bucketName, $objectName, $storageObject, $parameters);
@@ -268,7 +269,8 @@ public function publishResource(PersistentResource $resource, CollectionInterfac
             $storageObject->setCacheControl('public, max-age=1209600');
 
             $parameters = [
-                'destinationPredefinedAcl' => 'publicRead'
+                'destinationPredefinedAcl' => 'publicRead',
+                'mimeType' => $resource->getMediaType()
             ];
             try {
                 $this->storageService->objects->copy($storage->getBucketName(), $storage->getKeyPrefix() . $resource->getSha1(), $this->bucketName, $objectName, $storageObject, $parameters);
@@ -345,7 +347,8 @@ protected function publishFile($sourceStream, $relativeTargetPathAndFilename, Re
             $parameters = [
                 'data' => stream_get_contents($sourceStream),
                 'uploadType' => 'media',
-                'predefinedAcl' => 'publicRead'
+                'predefinedAcl' => 'publicRead',
+                'mimeType' => $metaData->getMediaType()
             ];
 
             $this->storageService->objects->insert($this->bucketName, $storageObject, $parameters);