fix: delete a single point with --all-storage will not remove all points

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

Author: ArtificialOwl

lib/Service/ExternalFolderService.php

@@ -101,8 +101,8 @@ class ExternalFolderService {
 	 */
 	public function __construct(
 		ExternalFolderRequest $externalFolderRequest,
-		OutputService         $outputService,
-		ConfigService         $configService
+		OutputService $outputService,
+		ConfigService $configService
 	) {
 		try {
 			$this->globalStoragesService = OC::$server->get(GlobalStoragesService::class);
@@ -200,8 +200,8 @@ public function getRestoringPoints(ExternalFolder $external): array {
 	 */
 	public function getRestoringPoint(
 		ExternalFolder $external,
-		string         $pointId,
-		bool           $current = false
+		string $pointId,
+		bool $current = false
 	): RestoringPoint {
 		$folder = $this->getExternalPointFolder($external, $pointId, false);
 
@@ -250,10 +250,10 @@ public function getRestoringPoint(
 	 * @throws RestoringPointNotFoundException
 	 */
 	public function uploadPart(
-		ExternalFolder     $external,
-		RestoringPoint     $point,
-		RestoringHealth    $health,
-		RestoringChunk     $chunk,
+		ExternalFolder $external,
+		RestoringPoint $point,
+		RestoringHealth $health,
+		RestoringChunk $chunk,
 		RestoringChunkPart $part
 	): void {
 		$folder = $this->getExternalChunkFolder($external, $point, $chunk, true);
@@ -279,9 +279,9 @@ public function uploadPart(
 	 * @throws RestoringPointNotFoundException
 	 */
 	public function downloadPart(
-		ExternalFolder     $external,
-		RestoringPoint     $point,
-		RestoringChunk     $chunk,
+		ExternalFolder $external,
+		RestoringPoint $point,
+		RestoringChunk $chunk,
 		RestoringChunkPart $part
 	): void {
 		$folder = $this->getExternalChunkFolder($external, $point, $chunk, true);
@@ -426,7 +426,8 @@ public function deletePointExternal(ExternalFolder $external, string $pointId):
 		$this->getRestoringPoint($external, $pointId);
 
 		$this->initRootFolder($external);
-		$external->getRootFolder()->delete();
+		$folder = $this->getExternalPointFolder($external, $pointId);
+		$folder->delete();
 	}
 
 
@@ -512,7 +513,7 @@ public function updateMetadata(RestoringPoint $point, ?ExternalFolder $external
 	public function updateMetadataFile(
 		ExternalFolder $external,
 		RestoringPoint $point,
-		bool           $create = true
+		bool $create = true
 	): File {
 		$folder = $this->getExternalPointFolder($external, $point->getId());
 		try {
@@ -634,10 +635,10 @@ public function generateHealth(ExternalFolder $external, RestoringPoint $point):
 	 * @throws RestoringChunkPartNotFoundException
 	 */
 	public function updateChunkPartHealth(
-		ExternalFolder     $external,
-		RestoringPoint     $point,
-		RestoringHealth    $health,
-		RestoringChunk     $chunk,
+		ExternalFolder $external,
+		RestoringPoint $point,
+		RestoringHealth $health,
+		RestoringChunk $chunk,
 		RestoringChunkPart $part
 	): void {
 		$partHealth = $health->getPart($chunk->getName(), $part->getName());
@@ -655,9 +656,9 @@ public function updateChunkPartHealth(
 	 * @return int
 	 */
 	private function generatePartHealthStatus(
-		ExternalFolder     $external,
-		RestoringPoint     $point,
-		RestoringChunk     $chunk,
+		ExternalFolder $external,
+		RestoringPoint $point,
+		RestoringChunk $chunk,
 		RestoringChunkPart $part
 	): int {
 		try {
@@ -683,9 +684,9 @@ private function generatePartHealthStatus(
 	 * @throws ArchiveNotFoundException
 	 */
 	public function getChecksum(
-		ExternalFolder     $external,
-		RestoringPoint     $point,
-		RestoringChunk     $chunk,
+		ExternalFolder $external,
+		RestoringPoint $point,
+		RestoringChunk $chunk,
 		RestoringChunkPart $part
 	): string {
 		try {
@@ -728,8 +729,8 @@ public function getChecksum(
 	 */
 	public function getExternalPointFolder(
 		ExternalFolder $external,
-		string         $pointId,
-		bool           $create = true
+		string $pointId,
+		bool $create = true
 	): Folder {
 		$this->initRootFolder($external);
 		$folder = $external->getRootFolder();
@@ -769,7 +770,7 @@ public function getExternalChunkFolder(
 		ExternalFolder $external,
 		RestoringPoint $point,
 		RestoringChunk $chunk,
-		bool           $pack = false
+		bool $pack = false
 	): Folder {
 		$folder = $this->getExternalPointFolder($external, $point->getId());