API-alignment, metadata-key

CHANGELOG.md

@@ -1,3 +1,14 @@
+# v3.1.0
+## 10-04-2021
+
+1. [](#improved)
+    * API-alignment to use `Grav\Common\Page\Interfaces\PageInterface`, transparently
+    * Code cleanup
+2. [](#new)
+    * Revert content index-location to `user://data/persist`
+3. [](#bugfix)
+    * Correct key in indexed metadata
+
 # v3.0.0
 ## 07-03-2021
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Static Generator
-version: 3.0.0
+version: 3.1.0
 slug: static-generator
 type: plugin
 description: Static generation of Page(s) and Index.

classes/Collection.php

@@ -15,15 +15,10 @@
 namespace Grav\Plugin\StaticGenerator;
 
 use Grav\Common\Grav;
-use Grav\Common\Plugin;
 use Grav\Common\Utils;
-use Grav\Common\Page\Page;
-use Grav\Common\Page\Media;
-use Grav\Common\Page\Header;
-use RocketTheme\Toolbox\Event\Event;
+use Grav\Common\Page\Interfaces\PageInterface as Page;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 

classes/Collection/AbstractCollection.php

@@ -17,7 +17,7 @@
 
 use Grav\Common\Grav;
 use Grav\Common\Utils;
-use Grav\Common\Page\Page;
+use Grav\Common\Page\Interfaces\PageInterface as Page;
 use Grav\Common\Page\Collection;
 use Grav\Plugin\StaticGenerator\Collection\CollectionInterface;
 use Grav\Plugin\StaticGenerator\Config\Config;

classes/Collection/CollectionInterface.php

@@ -15,7 +15,7 @@
 
 namespace Grav\Plugin\StaticGenerator\Collection;
 
-use Grav\Common\Page\Page;
+use Grav\Common\Page\Interfaces\PageInterface as Page;
 
 /**
  * Collection Interface

classes/Data/AbstractData.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Static Generator Plugin, Abstract Data Builder
  *
@@ -11,11 +12,11 @@
  * @license    http://www.opensource.org/licenses/mit-license.html MIT License
  * @link       https://github.com/OleVik/grav-plugin-static-generator
  */
+
 namespace Grav\Plugin\StaticGenerator\Data;
 
 use Grav\Common\Grav;
-use Grav\Common\Page\Page;
-use Grav\Console\ConsoleCommand;
+use Grav\Common\Page\Interfaces\PageInterface as Page;
 use Grav\Plugin\StaticGenerator\Data\DataInterface;
 
 /**

classes/Data/DataInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Static Generator Plugin, Data Builder Interface
  *
@@ -11,9 +12,10 @@
  * @license    http://www.opensource.org/licenses/mit-license.html MIT License
  * @link       https://github.com/OleVik/grav-plugin-static-generator
  */
+
 namespace Grav\Plugin\StaticGenerator\Data;
 
-use Grav\Common\Page\Page;
+use Grav\Common\Page\Interfaces\PageInterface as Page;
 
 /**
  * Data Builder Interface

classes/Data/SSEData.php

@@ -212,7 +212,11 @@ public function teardown(string $location, string $slug, array $data, Timer $Tim
         if ($Storage->doHas($file)) {
             $Storage->doDelete($file);
         }
-        $Storage->doSet($file, 'const GravDataIndex = ' . json_encode($data) . ';', 0);
+        if ($this->content) {
+            $Storage->doSet($file, 'const GravDataIndex = ' . json_encode($data) . ';', 0);
+        } else {
+            $Storage->doSet($file, 'const GravMetadataIndex = ' . json_encode($data) . ';', 0);
+        }
         $message = ucfirst(
             $this->grav['language']->translate(
                 ['PLUGIN_STATIC_GENERATOR.ADMIN.GENERIC.STORED']

classes/Source/Source.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Static Generator Plugin, Source Manipulator
  *
@@ -11,12 +12,10 @@
  * @license    http://www.opensource.org/licenses/mit-license.html MIT License
  * @link       https://github.com/OleVik/grav-plugin-static-generator
  */
+
 namespace Grav\Plugin\StaticGenerator\Source;
 
 use Grav\Common\Utils;
-use Grav\Common\Page\Page;
-use Grav\Common\Page\Pages;
-use Grav\Common\Page\Media;
 
 /**
  * Source Manipulator

static-generator.php

@@ -19,8 +19,6 @@
 use Grav\Common\Plugin;
 use Grav\Common\Utils;
 use Grav\Common\Inflector;
-use Grav\Common\Page\Pages;
-use Grav\Common\Page\Page;
 use Grav\Framework\File\YamlFile;
 use Grav\Framework\File\Formatter\YamlFormatter;
 use RocketTheme\Toolbox\Event\Event;

static-generator.yaml

@@ -1,6 +1,6 @@
 enabled: true
 index: "user://data/persist"
-content: "user://data/persist/static"
+content: "user://data/persist"
 content_max_length: 100000
 content_permissions:
   - admin.super