feat: add option to perform a full addressbook sync instead of a delta sync

Signed-off-by: Robin Appelman <robin@icewind.nl>

Author: icewind1991

apps/dav/lib/CardDAV/SyncService.php

@@ -66,11 +66,13 @@ public function syncRemoteAddressBook(string $url, string $userName, string $add
 			throw $ex;
 		}
 
+		$received = [];
 		// 3. apply changes
 		// TODO: use multi-get for download
 		foreach ($response['response'] as $resource => $status) {
 			$cardUri = basename($resource);
 			if (isset($status[200])) {
+				$received[] = $cardUri;
 				$absoluteUrl = $this->prepareUri($url, $resource);
 				$vCard = $this->download($absoluteUrl, $userName, $sharedSecret);
 				$this->atomic(function () use ($addressBookId, $cardUri, $vCard): void {
@@ -86,6 +88,15 @@ public function syncRemoteAddressBook(string $url, string $userName, string $add
 			}
 		}
 
+		// when doing a full sync, remove any items in the local address book that aren't in the remote one
+		if (!$syncToken) {
+			$existingCards = $this->backend->getCards($addressBookId);
+			$removedCards = array_filter($existingCards, fn (array $card) => !in_array($card['uri'], $received));
+			foreach ($removedCards as $removedCard) {
+				$this->backend->deleteCard($addressBookId, $removedCard['uri']);
+			}
+		}
+
 		return [
 			$response['token'],
 			$response['truncated'],

apps/federation/lib/Command/SyncFederationAddressBooks.php

@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SyncFederationAddressBooks extends Command {
@@ -23,19 +24,21 @@ public function __construct(
 	protected function configure() {
 		$this
 			->setName('federation:sync-addressbooks')
-			->setDescription('Synchronizes addressbooks of all federated clouds');
+			->setDescription('Synchronizes addressbooks of all federated clouds')
+			->addOption('full', null, InputOption::VALUE_NONE, 'Perform a full sync instead of a delta sync');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$progress = new ProgressBar($output);
 		$progress->start();
+		$full = (bool)$input->getOption('full');
 		$this->syncService->syncThemAll(function ($url, $ex) use ($progress, $output): void {
 			if ($ex instanceof \Exception) {
 				$output->writeln("Error while syncing $url : " . $ex->getMessage());
 			} else {
 				$progress->advance();
 			}
-		});
+		}, $full);
 
 		$progress->finish();
 		$output->writeln('');

apps/federation/lib/SyncFederationAddressBooks.php

@@ -28,7 +28,7 @@ public function __construct(
 	/**
 	 * @param \Closure $callback
 	 */
-	public function syncThemAll(\Closure $callback) {
+	public function syncThemAll(\Closure $callback, bool $full = false) {
 		$trustedServers = $this->dbHandler->getAllServer();
 		foreach ($trustedServers as $trustedServer) {
 			$url = $trustedServer['url'];
@@ -59,7 +59,7 @@ public function syncThemAll(\Closure $callback) {
 						$cardDavUser,
 						$addressBookUrl,
 						$sharedSecret,
-						$syncToken,
+						$full ? null : $syncToken,
 						$targetBookId,
 						$targetPrincipal,
 						$targetBookProperties