diff options
| author | John Molakvoæ <skjnldsv@protonmail.com> | 2023-12-19 09:46:56 +0100 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-12-24 01:21:49 +0100 |
| commit | ded7d7217190442468681f8ded4e8fd2db7230a7 (patch) | |
| tree | e6b513dbdd37534c09aad25d99651ed053338c4b /apps/files/src | |
| parent | 2ff9573343762628cfd40be5d84ea02dafa9d7bb (diff) | |
| download | nextcloud-server-ded7d7217190442468681f8ded4e8fd2db7230a7.tar.gz nextcloud-server-ded7d7217190442468681f8ded4e8fd2db7230a7.zip | |
fix(files): recursive drop path join
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files/src')
| -rw-r--r-- | apps/files/src/services/DropService.ts | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files/src/services/DropService.ts b/apps/files/src/services/DropService.ts index 4b4f98a01d6..075c5c397c7 100644 --- a/apps/files/src/services/DropService.ts +++ b/apps/files/src/services/DropService.ts @@ -29,6 +29,7 @@ import { davGetClient, davGetDefaultPropfind, davResultToNode, davRootPath } fro import { translate as t } from '@nextcloud/l10n' import { getUploader } from '@nextcloud/upload' import logger from '../logger.js' +import { joinPaths } from '@nextcloud/paths' export const handleDrop = async (data: DataTransfer) => { // TODO: Maybe handle `getAsFileSystemHandle()` in the future @@ -85,10 +86,12 @@ const handleRecursiveUpload = async (entry: FileSystemEntry, path: string = ''): ] } else { const directory = entry as FileSystemDirectoryEntry - logger.debug('Handle directory recursivly', { name: directory.name }) // TODO: Implement this on `@nextcloud/upload` - const absolutPath = `${davRootPath}${getUploader().destination.path}${path}${directory.name}` + const absolutPath = joinPaths(davRootPath, getUploader().destination.path, path, directory.name) + + logger.debug('Handle directory recursively', { name: directory.name, absolutPath }) + const davClient = davGetClient() const dirExists = await davClient.exists(absolutPath) if (!dirExists) { |