Fix importing from user folder

Signed-off-by: Côme Chilliet <[email protected]>

Author: come-nc

lib/BackgroundJob/UserImportJob.php

@@ -30,6 +30,7 @@
 use OCA\UserMigration\Db\UserImport;
 use OCA\UserMigration\Db\UserImportMapper;
 use OCA\UserMigration\Service\UserMigrationService;
+use OCA\UserMigration\UserFolderImportSource;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\QueuedJob;
 use OCP\Files\IRootFolder;
@@ -76,8 +77,6 @@ public function run($argument): void {
 		$sourceUser = $import->getSourceUser();
 		$targetUser = $import->getTargetUser();
 		$path = $import->getPath();
-		$dataDir = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
-		$absolutePath = $dataDir . $this->root->getUserFolder($sourceUser)->get($path)->getPath();
 
 		$sourceUserObject = $this->userManager->get($sourceUser);
 		$targetUserObject = $this->userManager->get($targetUser);
@@ -96,8 +95,9 @@ public function run($argument): void {
 		try {
 			$import->setStatus(UserImport::STATUS_STARTED);
 			$this->mapper->update($import);
+			$importSource = new UserFolderImportSource($this->root->getUserFolder($sourceUser), $path);
 
-			$this->migrationService->import($absolutePath, $targetUserObject);
+			$this->migrationService->import($importSource, $targetUserObject);
 			$this->successNotification($import);
 		} catch (\Exception $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);

lib/Command/Import.php

@@ -27,6 +27,7 @@
 
 use OCA\UserMigration\Service\UserMigrationService;
 use OCP\IUserManager;
+use OCP\UserMigration\ImportSource;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
@@ -90,7 +91,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			} else {
 				$user = null;
 			}
-			$this->migrationService->import($input->getArgument('archive'), $user, $output);
+			$path = $input->getArgument('archive');
+			$output->writeln("Importing from ${path}…");
+			$importSource = new ImportSource($path);
+			$this->migrationService->import($importSource, $user, $output);
+			$output->writeln("Successfully imported from ${path}");
 		} catch (\Exception $e) {
 			$output->writeln("$e");
 			$output->writeln("<error>" . $e->getMessage() . "</error>");

lib/Service/UserMigrationService.php

@@ -27,7 +27,6 @@
 
 namespace OCA\UserMigration\Service;
 
-use OCA\UserMigration\ImportSource;
 use OCP\Files\IRootFolder;
 use OCP\IConfig;
 use OCP\IUser;
@@ -120,12 +119,9 @@ public function export(IExportDestination $exportDestination, IUser $user, ?arra
 		$exportDestination->close();
 	}
 
-	public function import(string $path, ?IUser $user = null, ?OutputInterface $output = null): void {
+	public function import(IImportSource $importSource, ?IUser $user = null, ?OutputInterface $output = null): void {
 		$output = $output ?? new NullOutput();
 
-		$output->writeln("Importing from ${path}…");
-		$importSource = new ImportSource($path);
-
 		try {
 			$migratorVersions = $importSource->getMigratorVersions();
 
@@ -149,7 +145,7 @@ public function import(string $path, ?IUser $user = null, ?OutputInterface $outp
 			}
 
 			$uid = $user->getUID();
-			$output->writeln("Successfully imported $uid from $path");
+			$output->writeln("Successfully imported $uid");
 		} finally {
 			$importSource->close();
 		}

lib/UserFolderImportSource.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Côme Chilliet <[email protected]>
+ *
+ * @author Côme Chilliet <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\UserMigration;
+
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\NotFoundException;
+use OCP\UserMigration\UserMigrationException;
+
+class UserFolderImportSource extends ImportSource {
+	private File $file;
+
+	public function __construct(Folder $userFolder, string $path) {
+		try {
+			$this->file = $userFolder->get($path);
+			if (!$this->file instanceof File) {
+				throw new UserMigrationException("$path is not a valid file");
+			}
+		} catch (NotFoundException $e) {
+			throw new UserMigrationException("$path not found", 0, $e);
+		}
+		$localPath = $this->file->getStorage()->getLocalFile($this->file->getInternalPath());
+		parent::__construct($localPath);
+	}
+}