Skip import of current calendar on error

Signed-off-by: Christopher Ng <chrng8@gmail.com>
nextcloud · Mar 25, 2022 · f035cb4 · f035cb4
1 parent c407bb9
commit f035cb4
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/apps/dav/lib/UserMigration/CalendarMigrator.php b/apps/dav/lib/UserMigration/CalendarMigrator.php
@@ -318,6 +318,9 @@ private function initCalendarObject(): VCalendar {
 		return $vCalendarObject;
 	}
 
+	/**
+	 * @throws InvalidCalendarException
+	 */
 	private function importCalendarObject(int $calendarId, VCalendar $vCalendarObject, OutputInterface $output): void {
 		try {
 			$this->calDavBackend->createCalendarObject(
@@ -330,11 +333,12 @@ private function importCalendarObject(int $calendarId, VCalendar $vCalendarObjec
 			// Rollback creation of calendar on error
 			$output->writeln('Error creating calendar object, rolling back creation of calendar…');
 			$this->calDavBackend->deleteCalendar($calendarId, true);
+			throw new InvalidCalendarException();
 		}
 	}
 
 	/**
-	 * @throws CalendarMigratorException
+	 * @throws InvalidCalendarException
 	 */
 	private function importCalendar(IUser $user, string $filename, string $initialCalendarUri, VCalendar $vCalendar, OutputInterface $output): void {
 		$principalUri = $this->getPrincipalUri($user);
@@ -446,13 +450,18 @@ public function import(IUser $user, IImportSource $importSource, OutputInterface
 			}
 			[$initialCalendarUri, $suffix] = $splitFilename;
 
-			$this->importCalendar(
-				$user,
-				$filename,
-				$initialCalendarUri,
-				$vCalendar,
-				$output,
-			);
+			try {
+				$this->importCalendar(
+					$user,
+					$filename,
+					$initialCalendarUri,
+					$vCalendar,
+					$output,
+				);
+			} catch (InvalidCalendarException $e) {
+				// Skip import of current calendar on error
+				continue;
+			}
 
 			$vCalendar->destroy();
 		}