Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-13 07:33:46 +02:00
Code Issues Packages Projects Releases Activity

Flex SimpleStorage: added support for prefix (keeps items under nested array)

Browse Source
This commit is contained in:
Matias Griese
2020-02-06 10:34:39 +02:00
parent 5e9a7a112a
commit 10589e7940
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/src/Grav/Framework/Flex/Storage/SimpleStorage.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Grav\Framework\Flex\Storage;
use Grav\Common\Data\Data;
use Grav\Common\Filesystem\Folder;
use Grav\Framework\Filesystem\Filesystem;
use InvalidArgumentException;
@@ -25,6 +26,8 @@ class SimpleStorage extends AbstractFilesystemStorage
protected $dataFolder;
/** @var string */
protected $dataPattern;
/** @var string */
protected $prefix;
/** @var array */
protected $data;
/** @var int */
@@ -51,6 +54,7 @@ class SimpleStorage extends AbstractFilesystemStorage
$this->dataPattern = basename($pattern, $extension) . $extension;
$this->dataFolder = $filesystem->dirname($options['folder']);
$this->keyField = $options['key'] ?? 'storage_key';
$this->prefix = $options['prefix'] ?? null;
// Make sure that the data folder exists.
if (!file_exists($this->dataFolder)) {
@@ -376,7 +380,13 @@ class SimpleStorage extends AbstractFilesystemStorage
throw new \RuntimeException('Storage path is not defined');
}
$file = $this->getFile($path);
$file->save($this->data);
if ($this->prefix) {
$data = new Data($file->content());
$content = $data->set($this->prefix, $this->data)->toArray();
} else {
$content = $this->data;
}
$file->save($content);
$this->modified = (int)$file->modified(); // cast false to 0
$file->free();
} catch (\RuntimeException $e) {
@@ -409,7 +419,13 @@ class SimpleStorage extends AbstractFilesystemStorage
$file = $this->getFile($path);
$this->modified = (int)$file->modified(); // cast false to 0
$this->data = (array) $file->content();
$content = (array) $file->content();
if ($this->prefix) {
$data = new Data($content);
$content = $data->get($this->prefix);
}
$this->data = $content;
$list = [];
foreach ($this->data as $key => $info) {