Prevent files in default download directories from being overwritten,…

… close worker after download
asivery · Dec 1, 2023 · eaddf21 · eaddf21
1 parent bcced62
commit eaddf21
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main.ts b/src/main.ts
@@ -118,7 +118,14 @@ async function createWindow() {
 
     window.webContents.session.on('will-download', async (event, item, contents) => {
         if (downloadPath) {
-            item.setSavePath(path.join(downloadPath, item.getFilename()));
+            const baseFilename = item.getFilename();
+            let filename = path.join(downloadPath, baseFilename);
+            const { name, ext } = path.parse(baseFilename);
+            let i = 1;
+            while(fs.existsSync(filename)){
+                filename = path.join(downloadPath, `${name} (${i++})${ext}`);
+            }
+            item.setSavePath(filename);
         }
     });
 }

diff --git a/src/wmd/translations.ts b/src/wmd/translations.ts
@@ -67,6 +67,7 @@ export class EWMDHiMD extends HiMDFullService {
             blocks.push(data);
             progressCallback({ read: blocks.length, total });
         }
+        nodeWorker.close();
         return { format: DiscFormat.spStereo, data: concatUint8Arrays(...blocks) };
     }