✨ added AUTOID Page/File method (in caps) that ensures object is in i…

…ndex Signed-off-by: Bruno Meilick <b@bnomei.com>
bnomei · Mar 18, 2020 · 4f338cc · 4f338cc
1 parent ea33c92
commit 4f338cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby3-autoid",
   "type": "kirby-plugin",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Automatic unique ID for Pages, Files and nested Structures including performant helpers to retrieve them. Bonus: Tiny-URL.",
   "license": "MIT",
   "authors": [

diff --git a/index.php b/index.php
@@ -65,23 +65,21 @@ function searchForTemplate(string $template, string $rootId = ''): \Kirby\Cms\Co
     ],
     'fileMethods' => [ // FILE
         'AUTOID' => function () { // casesensitive
-            if ($this->autoid()->isEmpty()) {
+            $db = \Bnomei\AutoIDDatabase::singleton();
+            if (! $db->exists($this->autoid())) {
                 \Bnomei\AutoID::push($this);
-                return \Bnomei\AutoIDDatabase::singleton()->findByID($this->id())->autoid();
+                return $db->findByID($this->id())->autoid();
             }
-            /** @var \Kirby\Cms\Page $this */
-
             return $this->autoid()->value();
         },
     ],
     'pageMethods' => [ // PAGE
         'AUTOID' => function () { // casesensitive
-            if ($this->autoid()->isEmpty()) {
+            $db = \Bnomei\AutoIDDatabase::singleton();
+            if (! $db->exists($this->autoid())) {
                 \Bnomei\AutoID::push($this);
-                return \Bnomei\AutoIDDatabase::singleton()->findByID($this->id())->autoid();
+                return $db->findByID($this->id())->autoid();
             }
-            /** @var \Kirby\Cms\Page $this */
-
             return $this->autoid()->value();
         },
         'tinyurl' => function (): string {