fix basename being . when it is empty (#1525)

* fix basename being `.` when it is empty * remove unnecessary call of `filepath.Base`
gokcehan · Dec 11, 2023 · 31f4a4e · 31f4a4e
1 parent cbdae8e
commit 31f4a4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/copy.go b/copy.go
@@ -110,7 +110,7 @@ func copyAll(srcs []string, dstDir string, preserve []string) (nums chan int64,
 			_, err := os.Lstat(dst)
 			if !os.IsNotExist(err) {
 				ext := filepath.Ext(file)
-				basename := filepath.Base(file[:len(file)-len(ext)])
+				basename := file[:len(file)-len(ext)]
 				var newPath string
 				for i := 1; !os.IsNotExist(err); i++ {
 					file = strings.ReplaceAll(gOpts.dupfilefmt, "%f", basename+ext)

diff --git a/nav.go b/nav.go
@@ -1391,7 +1391,7 @@ func (nav *nav) moveAsync(app *app, srcs []string, dstDir string) {
 			continue
 		} else if !os.IsNotExist(err) {
 			ext := filepath.Ext(file)
-			basename := filepath.Base(file[:len(file)-len(ext)])
+			basename := file[:len(file)-len(ext)]
 			var newPath string
 			for i := 1; !os.IsNotExist(err); i++ {
 				file = strings.ReplaceAll(gOpts.dupfilefmt, "%f", basename+ext)