Set directories depth in configuration

Author: antonsacred

composer.json

@@ -4,10 +4,7 @@
     "autoload": {
         "psr-0": {
             "Barberry": "library/"
-        },
-        "files": [
-            "library/Barberry/functions.php"
-        ]
+        }
     },
     "require": {
         "php": ">=7.4",

library/Barberry/Cache.php

@@ -7,9 +7,11 @@
 class Cache {
 
     private Filesystem $filesystem;
+    private Destination $destination;
 
-    public function __construct(Filesystem $filesystem) {
+    public function __construct(Filesystem $filesystem, Destination $destination) {
         $this->filesystem = $filesystem;
+        $this->destination = $destination;
     }
 
     /**
@@ -27,7 +29,7 @@ public function save($streamOrContent, Request $request): string
 
     public function invalidate($id): void
     {
-        $path  = nonlinear\generateDestination($id);
+        $path  = $this->destination->generate($id);
         if ($this->directoryExists($path)) {
             $this->filesystem->deleteDirectory($path);
         }
@@ -65,7 +67,7 @@ private function filePath(Request $request): string
             return $file;
         }
 
-        return nonlinear\generateDestination($request->id) . $file;
+        return $this->destination->generate($request->id) . $file;
     }
 
     private static function directoryByRequest(Request $request): string

library/Barberry/Config.php

@@ -13,6 +13,7 @@ class Config
     private string $applicationPath;
     public FilesystemAdapter $storageAdapter;
     public FilesystemAdapter $cacheAdapter;
+    private int $depth = 3;
 
     /**
      * When you pass null, by default will be used ../public/cache/ and ../usr/storage/ locations
@@ -46,4 +47,14 @@ private function setDefaultValues(): void
         $this->directoryCache = $this->applicationPath . '/public/cache/';
         $this->directoryStorage = $this->applicationPath . '/usr/storage/';
     }
+
+    public function setDepth(int $depth): void
+    {
+        $this->depth = $depth;
+    }
+
+    public function getDepth(): int
+    {
+        return $this->depth;
+    }
 }

library/Barberry/Destination.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Barberry;
+
+class Destination
+{
+    private int $depth;
+    private int $len;
+
+    public function __construct(int $depth = 3, int $len = 2) {
+        $this->depth = $depth;
+        $this->len = $len;
+    }
+
+    public function generate(string $hash): string
+    {
+        $start = 0;
+        $d = $this->depth;
+        $dir = [];
+
+        while ($d-- > 0) {
+            $dir[] = substr($hash, $start, $this->len);
+            $start += $this->len;
+        }
+        return self::als(implode(DIRECTORY_SEPARATOR, $dir));
+    }
+
+    private static function als($path): string
+    {
+        return rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+    }
+}

library/Barberry/Resources.php

@@ -18,6 +18,7 @@ class Resources
      * @var Filter\FilterInterface
      */
     private $filter;
+    private Destination $destination;
 
     /**
      * @param Config $config
@@ -27,6 +28,7 @@ public function __construct(Config $config, Filter\FilterInterface $filter = nul
     {
         $this->config = $config;
         $this->filter = $filter;
+        $this->destination = new Destination($config->getDepth());
     }
 
     /**
@@ -38,7 +40,7 @@ public function cache()
         return $this->getResource(
             __FUNCTION__,
             function () use ($config) {
-                return new Cache(new Filesystem($config->cacheAdapter));
+                return new Cache(new Filesystem($config->cacheAdapter), $this->destination);
             }
         );
     }
@@ -52,7 +54,7 @@ public function storage()
         return $this->getResource(
             __FUNCTION__,
             function () use ($config) {
-                return new Storage\File(new Filesystem($config->storageAdapter));
+                return new Storage\File(new Filesystem($config->storageAdapter), $this->destination);
             }
         );
     }

library/Barberry/Storage/File.php

@@ -2,8 +2,7 @@
 namespace Barberry\Storage;
 
 use Barberry\ContentType;
-use Barberry\fs;
-use Barberry\nonlinear;
+use Barberry\Destination;
 use GuzzleHttp\Psr7\UploadedFile;
 use GuzzleHttp\Psr7\Utils;
 use League\Flysystem\Filesystem;
@@ -12,10 +11,12 @@
 class File implements StorageInterface
 {
     private Filesystem $filesystem;
+    private Destination $destination;
 
-    public function __construct(Filesystem $filesystem)
+    public function __construct(Filesystem $filesystem, Destination $destination)
     {
         $this->filesystem = $filesystem;
+        $this->destination = $destination;
     }
 
     /**
@@ -93,7 +94,7 @@ private function filePathById($id)
             return $id;
         }
 
-        return nonlinear\generateDestination($id) . $id;
+        return $this->destination->generate($id) . $id;
     }
 
     private function generateUniqueId(): string

library/Barberry/functions.php

@@ -60,6 +60,6 @@ public function testInvalidateRemovesCachedContent(): void
 
     private function cache(): Cache
     {
-        return new Cache(new Filesystem(new LocalFilesystemAdapter($this->cache_path)));
+        return new Cache(new Filesystem(new LocalFilesystemAdapter($this->cache_path)), new Destination());
     }
 }

test/integration/CacheTest.php

@@ -2,9 +2,8 @@
 
 namespace Barberry\Storage;
 
-use Barberry\nonlinear;
+use Barberry\Destination;
 use Barberry\Test;
-use Barberry\fs;
 use GuzzleHttp\Psr7\UploadedFile;
 use GuzzleHttp\Psr7\Utils;
 use League\Flysystem\Filesystem;
@@ -46,7 +45,9 @@ public function testIsFileSavedInNonLinearStructure(): void
             new UploadedFile(Utils::tryFopen(__DIR__ . '/../data/1x1.gif', 'r'), 43, UPLOAD_ERR_OK)
         );
 
-        $path = $this->storage_path . nonlinear\generateDestination($id);
+        $destination = new Destination();
+
+        $path = $this->storage_path . $destination->generate($id);
         self::assertCount(5, array_filter(explode(DIRECTORY_SEPARATOR, $path), function($item) { return !empty($item); }));
 
         $content = file_get_contents($path . $id);
@@ -104,7 +105,7 @@ public function testCanDefineContentType(): void{
 
     private function storage(): File
     {
-        return new File(new Filesystem(new LocalFilesystemAdapter($this->storage_path)));
+        return new File(new Filesystem(new LocalFilesystemAdapter($this->storage_path)), new Destination());
     }
 
     private static function rmDirRecursive(string $dir): void {

test/integration/Storage/FileTest.php

@@ -28,15 +28,15 @@ public function setUp(): void
      */
     public function testConvertsUriToFilePath(string $uri, string $expectedPath): void
     {
-        $cache = new Cache(self::$filesystem);
+        $cache = new Cache(self::$filesystem, new Destination());
         $cache->save('123', new Request($uri));
 
         self::assertTrue(self::$filesystem->fileExists($expectedPath));
     }
 
     public function testStreamDataCanBeSaved(): void
     {
-        $cache = new Cache(self::$filesystem);
+        $cache = new Cache(self::$filesystem, new Destination());
         $cache->save(Utils::streamFor('Cached content'), new Request('/a1b2c3d4.gif'));
 
         self::assertEquals('Cached content', self::$filesystem->read('a1/b2/c3/a1b2c3d4/a1b2c3d4.gif'));