better health managment, lock RP

Author: ArtificialOwl

lib/Command/PointDownload.php

@@ -207,7 +207,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$output->write('check health status: ');
 		$this->pointService->generateHealth($point);
-		$output->writeln($this->outputService->displayHealth($point));
+		$output->writeln($this->outputService->displayHealth($point->getHealth()));
 		$this->downloadMissingFiles($output, $remote, $external, $point);
 
 		return 0;

lib/Command/PointRestore.php

@@ -192,7 +192,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$output->write('Checking Health status: ');
 		$this->pointService->generateHealth($point);
 
-		$output->writeln($this->outputService->displayHealth($point));
+		$output->writeln($this->outputService->displayHealth($point->getHealth()));
 		$output->writeln('');
 
 		$healthStatus = $point->getHealth()->getStatus();

lib/Command/PointUnpack.php

@@ -32,15 +32,18 @@
 namespace OCA\Backup\Command;
 
 
+use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
 use OC\Core\Command\Base;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Service\PackService;
 use OCA\Backup\Service\PointService;
+use OCA\Backup\Service\RemoteStreamService;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Throwable;
 
 
 /**
@@ -57,18 +60,27 @@ class PointUnpack extends Base {
 	/** @var PackService */
 	private $packService;
 
+	/** @var RemoteStreamService */
+	private $remoteStreamService;
+
 
 	/**
 	 * PointUnpack constructor.
 	 *
 	 * @param PointService $pointService
 	 * @param PackService $packService
+	 * @param RemoteStreamService $remoteStreamService
 	 */
-	public function __construct(PointService $pointService, PackService $packService) {
+	public function __construct(
+		PointService $pointService,
+		PackService $packService,
+		RemoteStreamService $remoteStreamService
+	) {
 		parent::__construct();
 
 		$this->pointService = $pointService;
 		$this->packService = $packService;
+		$this->remoteStreamService = $remoteStreamService;
 	}
 
 
@@ -89,16 +101,25 @@ protected function configure() {
 	 * @param OutputInterface $output
 	 *
 	 * @return int
-	 * @throws RestoringPointNotFoundException
 	 * @throws NotFoundException
 	 * @throws NotPermittedException
+	 * @throws RestoringPointNotFoundException
+	 * @throws SignatoryException
+	 * @throws Throwable
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$point = $this->pointService->getLocalRestoringPoint($input->getArgument('pointId'));
 
 		$this->pointService->initBaseFolder($point);
 		$this->packService->unpackPoint($point);
 
+
+		// set Archive flag up after unpack
+		$point->setArchive(true);
+
+		$this->remoteStreamService->subSignPoint($point);
+		$this->pointService->updateSubInfos($point);
+
 		return 0;
 	}
 

lib/Db/CoreRequestBuilder.php

@@ -78,6 +78,7 @@ class CoreRequestBuilder {
 			'id',
 			'uid',
 			'archive',
+			'lock',
 			'instance',
 			'parent',
 			'status',

lib/Db/PointRequest.php

@@ -56,6 +56,7 @@ public function save(RestoringPoint $point): int {
 		   ->setValue('parent', $qb->createNamedParameter($point->getParent()))
 		   ->setValue('status', $qb->createNamedParameter($point->getStatus()))
 		   ->setValue('archive', $qb->createNamedParameter(($point->isArchive()) ? 1 : 0))
+		   ->setValue('lock', $qb->createNamedParameter($point->getLock()))
 		   ->setValue('notes', $qb->createNamedParameter(json_encode($point->getNotes())))
 		   ->setValue('metadata', $qb->createNamedParameter(json_encode($point->getMetadata())))
 		   ->setValue('date', $qb->createNamedParameter($point->getDate()));

lib/Migration/Version0023Date20210907122531.php

@@ -116,10 +116,18 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			);
 			$table->addColumn(
 				'archive', 'integer', [
+							 'unsigned' => true,
 							 'notnull' => true,
 							 'length' => 1,
 						 ]
 			);
+			$table->addColumn(
+				'lock', 'integer', [
+						  'notnull' => true,
+						  'unsigned' => true,
+						  'length' => 11,
+					  ]
+			);
 			$table->addColumn(
 				'instance', 'string', [
 							  'notnull' => true,
@@ -141,8 +149,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			);
 			$table->addColumn(
 				'notes', 'text', [
-				'notnull' => true
-			]
+						   'notnull' => true
+					   ]
 			);
 			$table->addColumn(
 				'metadata', 'text', [

lib/Model/RestoringPoint.php

@@ -104,6 +104,9 @@ class RestoringPoint implements IDeserializable, INC23QueryRow, ISignedModel, Js
 	/** @var bool */
 	private $archive = false;
 
+	/** @var int */
+	private $lock = 0;
+
 	/** @var ISimpleFolder */
 	private $baseFolder = null;
 
@@ -280,6 +283,32 @@ public function isArchive(): bool {
 	}
 
 
+	/**
+	 * @param int $lock
+	 *
+	 * @return RestoringPoint
+	 */
+	public function setLock(int $lock): self {
+		$this->lock = $lock;
+
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLock(): int {
+		return $this->lock;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isLock(): bool {
+		return ($this->lock > 0);
+	}
+
+
 	/**
 	 * @param SimpleDataStore $notes
 	 *
@@ -603,6 +632,7 @@ public function importFromDatabase(array $data): INC23QueryRow {
 			 ->setInstance($this->get('instance', $data))
 			 ->setParent($this->get('parent', $data))
 			 ->setArchive($this->getBool('archive', $data))
+			 ->setLock($this->getInt('lock', $data))
 			 ->setStatus($this->getInt('status', $data))
 			 ->setNotes(new SimpleDataStore($this->getArray('notes', $data)))
 			 ->setDate($this->getInt('date', $data));

lib/Service/ConfigService.php

@@ -35,7 +35,10 @@
 use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc23\NC23Request;
 use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
 use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
+use Exception;
+use OC;
 use OCA\Backup\AppInfo\Application;
+use OCA\Files_External\Service\GlobalStoragesService;
 use OCP\IConfig;
 
 
@@ -105,6 +108,9 @@ class ConfigService {
 	/** @var IConfig */
 	private $config;
 
+	/** @var int */
+	private $externalEnabled = -1;
+
 
 	/**
 	 * ConfigService constructor.
@@ -272,10 +278,31 @@ public function getTempFileName(): string {
 	}
 
 
+	/**
+	 * @return bool
+	 */
 	public function isRemoteEnabled(): bool {
 		return $this->getAppValueBool(self::REMOTE_ENABLED);
 	}
 
+
+	/**
+	 * @return bool
+	 */
+	public function isExternalEnabled(): bool {
+		if ($this->externalEnabled === -1) {
+			try {
+				OC::$server->get(GlobalStoragesService::class);
+				$this->externalEnabled = 0;
+			} catch (Exception $e) {
+				$this->externalEnabled = 1;
+			}
+		}
+
+		return ($this->externalEnabled === 1);
+	}
+
+
 	/**
 	 * @return array
 	 */