From d8787476acf068be6609a77b1fadb2f61d0fd502 Mon Sep 17 00:00:00 2001 From: Vojtech Simetka Date: Mon, 24 Jan 2022 18:03:06 +0100 Subject: [PATCH] fix: correct folder name when uploading multiple files or mix of files & directories (#291) --- src/utils/file.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/utils/file.ts b/src/utils/file.ts index 3218196..a11d086 100644 --- a/src/utils/file.ts +++ b/src/utils/file.ts @@ -77,13 +77,14 @@ export function convertManifestToFiles(files: Record): SwarmFile } export function getAssetNameFromFiles(files: SwarmFile[]): string { - if (!files.length) { - return 'Unknown' + if (files.length === 1) return files[0].name + + if (files.length > 0) { + const prefix = files[0].path.split('/')[0] + + // Only if all files have a common prefix we can use it as a folder name + if (files.every(f => f.path.split('/')[0] === prefix)) return prefix } - if (files.length === 1) { - return files[0].name - } - - return files[0].path.split('/')[0] + return 'unknown' }