3 files changed, 66 insertions, 2 deletions
diff --git a/apps/dav/command/createaddressbook.php b/apps/dav/command/createaddressbook.php
index 201101d17f4..3d99afd4ba3 100644
--- a/apps/dav/command/createaddressbook.php
+++ b/apps/dav/command/createaddressbook.php
@@ -88,7 +88,7 @@ class CreateAddressBook extends Command {
 		);
 
 		$name = $input->getArgument('name');
-		$carddav = new CardDavBackend($this->dbConnection, $principalBackend);
+		$carddav = new CardDavBackend($this->dbConnection, $principalBackend, $this->logger);
 		$carddav->createAddressBook("principals/users/$user", $name, []);
 	}
 }
diff --git a/apps/dav/command/migrateaddressbooks.php b/apps/dav/command/migrateaddressbooks.php
new file mode 100644
index 00000000000..22f5efebf20
--- /dev/null
+++ b/apps/dav/command/migrateaddressbooks.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace OCA\Dav\Command;
+
+use OCP\IUser;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MigrateAddressbooks extends Command {
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var \OCA\Dav\Migration\MigrateAddressbooks  */
+	private $service;
+
+	/**
+	 * @param IUserManager $userManager
+	 * @param \OCA\Dav\Migration\MigrateAddressbooks $service
+	 */
+	function __construct(IUserManager $userManager,
+						 \OCA\Dav\Migration\MigrateAddressbooks $service
+	) {
+		parent::__construct();
+		$this->userManager = $userManager;
+		$this->service = $service;
+	}
+
+	protected function configure() {
+		$this
+			->setName('dav:migrate-addressbooks')
+			->setDescription('Migrate addressbooks from the contacts app to core')
+			->addArgument('user',
+				InputArgument::OPTIONAL,
+				'User for whom all addressbooks will be migrated');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$this->service->setup();
+
+		$user = $input->getArgument('user');
+		if (!is_null($user)) {
+			if (!$this->userManager->userExists($user)) {
+				throw new \InvalidArgumentException("User <$user> in unknown.");
+			}
+			$output->writeln("Start migration for $user");
+			$this->service->migrateForUser($user);
+		}
+		$output->writeln("Start migration of all known users ...");
+		$p = new ProgressBar($output);
+		$p->start();
+		$this->userManager->callForAllUsers(function($user) use ($p) {
+			$p->advance();
+			/** @var IUser $user */
+			$this->service->migrateForUser($user->getUID());
+		});
+
+		$p->finish();
+		$output->writeln('');
+	}
+}
diff --git a/apps/dav/command/syncsystemaddressbook.php b/apps/dav/command/syncsystemaddressbook.php
index 50f570ec93e..b83a37131c3 100644
--- a/apps/dav/command/syncsystemaddressbook.php
+++ b/apps/dav/command/syncsystemaddressbook.php
@@ -53,7 +53,6 @@ class SyncSystemAddressBook extends Command {
 	 * @param OutputInterface $output
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
-
 		$output->writeln('Syncing users ...');
 		$progress = new ProgressBar($output);
 		$progress->start();