From b3a597f406610284443642728ed942f9108d437e Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Mon, 27 Jan 2025 23:41:52 +0100 Subject: [PATCH] refactor: extract rename func --- main.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/main.go b/main.go index 32f39dd..1fc9709 100644 --- a/main.go +++ b/main.go @@ -87,11 +87,9 @@ func removeSuffix(suffix string) filepath.WalkFunc { if filenameNoSuff != filenameNoExt { newFilename := filenameNoSuff + ext - err := os.Rename(filepath.Join(dir, filename), filepath.Join(dir, newFilename)) + err := rename(filepath.Join(dir, filename), filepath.Join(dir, newFilename), dryrun) if err != nil { fmt.Printf("Could not rename %s: %v\n", filename, err) - } else { - fmt.Println("Renamed " + filename + " to " + newFilename) } } @@ -110,19 +108,20 @@ func normalize(p string, f os.FileInfo, err error) error { element := newMediaElement(p) newPath := element.Path() - if newPath != p { - if dryrun { - fmt.Printf("Would move %s to %s\n", p, newPath) - } else { - err = os.Rename(p, newPath) - if err != nil { - return err - } - fmt.Printf("%s => %s\n", p, newPath) - } + if newPath == p { + return nil } - return nil + return rename(p, newPath, dryrun) +} + +func rename(oldPath, newPath string, dryrun bool) error { + fmt.Printf("%s => %s\n", oldPath, newPath) + if dryrun { + return nil + } + + return os.Rename(oldPath, newPath) } func unpack(p string, f os.FileInfo, err error) error {