From 31f4a4e16ff970059a8b4036e3a263177a9ac1d6 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Sun, 10 Dec 2023 20:02:07 -0800 Subject: [PATCH] fix basename being `.` when it is empty (#1525) * fix basename being `.` when it is empty * remove unnecessary call of `filepath.Base` --- copy.go | 2 +- nav.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/copy.go b/copy.go index 5aa83d08..8127a08a 100644 --- 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 index f748619c..4d4277d9 100644 --- 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)