⚡ even better caching (yaml)

bnomei · Mar 22, 2024 · 25fcdc0 · 25fcdc0
1 parent 151b5c4
commit 25fcdc0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 26 deletions.
diff --git a/classes/Blueprints/BlueprintCache.php b/classes/Blueprints/BlueprintCache.php
@@ -70,7 +70,10 @@ public static function get(string $key, $default = null, $expire = null): ?array
         $file = static::cacheFile($key);
 
         if ($file && static::exists($key, $expire)) {
-            return Json::read($file);
+            $data = Json::read($file);
+            //\Kirby\Cms\Blueprint::$loaded[$key] = $data;
+
+            return $data;
         }
 
         return $default;
@@ -88,22 +91,29 @@ public static function getKey(): string
         return 'bnomei.blueprints.cache.dir';
     }
 
-    /*
-    public static function preloadCachedBlueprints(): void
+    public static function preloadCachedBlueprints(): int
     {
+        $blueprints = [];
         foreach (Dir::dirs(static::cacheDir(), [], true) as $dir) {
             foreach (Dir::files($dir, [], true) as $file) {
                 if (! \Kirby\Toolkit\Str::endsWith($file, '.cache')) {
                     continue;
                 }
                 $key = str_replace([static::cacheDir().'/', '.cache'], ['', ''], $file);
+                /* this check would decrease performance
+                if (\Kirby\Toolkit\A::get(\Kirby\Cms\Blueprint::$loaded, $key)) {
+                    continue;
+                }*/
                 $blueprint = Json::read($file);
-                \Kirby\Cms\Blueprint::$loaded[$key] = $blueprint;
+                //\Kirby\Cms\Blueprint::$loaded[$key] = $blueprint;
+                $blueprints[$key] = $blueprint;
             }
         }
         // ray('preloaded', \Kirby\Cms\Blueprint::$loaded);
+        kirby()->extend(
+            ['blueprints' => $blueprints],
+        );
 
         return count(\Kirby\Cms\Blueprint::$loaded);
     }
-    */
 }
diff --git a/classes/Blueprints/Schema/Section.php b/classes/Blueprints/Schema/Section.php
@@ -35,7 +35,7 @@
  * @method self theme(string $text)
  *                                  // PAGES
  * @method self create(bool|array $create)
- * @method self status(string $status='all')
+ * @method self status(string $status = 'all')
  * @method self templates(array $templates)
  *                                          // STATS
  * @method self reports(string|array $reports)

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby-blueprints",
     "type": "kirby-plugin",
-    "version": "4.4.1",
+    "version": "4.4.2",
     "license": "MIT",
     "homepage": "https://github.com/bnomei/kirby3-blueprints",
     "description": "PHP Class-based Blueprints for Kirby CMS for better type safety and code completion",

diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -15,6 +15,7 @@
             // and use it on next request
             \Bnomei\Blueprints\BlueprintCache::rememberCacheDir();
             \Bnomei\Blueprints\Blueprint::loadPluginsAfter();
+            \Bnomei\Blueprints\BlueprintCache::preloadCachedBlueprints();
         },
     ],
 ]);
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby-blueprints',
-        'pretty_version' => '4.4.1',
-        'version' => '4.4.1.0',
+        'pretty_version' => '4.4.2',
+        'version' => '4.4.2.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby-blueprints' => array(
-            'pretty_version' => '4.4.1',
-            'version' => '4.4.1.0',
+            'pretty_version' => '4.4.2',
+            'version' => '4.4.2.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',