Merge pull request #47 from grebaldi/feature/proxySubDirectory

FEATURE: Allow optional key on resourceProxy configuration
sitegeist · Feb 23, 2021 · 6e08442 · 6e08442
2 parents 23568a7 + 6bcff06
commit 6e08442
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Classes/ResourceManagement/ProxyAwareWritableFileSystemStorage.php b/Classes/ResourceManagement/ProxyAwareWritableFileSystemStorage.php
@@ -64,12 +64,13 @@ public function getStreamByResource(PersistentResource $resource)
         $browser = new Browser();
         $browser->setRequestEngine($curlEngine);
 
+        $subDirectory = $resourceProxyConfiguration['subDirectory'] ?? '_Resources/Persistent/';
         $subdivideHashPathSegment = $resourceProxyConfiguration['subdivideHashPathSegment'] ?? false;
         if ($subdivideHashPathSegment) {
             $sha1Hash = $resource->getSha1();
-            $uri = $resourceProxyConfiguration['baseUri'] .'/_Resources/Persistent/' . $sha1Hash[0] . '/' . $sha1Hash[1] . '/' . $sha1Hash[2] . '/' . $sha1Hash[3] . '/' . $sha1Hash . '/' . rawurlencode($resource->getFilename());
+            $uri = $resourceProxyConfiguration['baseUri'] . '/' . $subDirectory . $sha1Hash[0] . '/' . $sha1Hash[1] . '/' . $sha1Hash[2] . '/' . $sha1Hash[3] . '/' . $sha1Hash . '/' . rawurlencode($resource->getFilename());
         } else {
-            $uri = $resourceProxyConfiguration['baseUri'] .'/_Resources/Persistent/' . $resource->getSha1() . '/' . rawurlencode($resource->getFilename());
+            $uri = $resourceProxyConfiguration['baseUri'] . '/' . $subDirectory . $resource->getSha1() . '/' . rawurlencode($resource->getFilename());
         }
 
         $response = $browser->request($uri);

diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -40,6 +40,7 @@ Sitegeist:
 #        # and instead resources are fetched and imported on the fly once read
 #        resourceProxy:
 #          baseUri: http://vour.server.tld
+#          subDirectory: _Resources/Persistent/
 #          subdivideHashPathSegment: false
 #          curlOptions:
 #            CURLOPT_USERPWD: very:secure

diff --git a/README.md b/README.md
@@ -72,6 +72,8 @@ Sitegeist:
         # and instead resources are fetched and imported on the fly once read
         resourceProxy:
           baseUri: http://vour.server.tld
+          # define an optional subDirectory (defaults to: '_Resources/Persistent/', trailing slash is required!)
+          subDirectory: '_Resources/Persistent/'
           # define wether or not the remote uses subdivideHashPathSegments
           subdivideHashPathSegment: false
           # curl options