Extend export destination as defined by the public interface

Signed-off-by: Christopher Ng <chrng8@gmail.com>
nextcloud · Feb 15, 2022 · dffce83 · dffce83
1 parent 7d2d8aa
commit dffce83
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/ExportDestination.php b/lib/ExportDestination.php
@@ -54,14 +54,22 @@ public function __construct(ITempManager $tempManager, string $uid) {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function addFile(string $path, string $content): bool {
+	public function addFileContents(string $path, string $content): bool {
 		$stream = fopen('php://temp', 'r+');
 		fwrite($stream, $content);
 		rewind($stream);
 		$this->streamer->addFileFromStream($stream, $path);
 		return true;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function addFileAsStream(string $path, $stream): bool {
+		$this->streamer->addFileFromStream($stream, $path);
+		return true;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */

diff --git a/lib/Service/UserMigrationService.php b/lib/Service/UserMigrationService.php
@@ -219,7 +219,7 @@ protected function exportUserInformation(IUser $user,
 			'enabled' => $user->isEnabled(),
 		];
 
-		if ($exportDestination->addFile("user.json", json_encode($userinfo)) === false) {
+		if ($exportDestination->addFileContents("user.json", json_encode($userinfo)) === false) {
 			throw new UserMigrationException("Could not export user information.");
 		}
 	}
@@ -253,7 +253,7 @@ protected function exportAccountInformation(IUser $user,
 									 OutputInterface $output): void {
 		$output->writeln("Exporting account information in account.json…");
 
-		if ($exportDestination->addFile("account.json", json_encode($this->accountManager->getAccount($user))) === false) {
+		if ($exportDestination->addFileContents("account.json", json_encode($this->accountManager->getAccount($user))) === false) {
 			throw new UserMigrationException("Could not export account information.");
 		}
 	}
@@ -282,7 +282,7 @@ protected function exportVersions(string $uid,
 			\OC_App::getAppVersions()
 		);
 
-		if ($exportDestination->addFile("versions.json", json_encode($versions)) === false) {
+		if ($exportDestination->addFileContents("versions.json", json_encode($versions)) === false) {
 			throw new UserMigrationException("Could not export versions.");
 		}
 	}
@@ -297,7 +297,7 @@ protected function exportAppsSettings(string $uid,
 
 		$data = $this->config->getAllUserValues($uid);
 
-		if ($exportDestination->addFile("settings.json", json_encode($data)) === false) {
+		if ($exportDestination->addFileContents("settings.json", json_encode($data)) === false) {
 			throw new UserMigrationException("Could not export settings.");
 		}
 	}