admin settings

nextcloud · Oct 1, 2021 · 426a976 · 426a976
1 parent 92289a4
commit 426a976
Show file tree

Hide file tree

Showing 19 changed files with 310 additions and 106 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<description><![CDATA[Backup today. Restore tomorrow.]]></description>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com">Maxence Lange</author>
-	<version>0.2.0</version>
+	<version>0.2.1</version>
 	<namespace>Backup</namespace>
 	<category>tools</category>
 	<website>https://github.com/nextcloud/backup</website>
@@ -43,10 +43,11 @@
 		<command>OCA\Backup\Command\SetupImport</command>
 
 		<command>OCA\Backup\Command\Reset</command>
+	</commands>
 
+	<settings>
+		<admin>OCA\Backup\Settings\Admin</admin>
+		<admin-section>OCA\Backup\Settings\AdminSection</admin-section>
+	</settings>
 
-		<!--		<command>OCA\Backup\Command\Listing</command>-->
-		<!--		<command>OCA\Backup\Command\Details</command>-->
-		<!--		<command>OCA\Backup\Command\Restore</command>-->
-	</commands>
 </info>
diff --git a/lib/Command/FileHistory.php b/lib/Command/FileHistory.php
@@ -35,7 +35,7 @@
 use Exception;
 use OC\Core\Command\Base;
 use OCA\Backup\Exceptions\RestoringDataNotFoundException;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\PointService;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
@@ -58,21 +58,21 @@ class FileHistory extends Base {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
-	private $archiveService;
+	/** @var ChunkService */
+	private $chunkService;
 
 
 	/**
 	 * PointHistory constructor.
 	 *
 	 * @param PointService $pointService
-	 * @param ArchiveService $archiveService
+	 * @param ChunkService $chunkService
 	 */
-	public function __construct(PointService $pointService, ArchiveService $archiveService) {
+	public function __construct(PointService $pointService, ChunkService $chunkService) {
 		parent::__construct();
 
 		$this->pointService = $pointService;
-		$this->archiveService = $archiveService;
+		$this->chunkService = $chunkService;
 	}
 
 
@@ -119,11 +119,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				continue;
 			}
 
-			$data = $this->archiveService->getDataFromRP($point, $dataName);
+			$data = $this->chunkService->getDataFromRP($point, $dataName);
 
 			foreach ($data->getChunks() as $chunk) {
 				try {
-					$file = $this->archiveService->getArchiveFileFromChunk($point, $chunk, $filename);
+					$file = $this->chunkService->getArchiveFileFromChunk($point, $chunk, $filename);
 					$table->appendRow(
 						[
 							date('Y-m-d H:i:s', $point->getDate()),

diff --git a/lib/Command/FileSearch.php b/lib/Command/FileSearch.php
@@ -38,7 +38,7 @@
 use OCA\Backup\Exceptions\ArchiveCreateException;
 use OCA\Backup\Exceptions\ArchiveNotFoundException;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\PointService;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
@@ -64,17 +64,17 @@ class FileSearch extends Base {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
+	/** @var ChunkService */
 	private $chunkService;
 
 
 	/**
 	 * NodeSearch constructor.
 	 *
 	 * @param PointService $pointService
-	 * @param ArchiveService $chunkService
+	 * @param ChunkService $chunkService
 	 */
-	public function __construct(PointService $pointService, ArchiveService $chunkService) {
+	public function __construct(PointService $pointService, ChunkService $chunkService) {
 		parent::__construct();
 
 		$this->pointService = $pointService;

diff --git a/lib/Command/PointDetails.php b/lib/Command/PointDetails.php
@@ -41,7 +41,7 @@
 use OCA\Backup\Exceptions\RemoteResourceNotFoundException;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Model\RestoringData;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\PointService;
 use OCA\Backup\Service\RemoteService;
 use OCP\Files\NotFoundException;
@@ -71,7 +71,7 @@ class PointDetails extends Base {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
+	/** @var ChunkService */
 	private $chunkService;
 
 
@@ -80,12 +80,12 @@ class PointDetails extends Base {
 	 *
 	 * @param RemoteService $remoteService
 	 * @param PointService $pointService
-	 * @param ArchiveService $chunkService
+	 * @param ChunkService $chunkService
 	 */
 	public function __construct(
 		RemoteService $remoteService,
 		PointService $pointService,
-		ArchiveService $chunkService
+		ChunkService $chunkService
 	) {
 		parent::__construct();
 

diff --git a/lib/Command/PointDownload.php b/lib/Command/PointDownload.php
@@ -44,7 +44,7 @@
 use OCA\Backup\Model\RestoringChunkHealth;
 use OCA\Backup\Model\RestoringHealth;
 use OCA\Backup\Model\RestoringPoint;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\OutputService;
 use OCA\Backup\Service\PointService;
 use OCA\Backup\Service\RemoteService;
@@ -71,7 +71,7 @@ class PointDownload extends Base {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
+	/** @var ChunkService */
 	private $chunkService;
 
 	/** @var RemoteStreamService */
@@ -89,15 +89,15 @@ class PointDownload extends Base {
 	 *
 	 * @param PointRequest $pointRequest
 	 * @param PointService $pointService
-	 * @param ArchiveService $chunkService
+	 * @param ChunkService $chunkService
 	 * @param RemoteStreamService $remoteStreamService
 	 * @param RemoteService $remoteService
 	 * @param OutputService $outputService
 	 */
 	public function __construct(
 		PointRequest $pointRequest,
 		PointService $pointService,
-		ArchiveService $chunkService,
+		ChunkService $chunkService,
 		RemoteStreamService $remoteStreamService,
 		RemoteService $remoteService,
 		OutputService $outputService

diff --git a/lib/Command/PointHistory.php b/lib/Command/PointHistory.php
@@ -33,7 +33,7 @@
 
 
 use OC\Core\Command\Base;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\PointService;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -50,21 +50,21 @@ class PointHistory extends Base {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
-	private $archiveService;
+	/** @var ChunkService */
+	private $chunkService;
 
 
 	/**
 	 * PointHistory constructor.
 	 *
 	 * @param PointService $pointService
-	 * @param ArchiveService $archiveService
+	 * @param ChunkService $chunkService
 	 */
-	public function __construct(PointService $pointService, ArchiveService $archiveService) {
+	public function __construct(PointService $pointService, ChunkService $chunkService) {
 		parent::__construct();
 
 		$this->pointService = $pointService;
-		$this->archiveService = $archiveService;
+		$this->chunkService = $chunkService;
 	}
 
 

diff --git a/lib/Command/PointList.php b/lib/Command/PointList.php
@@ -143,8 +143,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			);
 		}
 
-//		echo 'RP: ' . json_encode($rp, JSON_PRETTY_PRINT);
-
 		return 0;
 	}
 

diff --git a/lib/Command/PointRestore.php b/lib/Command/PointRestore.php
@@ -49,7 +49,7 @@
 use OCA\Backup\Model\RestoringData;
 use OCA\Backup\Model\RestoringHealth;
 use OCA\Backup\Model\RestoringPoint;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\ConfigService;
 use OCA\Backup\Service\FilesService;
 use OCA\Backup\Service\OutputService;
@@ -80,8 +80,8 @@ class PointRestore extends Base {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
-	private $archiveService;
+	/** @var ChunkService */
+	private $chunkService;
 
 	/** @var FilesService */
 	private $filesService;
@@ -107,15 +107,15 @@ class PointRestore extends Base {
 	 * PointRestore constructor.
 	 *
 	 * @param PointService $pointService
-	 * @param ArchiveService $archiveService
+	 * @param ChunkService $chunkService
 	 * @param FilesService $filesService
 	 * @param RestoreService $restoreService
 	 * @param ConfigService $configService
 	 * @param OutputService $outputService
 	 */
 	public function __construct(
 		PointService $pointService,
-		ArchiveService $archiveService,
+		ChunkService $chunkService,
 		FilesService $filesService,
 		RestoreService $restoreService,
 		ConfigService $configService,
@@ -124,7 +124,7 @@ public function __construct(
 		parent::__construct();
 
 		$this->pointService = $pointService;
-		$this->archiveService = $archiveService;
+		$this->chunkService = $chunkService;
 		$this->filesService = $filesService;
 		$this->restoreService = $restoreService;
 		$this->configService = $configService;
@@ -267,7 +267,7 @@ public function restorePointComplete(RestoringPoint $point): void {
 				);
 
 				try {
-					$this->archiveService->restoreChunk($point, $chunk, $root);
+					$this->chunkService->restoreChunk($point, $chunk, $root);
 					$this->output->writeln('<info>ok</info>');
 				} catch (
 				ArchiveCreateException
@@ -299,7 +299,7 @@ private function importSqlDump(RestoringPoint $point, RestoringData $data): void
 
 		$chunk = $chunks[0];
 		try {
-			$read = $this->archiveService->getStreamFromChunk(
+			$read = $this->chunkService->getStreamFromChunk(
 				$point,
 				$chunk,
 				PointService::SQL_DUMP_FILE
@@ -349,16 +349,16 @@ private function restoreUniqueFile(
 		$this->pointService->initBaseFolder($point);
 		if (!is_null($chunkName)) {
 			if (is_null($dataName)) {
-				$data = $this->archiveService->getDataWithChunk($point, $chunkName);
+				$data = $this->chunkService->getDataWithChunk($point, $chunkName);
 			} else {
-				$data = $this->archiveService->getDataFromRP($point, $dataName);
+				$data = $this->chunkService->getDataFromRP($point, $dataName);
 			}
 
-			$chunk = $this->archiveService->getChunkFromRP($point, $chunkName, $data->getName());
-			$file = $this->archiveService->getArchiveFileFromChunk($point, $chunk, $filename);
+			$chunk = $this->chunkService->getChunkFromRP($point, $chunkName, $data->getName());
+			$file = $this->chunkService->getArchiveFileFromChunk($point, $chunk, $filename);
 		} else {
-			$data = $this->archiveService->getDataFromRP($point, $dataName);
-			$file = $this->archiveService->getArchiveFileFromData($point, $data, $filename);
+			$data = $this->chunkService->getDataFromRP($point, $dataName);
+			$file = $this->chunkService->getArchiveFileFromData($point, $data, $filename);
 		}
 
 		$root = $data->getAbsolutePath();
@@ -372,7 +372,7 @@ private function restoreUniqueFile(
 		// TODO: display $root and add a confirmation step
 
 		try {
-			$this->archiveService->restoreUniqueFile($point, $chunk, $root, $file->getName());
+			$this->chunkService->restoreUniqueFile($point, $chunk, $root, $file->getName());
 			$this->output->writeln('<info>ok</info>');
 
 			// include restored file in next incremental backup

diff --git a/lib/Command/PointScan.php b/lib/Command/PointScan.php
@@ -37,7 +37,7 @@
 use OCA\Backup\Db\PointRequest;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Model\RestoringPoint;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\OutputService;
 use OCA\Backup\Service\PointService;
 use OCP\Files\NotFoundException;
@@ -64,8 +64,8 @@ class PointScan extends Base {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
-	private $archiveService;
+	/** @var ChunkService */
+	private $chunkService;
 
 	/** @var OutputService */
 	private $outputService;
@@ -83,17 +83,17 @@ class PointScan extends Base {
 	 *
 	 * @param PointRequest $pointRequest
 	 * @param PointService $pointService
-	 * @param ArchiveService $archiveService
+	 * @param ChunkService $chunkService
 	 */
 	public function __construct(
 		PointRequest $pointRequest,
 		PointService $pointService,
-		ArchiveService $archiveService
+		ChunkService $chunkService
 	) {
 		parent::__construct();
 
 		$this->pointRequest = $pointRequest;
-		$this->archiveService = $archiveService;
+		$this->chunkService = $chunkService;
 		$this->pointService = $pointService;
 	}
 

diff --git a/lib/Model/RestoringChunkPart.php b/lib/Model/RestoringChunkPart.php
@@ -10,7 +10,7 @@
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2019, Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2021, Maxence Lange <maxence@artificial-owl.com>
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/lib/RemoteRequest/DownloadRestoringChunk.php b/lib/RemoteRequest/DownloadRestoringChunk.php
@@ -40,7 +40,7 @@
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\IRemoteRequest;
 use OCA\Backup\Model\RestoringChunk;
-use OCA\Backup\Service\ArchiveService;
+use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\PointService;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
@@ -61,19 +61,19 @@ class DownloadRestoringChunk extends CoreRequest implements IRemoteRequest {
 	/** @var PointService */
 	private $pointService;
 
-	/** @var ArchiveService */
+	/** @var ChunkService */
 	private $chunkService;
 
 
 	/**
 	 * DownloadRestoringChunk constructor.
 	 *
 	 * @param PointService $pointService
-	 * @param ArchiveService $chunkService
+	 * @param ChunkService $chunkService
 	 */
 	public function __construct(
 		PointService $pointService,
-		ArchiveService $chunkService
+		ChunkService $chunkService
 	) {
 		parent::__construct();