X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FStorage.php;h=ea9f5ae20d2e7f2928a8606a75774b7452cda32b;hb=f87eeb2f2866f21511069df9adf199bf68610c1d;hp=fcf55a9444327c48a610db242752ddbf9e2b11b2;hpb=3f1a3c83b77b9274df66cd492a1a92821d5e2f19;p=friendica.git

diff --git a/src/Console/Storage.php b/src/Console/Storage.php
index fcf55a9444..ea9f5ae20d 100644
--- a/src/Console/Storage.php
+++ b/src/Console/Storage.php
@@ -1,13 +1,33 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, 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
 {
@@ -49,7 +69,7 @@ HELP;
 		return $help;
 	}
 
-	protected function doExecute()
+	protected function doExecute(): int
 	{
 		if ($this->getOption('v')) {
 			$this->out('Executable: ' . $this->executable);
@@ -86,9 +106,9 @@ HELP;
 		$this->out(sprintf($rowfmt, 'Sel', 'Name'));
 		$this->out('-----------------------');
 		$isregisterd = false;
-		foreach ($this->storageManager->listBackends() as $name => $class) {
+		foreach ($this->storageManager->listBackends() as $name) {
 			$issel = ' ';
-			if ($current === $class) {
+			if ($current && $current::getName() == $name) {
 				$issel = '*';
 				$isregisterd = true;
 			};
@@ -108,23 +128,23 @@ 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 = $this->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 (!$this->storageManager->setBackend($class)) {
-			$this->out($class . ' is not a valid backend storage class.');
-			return -1;
-		}
-
 		return 0;
 	}
 
@@ -147,6 +167,10 @@ HELP;
 		$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 = $this->storageManager->move($current, $tables, $this->getOption('n', 5000));
 			if ($moved) {