add setting to choose outpud directory

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>

Author: Julien Veyssier

lib/Service/DropboxStorageAPIService.php

@@ -83,7 +83,8 @@ public function getStorageSize(string $accessToken, string $refreshToken, string
 	 * @return array
 	 */
 	public function startImportDropbox(string $accessToken, string $userId): array {
-		$targetPath = $this->l10n->t('Dropbox import');
+		$targetPath = $this->config->getUserValue($userId, Application::APP_ID, 'output_dir', '/Dropbox import');
+		$targetPath = $targetPath ?: '/Dropbox import';
 		// create root folder
 		$userFolder = $this->root->getUserFolder($userId);
 		if (!$userFolder->nodeExists($targetPath)) {
@@ -122,7 +123,8 @@ public function importDropboxJob(string $userId): void {
 		$clientSecret = $this->config->getAppValue(Application::APP_ID, 'client_secret', DEFAULT_DROPBOX_CLIENT_SECRET);
 		$clientSecret = $clientSecret ?: DEFAULT_DROPBOX_CLIENT_SECRET;
 		// import batch of files
-		$targetPath = $this->l10n->t('Dropbox import');
+		$targetPath = $this->config->getUserValue($userId, Application::APP_ID, 'output_dir', '/Dropbox import');
+		$targetPath = $targetPath ?: '/Dropbox import';
 		// import by batch of 500 Mo
 		$alreadyImported = $this->config->getUserValue($userId, Application::APP_ID, 'nb_imported_files', '0');
 		$alreadyImported = (int) $alreadyImported;

lib/Settings/Personal.php

@@ -49,6 +49,7 @@ public function __construct(string $appName,
 	 */
 	public function getForm(): TemplateResponse {
 		$userName = $this->config->getUserValue($this->userId, Application::APP_ID, 'user_name', '');
+		$outputDir = $this->config->getUserValue($this->userId, Application::APP_ID, 'output_dir', '/Dropbox import');
 
 		// for OAuth
 		$clientID = $this->config->getAppValue(Application::APP_ID, 'client_id', DEFAULT_DROPBOX_CLIENT_ID);
@@ -64,6 +65,7 @@ public function getForm(): TemplateResponse {
 			'user_name' => $userName,
 			'free_space' => $freeSpace,
 			'user_quota' => $user->getQuota(),
+			'output_dir' => $outputDir,
 		];
 		$this->initialStateService->provideInitialState($this->appName, 'user-config', $userConfig);
 		$response = new TemplateResponse(Application::APP_ID, 'personalSettings');

src/components/PersonalSettings.vue

@@ -51,6 +51,20 @@
 				<br>
 				<div v-if="storageSize > 0" id="import-storage">
 					<h3>{{ t('integration_dropbox', 'Dropbox storage') }}</h3>
+					<div v-if="!importingDropbox" class="output-selection">
+						<label for="dropbox-output">
+							<span class="icon icon-folder" />
+							{{ t('integration_dropbox', 'Import directory') }}
+						</label>
+						<input id="dropbox-output"
+							:readonly="true"
+							:value="state.output_dir">
+						<button
+							@click="onOutputChange">
+							<span class="icon-rename" />
+						</button>
+						<br><br>
+					</div>
 					<label>
 						<span class="icon icon-folder" />
 						{{ t('integration_dropbox', 'Dropbox storage size: {formSize}', { formSize: myHumanFileSize(storageSize, true) }) }}
@@ -147,18 +161,16 @@ export default {
 	methods: {
 		onLogoutClick() {
 			this.state.user_name = ''
-			this.saveOptions()
+			this.saveOptions({ user_name: this.state.user_name })
 		},
 		onAccessCodeInput() {
 			delay(() => {
 				this.saveAccessCode()
 			}, 2000)()
 		},
-		saveOptions() {
+		saveOptions(values) {
 			const req = {
-				values: {
-					user_name: this.state.user_name,
-				},
+				values,
 			}
 			const url = generateUrl('/apps/integration_dropbox/config')
 			axios.put(url, req)
@@ -168,7 +180,7 @@ export default {
 				.catch((error) => {
 					showError(
 						t('integration_dropbox', 'Failed to save Dropbox options')
-						+ ': ' + error.response.request.responseText
+						+ ': ' + error.response?.request?.responseText
 					)
 				})
 				.then(() => {
@@ -284,6 +296,21 @@ export default {
 				.then(() => {
 				})
 		},
+		onOutputChange() {
+			OC.dialogs.filepicker(
+				t('integration_dropbox', 'Choose where to write imported files'),
+				(targetPath) => {
+					if (targetPath === '') {
+						targetPath = '/'
+					}
+					this.state.output_dir = targetPath
+					this.saveOptions({ output_dir: this.state.output_dir })
+				},
+				false,
+				'httpd/unix-directory',
+				true
+			)
+		},
 		myHumanFileSize(bytes, approx = false, si = false, dp = 1) {
 			return humanFileSize(bytes, approx, si, dp)
 		},
@@ -345,4 +372,15 @@ body.theme--dark .icon-dropbox {
 	line-height: 38px;
 }
 
+.output-selection {
+	display: flex;
+
+	label,
+	input {
+		width: 300px;
+	}
+	button {
+		width: 44px !important;
+	}
+}
 </style>