From 8e86f9eb9ad20b351f39bfef082c69e686a93c5f Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Tue, 28 Jan 2025 15:08:08 +0100 Subject: [PATCH] refactor: use std lib trimsuffix --- main.go | 6 +++--- media.go | 2 +- util.go | 12 ------------ 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 util.go diff --git a/main.go b/main.go index 366e16a..7cbdb92 100644 --- a/main.go +++ b/main.go @@ -76,8 +76,8 @@ func removeSuffix(suffix string) filepath.WalkFunc { dir := filepath.Dir(p) ext := filepath.Ext(filename) - filenameNoExt := trimSuffix(filename, ext) - filenameNoSuff := trimSuffix(filenameNoExt, suffix) + filenameNoExt := strings.TrimSuffix(filename, ext) + filenameNoSuff := strings.TrimSuffix(filenameNoExt, suffix) if filenameNoSuff != filenameNoExt { newFilename := filenameNoSuff + ext @@ -132,7 +132,7 @@ func unpack(p string, f os.FileInfo, err error) error { } cmd := exec.Command(execCmd, p) - filename = trimSuffix(filename, ext) + filename = strings.TrimSuffix(filename, ext) ext = filepath.Ext(filename) if ext == "" { fmt.Println(p) diff --git a/media.go b/media.go index 474a5bf..892efeb 100644 --- a/media.go +++ b/media.go @@ -21,7 +21,7 @@ func newMediaElement(p string) *mediaElement { dir := filepath.Dir(p) name := filepath.Base(p) ext := filepath.Ext(name) - name = trimSuffix(name, ext) + name = strings.TrimSuffix(name, ext) name = strings.ReplaceAll(name, ".", " ") dash := strings.Index(name, "-") diff --git a/util.go b/util.go deleted file mode 100644 index f429b5f..0000000 --- a/util.go +++ /dev/null @@ -1,12 +0,0 @@ -package main - -import ( - "strings" -) - -func trimSuffix(s, suffix string) string { - if strings.HasSuffix(s, suffix) { - s = s[:len(s)-len(suffix)] - } - return s -}