add --destination-use-user-folder option to files:transfer-ownership command

mrow4a · mrow4a · commit e716428b44e7 · 2021-09-03T12:25:37.000+02:00
diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
@@ -131,6 +131,12 @@ protected function configure() {
 				's',
 				InputOption::VALUE_NONE,
 				'always confirm to continue in case of skipped shares.'
+			)
+			->addOption(
+				'destination-use-user-folder',
+				'u',
+				InputOption::VALUE_NONE,
+				'if destination user never logged in and thus has no mounts transfer directly to top-level user folder.'
 			);
 	}
 
@@ -164,10 +170,6 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			return 2;
 		}
 
-		// use a date format compatible across client OS
-		$date = \date('Ymd_his');
-		$this->finalTarget = "$this->destinationUser/files/transferred from $this->sourceUser on $date";
-
 		// setup filesystem
 		Filesystem::initMountPoints($this->sourceUser);
 		Filesystem::initMountPoints($this->destinationUser);
@@ -207,6 +209,17 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 				return 1;
 			}
 		}
+		// prepare and validate final destination
+		if ($input->getOption('destination-use-user-folder') && $destinationUserObject->getLastLogin() === 0) {
+			$this->finalTarget = "$this->destinationUser/files";
+		} elseif ($input->getOption('destination-use-user-folder') && $destinationUserObject->getLastLogin() !== 0) {
+			$output->writeln("<error>Cannot use top-level user folder as destination folder if user aleardy logged in</comment>");
+			return 1;
+		} else {
+			// use a date format compatible across client OS
+			$date = \date('Ymd_his');
+			$this->finalTarget = "$this->destinationUser/files/transferred from $this->sourceUser on $date";
+		}
 
 		// transfer the files
 		$this->transfer($output);
