fix: Handling file extension for duplicate files

steilerDev · Oct 2, 2023 · 0228fcf · 0228fcf
1 parent 28123f3
commit 0228fcf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/src/lib/resources/network-manager.ts b/app/src/lib/resources/network-manager.ts
@@ -506,7 +506,7 @@ export class NetworkManager {
                 .catch(() => false);
 
             if (fileExists) {
-                const fileName = path.basename(location);
+                const file = path.parse(location);
                 const duplicateFolder = path.join(Resources.manager().dataDir, `duplicates`);
                 const duplicateFolderExists = await fs.stat(duplicateFolder)
                     .then(stat => stat.isDirectory())
@@ -516,15 +516,15 @@ export class NetworkManager {
                     await fs.mkdir(duplicateFolder);
                 }
 
-                const origFileName = fileName + `-orig`;
+                const origFileName = file.name + `-orig` + file.ext;
                 const origFileLinked = await fs.lstat(path.join(duplicateFolder, origFileName))
                     .then(stat => stat.isSymbolicLink())
                     .catch(() => false);
                 if (!origFileLinked) {
                     await fs.link(location, path.join(duplicateFolder, origFileName));
                 }
 
-                const duplicateFileName = fileName + `-dup-` + randomInt(0, 1000000).toString();
+                const duplicateFileName = file.name + `-dup-` + randomInt(0, 1000000).toString() + file.ext;
 
                 location = path.join(duplicateFolder, duplicateFileName);
                 Resources.logger(this).warn(`${location} already exists - saving duplicate to ${location} and linking original file ${origFileName} to ${duplicateFolder}`);