fix: pasting multiple files #1987 (#2306)

TryQuiet · Feb 20, 2024 · 7c6b669 · 7c6b669
1 parent 9693d0d
commit 7c6b669
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/desktop/src/main/main.ts b/packages/desktop/src/main/main.ts
@@ -445,12 +445,15 @@ app.on('ready', async () => {
   ipcMain.on('writeTempFile', (event, arg) => {
     const temporaryFilesDirectory = path.join(appDataPath, 'temporaryFiles')
     fs.mkdirSync(temporaryFilesDirectory, { recursive: true })
-    const filePath = `${path.join(temporaryFilesDirectory, arg.fileName)}`
+    const id = `${Date.now()}_${Math.random().toString(36).substring(0, 20)}`
+    const name = arg.ext ? arg.fileName.split(arg.ext)[0] : arg.fileName
+    const filePath = `${path.join(temporaryFilesDirectory, `${name}_${id}${arg.ext}`)}`
     fs.writeFileSync(filePath, arg.fileBuffer)
 
     event.reply('writeTempFileReply', {
       path: filePath,
-      id: arg.fileName.split(arg.ext)[0],
+      id,
+      name,
       ext: arg.ext,
     })
   })

diff --git a/packages/desktop/src/renderer/components/Channel/Channel.tsx b/packages/desktop/src/renderer/components/Channel/Channel.tsx
@@ -140,7 +140,7 @@ const Channel = () => {
           ...existingFiles,
           [arg.id]: {
             ext: arg.ext,
-            name: arg.id,
+            name: arg.name,
             path: arg.path,
           },
         }