🐛 un-/lock handling

classes/Nitro.php

@@ -55,10 +55,10 @@ public function dir(): DirInventory
         return $this->dirInventory;
     }
 
-    public function cache(): SingleFileCache
+    public function cache(array $options = []): SingleFileCache
     {
-        if (! $this->singleFileCache) {
-            $this->singleFileCache = new SingleFileCache($this->options);
+        if (! $this->singleFileCache || ! empty($options)) {
+            $this->singleFileCache = new SingleFileCache($this->options + $options);
         }
 
         return $this->singleFileCache;

classes/Nitro/SingleFileCache.php

@@ -31,6 +31,8 @@ public function __construct(array $options = [])
             'debug' => option('debug'),
         ], $options);
 
+        $this->atomic();
+
         $data = F::exists($this->file()) ? F::read($this->file()) : null;
         $data = $data ? json_decode($data, true) : null;
         if (is_array($data)) {
@@ -40,8 +42,6 @@ public function __construct(array $options = [])
         if ($this->options['auto-clean-cache']) {
             $this->clean();
         }
-
-        $this->atomic();
     }
 
     public function __destruct()
@@ -174,6 +174,11 @@ protected function file(?string $key = null): string
 
     public function write(bool $lock = true): bool
     {
+        // if is atomic but has no file, don't write
+        if ($this->options['atomic'] && ! F::exists($this->file().'.lock')) {
+            return false;
+        }
+
         $this->unlock();
 
         if ($this->isDirty === 0) {

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby-nitro",
     "type": "kirby-plugin",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "Nitro speeds up the loading of content in your Kirby project.",
     "license": "MIT",
     "authors": [

index.php

@@ -76,7 +76,7 @@ function nitro(): \Bnomei\Nitro
             'command' => static function ($cli): void {
 
                 $cli->out('🛼 Unlocking...');
-                $success = nitro()->cache()->unlock();
+                $success = nitro()->cache(['atomic' => false, 'auto-clean-cache' => false])->unlock();
                 $success ? $cli->success('🔓 Unlocked.') : $cli->error('❌ Failed.');
 
                 // the flush is necessary as the current instance might not have valid data anymore

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby-nitro',
-        'pretty_version' => '2.0.0',
-        'version' => '2.0.0.0',
+        'pretty_version' => '2.0.1',
+        'version' => '2.0.1.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby-nitro' => array(
-            'pretty_version' => '2.0.0',
-            'version' => '2.0.0.0',
+            'pretty_version' => '2.0.1',
+            'version' => '2.0.1.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',