fix

Author: Moebytes

.DS_Store

@@ -297,8 +297,8 @@ ipcMain.handle("multi-open", async (event, type?: string) => {
     button = "Rename"
   }
   if (type === "subs") {
-    title = "Extract Subtitles"
-    button = "Extract"
+    title = "Convert to VTT Subtitles"
+    button = "Convert"
   }
   if (!window) return
   const result = await dialog.showOpenDialog(window, {
@@ -312,7 +312,8 @@ ipcMain.handle("multi-open", async (event, type?: string) => {
 const subFiles = (directory: string) => {
   let files: string[] = []
   let directories: string[] = []
-  const dirFiles = fs.readdirSync(directory).map((f) => `${directory}/${f}`)
+  let dirFiles = fs.readdirSync(directory).map((f) => `${directory}/${f}`)
+  dirFiles = dirFiles.sort(new Intl.Collator(undefined, {numeric: true, sensitivity: "base"}).compare)
   for (let i = 0; i < dirFiles.length; i++) {
     if (fs.lstatSync(dirFiles[i]).isDirectory()) {
       directories.push(dirFiles[i])
@@ -328,9 +329,25 @@ const subFiles = (directory: string) => {
 
 ipcMain.handle("flatten", async (event, directory: string) => {
   const {files, directories} = subFiles(directory)
+  let conflict = false 
+  loop1:
   for (let i = 0; i < files.length; i++) {
-    const newName = `${directory}/${path.basename(files[i])}`
+    let newName = path.basename(files[i])
+    for (let j = 0; j < files.length; j++) { 
+      if (`${path.dirname(files[i])}/${path.basename(files[i])}` === `${path.dirname(files[j])}/${path.basename(files[j])}`) continue
+      let checkName = path.basename(files[j])
+      if (newName === checkName) {
+        conflict = true
+        break loop1
+      }
+    }
+  }
+  let renameIndex = 0
+  for (let i = 0; i < files.length; i++) {
+    let newName = `${directory}/${path.basename(files[i])}`
+    if (conflict) newName = `${directory}/${renameIndex}_${path.basename(files[i])}`
     fs.renameSync(files[i], newName)
+    renameIndex++
   }
   for (let i = 0; i < directories.length; i++) {
     fs.rmdirSync(directories[i])

assets/.DS_Store

@@ -1,14 +1,14 @@
 {
   "name": "image-compressor",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Compresses, resizes, and renames images.",
   "main": "dist/main.js",
   "scripts": {
     "start": "npm run clean && webpack && cross-env DEVELOPMENT=true electron dist/main.js",
     "clean": "del-cli ./dist",
     "build": "npm run clean ./build && webpack && npm run sharp:mac && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -m -p never",
     "rebuild": "npm rebuild --runtime=electron --target=14.0.0 --disturl=https://atom.io/download/atom-shell --abi=83",
-    "release": "npm run release:mac && npm run release:win && npm run release:linux",
+    "release": "npm run release:win && npm run release:linux && npm run release:mac",
     "release:mac": "npm run clean ./build && webpack && npm run sharp:mac && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -m -p always",
     "release:win": "npm run clean ./build && webpack && npm run sharp:win && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -w -p always",
     "release:linux": "npm run clean ./build && webpack && npm run sharp:linux && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -l -p always",