manual maintenance mode

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

Author: ArtificialOwl

lib/Command/PointRestore.php

@@ -250,18 +250,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 
 		$output->writeln('');
-		$output->writeln(' > Enabling <info>maintenance mode</info>');
+		$output->writeln('> Enabling <info>maintenance mode</info>');
 		$this->configService->maintenanceMode(true);
 		$this->restorePointComplete($point);
 
 		$this->output->writeln('');
 		$this->updateConfig($point);
 
 		$output->writeln('> Finalization of the restoring process');
+		$output->writeln('> <info>maintenance mode</info> disabled');
 		$this->restoreService->finalizeFullRestore();
 
-		$output->writeln('> Disabling <info>maintenance mode</info>');
-		$this->configService->maintenanceMode(false);
+//		$this->configService->maintenanceMode(false);
 
 		$this->activityService->newActivity(
 			ActivityService::RESTORE,
@@ -502,28 +502,25 @@ private function updateConfig(RestoringPoint $point): void {
 		$configFile = rtrim($configRoot, '/') . '/config.php';
 		include $configFile;
 
-		$updated = false;
-		$this->compareConfigDataRoot($CONFIG, $dataRoot, $updated);
-		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_HOST, $updated);
-		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_PORT, $updated);
-		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_NAME, $updated);
-		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_USER, $updated);
-		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_PASS, $updated);
+		$this->compareConfigDataRoot($CONFIG, $dataRoot);
+		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_HOST);
+		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_PORT);
+		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_NAME);
+		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_USER);
+		$this->compareConfigSqlParams($sqlParams, $CONFIG, ISqlDump::DB_PASS);
 
-		if ($updated) {
-			$this->output->writeln('  > Updating <info>config.php</info>');
-			$this->output->writeln('');
-			file_put_contents($configFile, '<?php ' . "\n" . '$CONFIG = ' . var_export($CONFIG, true) . ';');
-		}
+		$CONFIG['maintenance'] = false;
+		$this->output->writeln('  > Updating <info>config.php</info>');
+		$this->output->writeln('');
+		file_put_contents($configFile, '<?php ' . "\n" . '$CONFIG = ' . var_export($CONFIG, true) . ';');
 	}
 
 
 	/**
 	 * @param array $CONFIG
 	 * @param string $used
-	 * @param bool $updated
 	 */
-	private function compareConfigDataRoot(array &$CONFIG, string $used, bool &$updated): void {
+	private function compareConfigDataRoot(array &$CONFIG, string $used): void {
 		$fromConfig = rtrim($this->get(ConfigService::DATA_DIRECTORY, $CONFIG), '/') . '/';
 
 		if ($fromConfig !== $used) {
@@ -544,7 +541,6 @@ private function compareConfigDataRoot(array &$CONFIG, string $used, bool &$upda
 			$helper = $this->getHelper('question');
 			if ($helper->ask($this->input, $this->output, $question)) {
 				$CONFIG[ConfigService::DATA_DIRECTORY] = $used;
-				$updated = true;
 			}
 		}
 	}
@@ -554,14 +550,8 @@ private function compareConfigDataRoot(array &$CONFIG, string $used, bool &$upda
 	 * @param array $sqlParams
 	 * @param array $CONFIG
 	 * @param string $key
-	 * @param bool $updated
 	 */
-	private function compareConfigSqlParams(
-		array $sqlParams,
-		array &$CONFIG,
-		string $key,
-		bool &$updated
-	): void {
+	private function compareConfigSqlParams(array $sqlParams, array &$CONFIG, string $key): void {
 		$fromConfig = $this->get($key, $CONFIG);
 		$used = $this->get($key, $sqlParams);
 		if ($used !== $fromConfig) {
@@ -591,7 +581,6 @@ private function compareConfigSqlParams(
 			$helper = $this->getHelper('question');
 			if ($helper->ask($this->input, $this->output, $question)) {
 				$CONFIG[$key] = $used;
-				$updated = true;
 			}
 		}
 	}

lib/Command/PointUpload.php

@@ -34,6 +34,7 @@
 use OC\Core\Command\Base;
 use OCA\Backup\Exceptions\ExternalFolderNotFoundException;
 use OCA\Backup\Exceptions\RemoteInstanceNotFoundException;
+use OCA\Backup\Exceptions\RestoringPointLockException;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Exceptions\RestoringPointPackException;
 use OCA\Backup\Service\OutputService;
@@ -104,17 +105,21 @@ protected function configure() {
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 *
+	 * @return int
+	 * @throws ExternalFolderNotFoundException
 	 * @throws NotFoundException
 	 * @throws NotPermittedException
 	 * @throws RemoteInstanceNotFoundException
 	 * @throws RestoringPointNotFoundException
-	 * @throws ExternalFolderNotFoundException
 	 * @throws RestoringPointPackException
+	 * @throws RestoringPointLockException
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$point = $this->pointService->getLocalRestoringPoint($input->getArgument('point'));
 
 		$this->outputService->setOutput($output);
 		$this->uploadService->uploadPoint($point);
+
+		return 0;
 	}
 }