Resolved #41 set cache adapter

dframe · Sep 8, 2022 · d179009 · d179009
1 parent 34ab03b
commit d179009
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/examples/example1/app/Config/fileStorage.php b/examples/example1/app/Config/fileStorage.php
@@ -72,6 +72,7 @@
         'web' => $web
     ],
     'cache' => [
+        'adapter' => 'cache',
         'life' => 600 // in seconds
     ],
     'publicUrls' => [

diff --git a/examples/example2/Config/fileStorage.php b/examples/example2/Config/fileStorage.php
@@ -13,5 +13,12 @@
         'local' => $local,
         'cache' => $cache,
         'web' => $web
+    ],
+    'cache' => [
+        'adapter' => 'cache',
+        'life' => 600 // in seconds
+    ],
+    'publicUrls' => [
+        'local' => ''
     ]
 ];
diff --git a/src/Image.php b/src/Image.php
@@ -77,7 +77,7 @@ public function __construct($driver, $config)
     {
         $this->config = $config;
         $adapters = $config['adapters'];
-        $cache = $config['cache'] ?? ['life' => 600];
+        $cache = $config['cache'] ?? ['life' => 600, 'adapter' => 'cache'];
 
         $this->cache = $cache;
         $this->manager = new MountManager($adapters);
@@ -163,6 +163,7 @@ protected function createCachePath($originalImage, $output = [])
         return str_replace($basename, rtrim($originalImage, '.' . $ext), $cache);
     }
 
+
     /**
      * @param      $adapter
      * @param      $originalImage
@@ -178,7 +179,7 @@ public function cache($adapter, $originalImage, $default = false)
 
         $cache = $this->createCachePath($originalImage, $output);
 
-        $cacheAdapter = 'cache://' . $cache;
+        $cacheAdapter = $cache['adapter'] ?? 'cache' . '://' . $cache;
         $sourceAdapter = $adapter . '://' . $originalImage;
 
         $has = $this->manager->has($cacheAdapter);

diff --git a/src/Storage.php b/src/Storage.php
@@ -141,8 +141,8 @@ public function drop($adapter, $file)
          */
         if (!empty($get['cache'])) {
             foreach ($get['cache'] as $key => $value) {
-                if ($this->manager->has($adapter . '://' . $value['file_cache_path'])) {
-                    $this->manager->delete($adapter . '://' . $value['file_cache_path']);
+                if ($this->manager->has($value['file_cache_adapter'] . '://' . $value['file_cache_path'])) {
+                    $this->manager->delete($value['file_cache_adapter'] . '://' . $value['file_cache_path']);
                 }
             }
         }