X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FStorage.php;h=d5af7c51356ece6e33f3f1e0ed1e429544050720;hb=7921766c59c1050737ff7fed7c242257e866d149;hp=30b5567823c7acd0bd9d2b5d82d49100d4250f7e;hpb=c9cce8492e5b2607b2a092474d1de4d188b7a2c9;p=friendica.git

diff --git a/src/Console/Storage.php b/src/Console/Storage.php
index 30b5567823..d5af7c5135 100644
--- a/src/Console/Storage.php
+++ b/src/Console/Storage.php
@@ -1,18 +1,51 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use Friendica\Core\StorageManager;
+use Friendica\Core\Storage\Repository\StorageManager;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
 
 /**
- * @brief tool to manage storage backend and stored data from CLI
- *
+ * tool to manage storage backend and stored data from CLI
  */
 class Storage extends \Asika\SimpleConsole\Console
 {
 	protected $helpOptions = ['h', 'help', '?'];
 
+	/** @var StorageManager */
+	private $storageManager;
+
+	/**
+	 * @param StorageManager $storageManager
+	 */
+	public function __construct(StorageManager $storageManager, array $argv = [])
+	{
+		parent::__construct($argv);
+
+		$this->storageManager = $storageManager;
+	}
+
 	protected function getHelp()
 	{
 		$help = <<<HELP
@@ -69,13 +102,13 @@ HELP;
 	protected function doList()
 	{
 		$rowfmt = ' %-3s | %-20s';
-		$current = StorageManager::getBackend();
+		$current = $this->storageManager->getBackend();
 		$this->out(sprintf($rowfmt, 'Sel', 'Name'));
 		$this->out('-----------------------');
 		$isregisterd = false;
-		foreach (StorageManager::listBackends() as $name => $class) {
+		foreach ($this->storageManager->listBackends() as $name) {
 			$issel = ' ';
-			if ($current === $class) {
+			if ($current && $current::getName() == $name) {
 				$issel = '*';
 				$isregisterd = true;
 			};
@@ -95,29 +128,28 @@ HELP;
 
 	protected function doSet()
 	{
-		if (count($this->args) !== 2) {
+		if (count($this->args) !== 2 || empty($this->args[1])) {
 			throw new CommandArgsException('Invalid arguments');
 		}
 
 		$name = $this->args[1];
-		$class = StorageManager::getByName($name);
+		try {
+			$class = $this->storageManager->getWritableStorageByName($name);
 
-		if ($class === '') {
+			if (!$this->storageManager->setBackend($class)) {
+				$this->out($class . ' is not a valid backend storage class.');
+				return -1;
+			}
+		} catch (ReferenceStorageException $exception) {
 			$this->out($name . ' is not a registered backend.');
 			return -1;
 		}
 
-		if (!StorageManager::setBackend($class)) {
-			$this->out($class . ' is not a valid backend storage class.');
-			return -1;
-		}
-
 		return 0;
 	}
 
 	protected function doMove()
 	{
-		$tables = null;
 		if (count($this->args) < 1 || count($this->args) > 2) {
 			throw new CommandArgsException('Invalid arguments');
 		}
@@ -128,13 +160,19 @@ HELP;
 				throw new CommandArgsException('Invalid table');
 			}
 			$tables = [$table];
+		} else {
+			$tables = StorageManager::TABLES;
 		}
 
-		$current = StorageManager::getBackend();
+		$current = $this->storageManager->getBackend();
 		$total = 0;
 
+		if (is_null($current)) {
+			throw new StorageException(sprintf("Cannot move to legacy storage. Please select a storage backend."));
+		}
+
 		do {
-			$moved = StorageManager::move($current, $tables, $this->getOption('n', 5000));
+			$moved = $this->storageManager->move($current, $tables, $this->getOption('n', 5000));
 			if ($moved) {
 				$this->out(date('[Y-m-d H:i:s] ') . sprintf('Moved %d files', $moved));
 			}