MERGE: Merge branch '1.x' into master

flownative · Jan 10, 2018 · 68b7b3c · 68b7b3c
2 parents 62fd5a9 + c480fef
commit 68b7b3c
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/Classes/S3Target.php b/Classes/S3Target.php
@@ -11,6 +11,7 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\ResourceManagement\CollectionInterface;
 use Neos\Flow\ResourceManagement\Exception;
+use TYPO3\Flow\Resource\Publishing\MessageCollector;
 use Neos\Flow\ResourceManagement\PersistentResource;
 use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Flow\ResourceManagement\ResourceMetaDataInterface;
@@ -78,6 +79,12 @@ class S3Target implements TargetInterface
      */
     protected $systemLogger;
 
+    /**
+     * @Flow\Inject
+     * @var MessageCollector
+     */
+    protected $messageCollector;
+
     /**
      * @Flow\Inject
      * @var ResourceManager
@@ -158,10 +165,11 @@ public function getKeyPrefix()
      * Publishes the whole collection to this target
      *
      * @param \Neos\Flow\ResourceManagement\CollectionInterface $collection The collection to publish
+     * @param callable $callback Function called after each resource publishing
      * @return void
      * @throws Exception
      */
-    public function publishCollection(CollectionInterface $collection)
+    public function publishCollection(CollectionInterface $collection, callable $callback = null)
     {
         if (!isset($this->existingObjectsInfo)) {
             $this->existingObjectsInfo = array();
@@ -175,7 +183,7 @@ public function publishCollection(CollectionInterface $collection)
                 $result = $this->s3Client->listObjects($requestArguments);
                 $this->existingObjectsInfo[] = $result->get('Contents');
                 if ($result->get('IsTruncated')) {
-                    $requestArguments['marker'] = $result->get('NextMarker');
+                    $requestArguments['Marker'] = $result->get('NextMarker');
                 }
             } while ($result->get('IsTruncated'));
         }
@@ -188,7 +196,7 @@ public function publishCollection(CollectionInterface $collection)
             if ($storageBucketName === $this->bucketName && $storage->getKeyPrefix() === $this->keyPrefix) {
                 throw new Exception(sprintf('Could not publish collection %s because the source and target S3 bucket is the same, with identical key prefixes. Either choose a different bucket or at least key prefix for the target.', $collection->getName()), 1428929137);
             }
-            foreach ($collection->getObjects() as $object) {
+            foreach ($collection->getObjects($callback) as $object) {
                 /** @var \Neos\Flow\ResourceManagement\Storage\StorageObject $object */
                 $objectName = $this->keyPrefix . $this->getRelativePublicationPathAndFilename($object);
                 $options = array(
@@ -202,7 +210,10 @@ public function publishCollection(CollectionInterface $collection)
                 try {
                     $this->s3Client->copyObject($options);
                 } catch (S3Exception $e) {
-                    throw new Exception(sprintf('Could not copy resource with SHA1 hash %s of collection %s from bucket %s to %s: %s', $object->getSha1(), $collection->getName(), $storageBucketName, $this->bucketName, $e->getMessage()), 1431009234);
+                    $message = sprintf('Could not copy resource with SHA1 hash %s of collection %s from bucket %s to %s: %s', $object->getSha1(), $collection->getName(), $storageBucketName, $this->bucketName, $e->getMessage());
+                    $this->systemLogger->logException($e);
+                    $this->messageCollector->append($message);
+                    continue;
                 }
                 $this->systemLogger->log(sprintf('Successfully copied resource as object "%s" (MD5: %s) from bucket "%s" to bucket "%s"', $objectName, $object->getMd5() ?: 'unknown', $storageBucketName, $this->bucketName), LOG_DEBUG);
                 unset($obsoleteObjects[$this->getRelativePublicationPathAndFilename($object)]);
@@ -231,7 +242,11 @@ public function publishCollection(CollectionInterface $collection)
      */
     public function getPublicStaticResourceUri($relativePathAndFilename)
     {
-        return $this->s3Client->getObjectUrl($this->bucketName, $this->keyPrefix . $relativePathAndFilename);
+        if ($this->baseUri != '') {
+            return $this->baseUri . $relativePathAndFilename;
+        } else {
+            return $this->s3Client->getObjectUrl($this->bucketName, $this->keyPrefix . $relativePathAndFilename);
+        }
     }
 
     /**
@@ -263,12 +278,16 @@ public function publishResource(PersistentResource $resource, CollectionInterfac
                 $this->s3Client->copyObject($options);
                 $this->systemLogger->log(sprintf('Successfully published resource as object "%s" (MD5: %s) by copying from bucket "%s" to bucket "%s"', $objectName, $resource->getMd5() ?: 'unknown', $storage->getBucketName(), $this->bucketName), LOG_DEBUG);
             } catch (S3Exception $e) {
-                throw new Exception(sprintf('Could not publish resource with SHA1 hash %s of collection %s (source object: %s) through "CopyObject" because the S3 client reported an error: %s', $resource->getSha1(), $collection->getName(), $sourceObjectArn, $e->getMessage()), 1428999574);
+                $message = sprintf('Could not publish resource with SHA1 hash %s of collection %s (source object: %s) through "CopyObject" because the S3 client reported an error: %s', $resource->getSha1(), $collection->getName(), $sourceObjectArn, $e->getMessage()));
+                $this->systemLogger->logException($e);
+                $this->messageCollector->append($message);
             }
         } else {
             $sourceStream = $resource->getStream();
             if ($sourceStream === false) {
-                throw new Exception(sprintf('Could not publish resource with SHA1 hash %s of collection %s because there seems to be no corresponding data in the storage.', $resource->getSha1(), $collection->getName()), 1428929649);
+                $message = sprintf('Could not publish resource with SHA1 hash %s of collection %s because there seems to be no corresponding data in the storage.', $resource->getSha1(), $collection->getName();
+                $this->messageCollector->append($message);
+                return;
             }
             $this->publishFile($sourceStream, $this->getRelativePublicationPathAndFilename($resource), $resource);
         }