remote download parts

Author: ArtificialOwl

lib/Command/PointDownload.php

@@ -193,8 +193,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				}
 			}
 
-			$point->unsetHealth();
-//				  ->setInstance('');
+			$point->setInstance()
+				  ->unsetHealth();
 
 			$this->pointRequest->save($point);
 			$this->pointService->saveMetadata($point);
@@ -290,9 +290,6 @@ private function downloadMissingFiles(
 			);
 
 			$part = clone $this->packService->getPartFromChunk($chunk, $partHealth->getPartName());
-//			$this->packService->getChunkPartContent($point, $chunk, $part);
-//
-//			$this->remoteService->uploadPart($instance, $point, $chunk, $part);
 
 			if (!is_null($remote)) {
 				$this->remoteService->downloadPart($remote, $point, $chunk, $part);

lib/Controller/RemoteController.php

@@ -220,16 +220,16 @@ public function healthRestoringPoint(string $pointId): DataResponse {
 	}
 
 
-
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
 	 * @param string $pointId
+	 * @param string $chunkName
 	 *
 	 * @return DataResponse
 	 */
-	public function downloadRestoringPoint(string $pointId): DataResponse {
+	public function downloadRestoringPoint(string $pointId, string $chunkName): DataResponse {
 		try {
 			$request = $this->extractRequest(DownloadRestoringChunk::class);
 		} catch (Exception $e) {

lib/Model/RestoringPoint.php

@@ -145,7 +145,7 @@ public function getId(): string {
 	 *
 	 * @return RestoringPoint
 	 */
-	public function setInstance(string $instance): self {
+	public function setInstance(string $instance = ''): self {
 		$this->instance = $instance;
 
 		return $this;

lib/RemoteRequest/DownloadRestoringChunk.php

@@ -37,10 +37,13 @@
 use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc23\TNC23Deserialize;
 use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc23\TNC23Logger;
 use OCA\Backup\AppInfo\Application;
+use OCA\Backup\Exceptions\RestoringChunkNotFoundException;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
+use OCA\Backup\Exceptions\RestoringPointNotInitiatedException;
 use OCA\Backup\IRemoteRequest;
-use OCA\Backup\Model\RestoringChunk;
+use OCA\Backup\Model\RestoringChunkPart;
 use OCA\Backup\Service\ChunkService;
+use OCA\Backup\Service\PackService;
 use OCA\Backup\Service\PointService;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
@@ -64,6 +67,9 @@ class DownloadRestoringChunk extends CoreRequest implements IRemoteRequest {
 	/** @var ChunkService */
 	private $chunkService;
 
+	/** @var PackService */
+	private $packService;
+
 
 	/**
 	 * DownloadRestoringChunk constructor.
@@ -73,33 +79,40 @@ class DownloadRestoringChunk extends CoreRequest implements IRemoteRequest {
 	 */
 	public function __construct(
 		PointService $pointService,
-		ChunkService $chunkService
+		ChunkService $chunkService,
+		PackService $packService
 	) {
 		parent::__construct();
 
 		$this->pointService = $pointService;
 		$this->chunkService = $chunkService;
+		$this->packService = $packService;
 
 		$this->setup('app', Application::APP_ID);
 	}
 
 
 	/**
+	 * @throws RestoringPointNotInitiatedException
+	 * @throws RestoringChunkNotFoundException
 	 */
 	public function execute(): void {
 		try {
 			$signedRequest = $this->getSignedRequest();
 			$signatory = $signedRequest->getSignatory();
 			$pointId = $signedRequest->getIncomingRequest()->getParam('pointId');
+			$chunkName = $signedRequest->getIncomingRequest()->getParam('chunkName');
 
 			$point = $this->pointService->getRestoringPoint($pointId, $signatory->getInstance());
-			/** @var RestoringChunk $chunk */
-			$chunk = $this->deserializeJson($signedRequest->getBody(), RestoringChunk::class);
+			$chunk = $this->chunkService->getChunkFromRP($point, $chunkName);
+
+			/** @var RestoringChunkPart $part */
+			$part = $this->deserializeJson($signedRequest->getBody(), RestoringChunkPart::class);
 
 			$this->pointService->initBaseFolder($point);
-			$this->chunkService->getChunkContent($point, $chunk);
+			$this->packService->getChunkPartContent($point, $chunk, $part);
 
-			$this->setOutcome($this->serialize($chunk));
+			$this->setOutcome($this->serialize($part));
 
 		} catch (RestoringPointNotFoundException
 		| InvalidItemException

lib/Service/ExternalFolderService.php

@@ -271,9 +271,9 @@ public function downloadPart(
 		RestoringChunkPart $part
 	): void {
 		$folder = $this->getExternalChunkFolder($external, $point, $chunk, true);
+
 		/** @var File $file */
 		$file = $folder->get($part->getName());
-		$file = $folder->get($part->getName());
 		if ($file->getType() !== FileInfo::TYPE_FILE) {
 			throw new RestoringChunkPartNotFoundException('remote part is not a file');
 		}

lib/Service/RemoteService.php

@@ -278,7 +278,7 @@ public function downloadPart(
 		RestoringPoint $point,
 		RestoringChunk $chunk,
 		RestoringChunkPart $part
-	): RestoringChunkPart {
+	): void {
 		$result = $this->remoteStreamService->resultRequestRemoteInstance(
 			$instance,
 			RemoteInstance::RP_DOWNLOAD,
@@ -291,11 +291,10 @@ public function downloadPart(
 		try {
 			/** @var RestoringChunkPart $downloaded */
 			$downloaded = $this->deserialize($result, RestoringChunkPart::class);
+			$part->setContent($downloaded->getContent());
 		} catch (InvalidItemException $e) {
 			throw new RestoringChunkPartNotFoundException();
 		}
-
-		return $downloaded;
 	}