mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make Appdata static 

* Add fileid for simpleroot folders (only internal)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-05-08 14:42:48 +02:00
parent 95592ff65c
commit 575dc29c27
No known key found for this signature in database
GPG Key ID: F941078878347C0C
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/private/Files/AppData/AppData.php
View File

@ -1,4 +1,5 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright 2016 Roeland Jago Douma <roeland@famdouma.nl> * @copyright 2016 Roeland Jago Douma <roeland@famdouma.nl>
* *
@ -31,6 +32,7 @@ use OC\SystemConfig;
use OCP\Files\Node; use OCP\Files\Node;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException; use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFolder;
class AppData implements IAppData { class AppData implements IAppData {
@ -55,7 +57,7 @@ class AppData implements IAppData {
*/ */
public function __construct(IRootFolder $rootFolder, public function __construct(IRootFolder $rootFolder,
SystemConfig $systemConfig, SystemConfig $systemConfig,
$appId) { string $appId) {
$this->rootFolder = $rootFolder; $this->rootFolder = $rootFolder;
$this->config = $systemConfig; $this->config = $systemConfig;
@ -66,7 +68,7 @@ class AppData implements IAppData {
* @return Folder * @return Folder
* @throws \RuntimeException * @throws \RuntimeException
*/ */
private function getAppDataFolder() { private function getAppDataFolder(): Folder {
if ($this->folder === null) { if ($this->folder === null) {
$instanceId = $this->config->getValue('instanceid', null); $instanceId = $this->config->getValue('instanceid', null);
if ($instanceId === null) { if ($instanceId === null) {
@ -101,20 +103,20 @@ class AppData implements IAppData {
return $this->folder; return $this->folder;
} }
public function getFolder($name) { public function getFolder(string $name): ISimpleFolder {
$node = $this->getAppDataFolder()->get($name); $node = $this->getAppDataFolder()->get($name);
/** @var Folder $node */ /** @var Folder $node */
return new SimpleFolder($node); return new SimpleFolder($node);
} }
public function newFolder($name) { public function newFolder(string $name): ISimpleFolder {
$folder = $this->getAppDataFolder()->newFolder($name); $folder = $this->getAppDataFolder()->newFolder($name);
return new SimpleFolder($folder); return new SimpleFolder($folder);
} }
public function getDirectoryListing() { public function getDirectoryListing(): array {
$listing = $this->getAppDataFolder()->getDirectoryListing(); $listing = $this->getAppDataFolder()->getDirectoryListing();
$fileListing = array_map(function(Node $folder) { $fileListing = array_map(function(Node $folder) {
@ -128,4 +130,8 @@ class AppData implements IAppData {
return array_values($fileListing); return array_values($fileListing);
} }
public function getId(): int {
return $this->getAppDataFolder()->getId();
}
} }

3
lib/private/Files/AppData/Factory.php
View File

@ -1,4 +1,5 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright 2016 Roeland Jago Douma <roeland@famdouma.nl> * @copyright 2016 Roeland Jago Douma <roeland@famdouma.nl>
* *
@ -44,7 +45,7 @@ class Factory {
* @param string $appId * @param string $appId
* @return AppData * @return AppData
*/ */
public function get($appId) { public function get(string $appId): AppData {
return new AppData($this->rootFolder, $this->config, $appId); return new AppData($this->rootFolder, $this->config, $appId);
} }
} }

6
lib/public/Files/SimpleFS/ISimpleRoot.php
View File

@ -42,7 +42,7 @@ interface ISimpleRoot {
* @throws \RuntimeException * @throws \RuntimeException
* @since 11.0.0 * @since 11.0.0
*/ */
public function getFolder($name); public function getFolder(string $name): ISimpleFolder;
/** /**
* Get all the Folders * Get all the Folders
@ -52,7 +52,7 @@ interface ISimpleRoot {
* @throws \RuntimeException * @throws \RuntimeException
* @since 11.0.0 * @since 11.0.0
*/ */
public function getDirectoryListing(); public function getDirectoryListing(): array;
/** /**
* Create a new folder named $name * Create a new folder named $name
@ -63,5 +63,5 @@ interface ISimpleRoot {
* @throws \RuntimeException * @throws \RuntimeException
* @since 11.0.0 * @since 11.0.0
*/ */
public function newFolder($name); public function newFolder(string $name): ISimpleFolder;
} }