fixed cache

Signed-off-by: Bruno Meilick <[email protected]>

Author: bnomei

classes/fingerprint.php

@@ -64,16 +64,17 @@ public static function process($file)
             kirby()->cache('bnomei.fingerprint')->flush();
         }
 
-        $lookup = kirby()->cache('bnomei.fingerprint')->get('lookup');
+        $cacheWithVersion = 'lookup' . str_replace('.','', kirby()->plugin('bnomei/fingerprint')->version());
+        $lookup = kirby()->cache('bnomei.fingerprint')->get($cacheWithVersion);
         if (!$lookup) {
             $lookup = [];
             $needsPush = true;
         }
         if (is_a($file, 'Kirby\CMS\File')) {
-            $key = $file->id();
-            $root = $file->root();
+            $key = (string)$file->id();
+            $root = (string)$file->root();
             $mod = \filemtime($root);
-            $url = $file->url();
+            $url = (string)$file->url();
         } elseif (!\Kirby\Toolkit\V::url($file)) {
             $key = ltrim($file, '/');
             $root = kirby()->roots()->index() . DIRECTORY_SEPARATOR . $key;
@@ -89,6 +90,8 @@ public static function process($file)
             if ($mod && $lookup[$key]['modified'] < $mod) {
                 $needsPush = true;
             }
+        } else {
+            $needsPush = true;
         }
 
         if ($needsPush) {
@@ -102,7 +105,8 @@ public static function process($file)
                 $lookup[$key]['integrity'] = static::sriFile($file);
                 $lookup[$key]['hash'] = static::hashFile($file);
             }
-            kirby()->cache('bnomei.fingerprint')->set('lookup', $lookup);
+            
+            kirby()->cache('bnomei.fingerprint')->set($cacheWithVersion, $lookup);
         }
 
         return \Kirby\Toolkit\A::get($lookup, $key);

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby3-fingerprint",
     "type": "plugin",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "description": "File Method and css/js helper to add cachbusting hash and optional Subresource Integrity to file",
     "license": "MIT",
     "autoload": {

composer.lock

@@ -12,9 +12,13 @@
                 \Kirby\Toolkit\F::name($fileroot),
                 \Kirby\Toolkit\F::extension($fileroot) . '?v=' . \filemtime($fileroot)
             ]);
-            $dirname = \dirname($fileroot);
 
-            $url = ($dirname === '.') ? $filename : ($dirname . '/' . $filename);
+            if(is_a($file, 'Kirby\Cms\File')) {
+                $url = str_replace($file->filename(), $filename, $file->url());
+            } else {
+                $dirname = str_replace(kirby()->roots()->index(), '', \dirname($fileroot));
+                $url = ($dirname === '.') ? $filename : ($dirname . '/' . $filename);
+            }
         } else {
             $url = $file;
         }