backup:external:appdata --unset

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

lib/Command/ExternalAppData.php

@@ -33,13 +33,15 @@
 
 use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc23\TNC23Deserialize;
 use OC\Core\Command\Base;
+use OCA\Backup\Exceptions\ExternalAppdataException;
 use OCA\Backup\Exceptions\ExternalFolderNotFoundException;
 use OCA\Backup\Service\ConfigService;
 use OCA\Backup\Service\ExternalFolderService;
 use OCA\Backup\Service\PointService;
 use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 use OCP\Files\StorageNotAvailableException;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
@@ -89,7 +91,8 @@ public function __construct(
 	 */
 	protected function configure() {
 		$this->setName('backup:external:appdata')
-			 ->setDescription('Add external filesystem to store the app\'s data');
+			 ->setDescription('Add external filesystem to store the app\'s data')
+			 ->addOption('unset', '', InputOption::VALUE_NONE, 'Unset the current external appdata');
 	}
 
 
@@ -103,15 +106,56 @@ protected function configure() {
 	 * @throws ExternalFolderNotFoundException
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$output->writeln(
-			'This configuration tool will help you set the <info>Appdata</info> folder of the Backup App on an <info>external storage</info>'
-		);
-		$output->writeln('...');
+		$unset = $input->getOption('unset');
+
+		try {
+			$external = $this->pointService->getExternalAppData();
+			$output->writeln('Your <info>appdata</info> is currently on an external storage:');
+			$output->writeln('Storage Id: <info>' . $external->getStorageId() . '</info>');
+			$output->writeln('Storage: <info>' . $external->getStorage() . '</info>');
+			$output->writeln('Root: <info>' . $external->getRoot() . '</info>');
+			$output->writeln('');
+
+			if (!$unset) {
+				return 0;
+			}
+		} catch (ExternalAppdataException $e) {
+			$unset = false;
+		}
+
+		if (!$unset) {
+			$output->writeln(
+				'This configuration tool will help you set the <info>Appdata</info> folder '
+				. ' of the Backup App on an <info>external storage</info>'
+			);
+		}
+
+		$output->writeln('');
 		$output->writeln('');
 		$output->writeln('<error>All previous Restoring Point will be lost during this process</error>');
 		$output->writeln('');
 		$output->writeln('');
+
+		if ($unset) {
+			$question = new ConfirmationQuestion(
+				'<comment>Do you really want to not use this External Folder appdata anymore ?</comment> (y/N) ',
+				false,
+				'/^(y|Y)/i'
+			);
+
+			$helper = $this->getHelper('question');
+			if (!$helper->ask($input, $output, $question)) {
+				$output->writeln('Operation cancelled');
+			}
+
+			$this->pointService->setExternalAppData(0);
+
+			return 0;
+		}
+
+
 		$storageId = $this->selectStorage($input, $output);
+
 		$output->writeln('');
 		if ($storageId === 0) {
 			$output->writeln('Operation cancelled');

lib/Controller/LocalController.php

@@ -44,6 +44,7 @@
 use OCA\Backup\Exceptions\RestoringPointException;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Model\BackupEvent;
+use OCA\Backup\Model\ExternalFolder;
 use OCA\Backup\Model\RestoringPoint;
 use OCA\Backup\Service\ConfigService;
 use OCA\Backup\Service\CronService;
@@ -247,7 +248,7 @@ public function getAppData(): DataResponse {
 		try {
 			return new DataResponse($this->pointService->getExternalAppData());
 		} catch (ExternalAppdataException $e) {
-			return new DataResponse([]);
+			return new DataResponse(new ExternalFolder());
 		} catch (Exception $e) {
 			throw new OcsException($e->getMessage(), Http::STATUS_BAD_REQUEST);
 		}

lib/Db/PointRequest.php

@@ -216,5 +216,4 @@ public function getByInstance(string $instance): array {
 
 		return $this->getItemsFromRequest($qb);
 	}
-
 }

lib/Model/RestoringChunk.php

@@ -433,5 +433,4 @@ public function jsonSerialize(): array {
 
 		return $arr;
 	}
-	
 }

lib/Service/ConfigService.php

@@ -188,6 +188,13 @@ public function getAppValueArray(string $key): array {
 	}
 
 
+	/**
+	 * @param string $key
+	 */
+	public function unsetAppValue(string $key): void {
+		$this->config->deleteAppValue(Application::APP_ID, $key);
+	}
+
 	/**
 	 * Set a value by key
 	 *

lib/Service/PointService.php

@@ -705,19 +705,23 @@ public function getExternalAppData(): ExternalFolder {
 	 * @throws InsufficientDataForMeaningfulAnswerException
 	 * @throws StorageNotAvailableException
 	 */
-	public function setExternalAppData(int $storageId, string $root): void {
+	public function setExternalAppData(int $storageId, string $root = ''): void {
 		if ($storageId === 0) {
 			try {
 				$this->destroyBackupFS();
 			} catch (ExternalFolderNotFoundException | NotFoundException | NotPermittedException $e) {
 				$this->deleteAllPoints();
 			}
 
-			$this->configService->unsetAppConfig(ConfigService::EXTERNAL_APPDATA);
+			$this->configService->unsetAppValue(ConfigService::EXTERNAL_APPDATA);
 
 			return;
 		}
 
+		if ($root === '') {
+			throw new ExternalFolderNotFoundException('empty root');
+		}
+
 		$external = $this->externalFolderService->getStorageById($storageId);
 		$external->setRoot($root);
 

lib/Service/RestoreService.php

@@ -316,7 +316,6 @@ private function generateChunkPartsFromFolder(
 
 				// TODO: generate Checksum, files count ? check if zip is valid ?
 			} catch (NotFoundException $e) {
-
 				try {
 					/** @var File $chunkFile */
 					$chunkFile = $node->get($chunkName . '.zip.gz');
@@ -327,7 +326,6 @@ private function generateChunkPartsFromFolder(
 					$chunk->setChecksum($this->getChecksumFromStream($read));
 					fclose($read);
 				} catch (NotFoundException $e) {
-
 					$isPacked = true;
 					foreach ($node->getDirectoryListing() as $item) {
 						/** @var File $item */