Organise by copying your files from the original locations and duplicating them in the destination location, so they will be in both folders.
-
@@ -64,6 +69,39 @@ export default function OrganisePanel({ updateData, canProceed, moveOrCopy, veri
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts
index 2111649..b27d1dc 100644
--- a/frontend/wailsjs/go/main/App.d.ts
+++ b/frontend/wailsjs/go/main/App.d.ts
@@ -12,6 +12,8 @@ export function BackendSetMoveOrCopy(arg1:string):Promise
;
export function BackendSetNamingConvention(arg1:string):Promise;
+export function BackendSetSkipOrRename(arg1:string):Promise;
+
export function BackendSetVerifyResults(arg1:boolean):Promise;
export function ClearStartDirectories():Promise>;
diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js
index 04523e1..faee7cd 100644
--- a/frontend/wailsjs/go/main/App.js
+++ b/frontend/wailsjs/go/main/App.js
@@ -22,6 +22,10 @@ export function BackendSetNamingConvention(arg1) {
return window['go']['main']['App']['BackendSetNamingConvention'](arg1);
}
+export function BackendSetSkipOrRename(arg1) {
+ return window['go']['main']['App']['BackendSetSkipOrRename'](arg1);
+}
+
export function BackendSetVerifyResults(arg1) {
return window['go']['main']['App']['BackendSetVerifyResults'](arg1);
}
diff --git a/path_parser.go b/path_parser.go
index a100805..cccae61 100644
--- a/path_parser.go
+++ b/path_parser.go
@@ -212,6 +212,7 @@ func RelocateFiles(a *App) {
runtime.EventsEmit(a.ctx, "relocating-start")
totalFiles := len(a.substitutions)
totalRelocated := 0
+
for i := range a.substitutions {
destinationPath := ToPathWithSuffix(a.substitutions[i].To, a.substitutions[i].Suffix)
destinationFolder := filepath.Dir(destinationPath)
@@ -220,6 +221,17 @@ func RelocateFiles(a *App) {
_ = os.MkdirAll(destinationFolder, os.ModePerm)
}
+ uniqueDestinationPath := UniqueFileName(destinationPath)
+ if uniqueDestinationPath != destinationPath {
+ fmt.Printf("The destination file '%s' already exists", destinationPath)
+ if a.skipOrRename == "skip" {
+ fmt.Println(" - skipping")
+ continue
+ }
+ fmt.Printf(" - renaming to '%s'\n", uniqueDestinationPath)
+ destinationPath = uniqueDestinationPath
+ }
+
fmt.Println("Copying", a.substitutions[i].From, "to", destinationPath)
sourceFile, err := os.Open(a.substitutions[i].From)
@@ -236,16 +248,6 @@ func RelocateFiles(a *App) {
}
defer destinationFile.Close()
- if _, err := os.Stat(destinationPath); err == nil {
- fmt.Println("Destination file already exists. Skipping...")
- sourceFile.Close()
- continue
- } else if !os.IsNotExist(err) {
- fmt.Println("An error occurred while checking the destination file", err)
- sourceFile.Close()
- continue
- }
-
if _, err := io.Copy(destinationFile, sourceFile); err != nil {
fmt.Println("Failed to copy", err)
sourceFile.Close()
diff --git a/utils.go b/utils.go
index 11566f2..7d72443 100644
--- a/utils.go
+++ b/utils.go
@@ -2,6 +2,7 @@ package main
import (
"fmt"
+ "os"
"path/filepath"
"regexp"
"strings"
@@ -90,3 +91,17 @@ func HasLocationPlaceholders(str string) bool {
match := re.FindAllString(str, -1)
return len(match) > 0
}
+
+func UniqueFileName(filePath string) string {
+ dir := filepath.Dir(filePath)
+ ext := filepath.Ext(filePath)
+ base := strings.TrimSuffix(filepath.Base(filePath), ext)
+
+ for {
+ if _, err := os.Stat(filePath); os.IsNotExist(err) {
+ return filePath
+ }
+ base = base + " (duplicate)"
+ filePath = filepath.Join(dir, base+ext)
+ }
+}