move regex under util

Author: LumePart

src/downloader/downloader.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"regexp"
 	"strings"
 
 	"golang.org/x/sync/errgroup"
@@ -128,19 +127,12 @@ func filterLocalTracks(tracks *[]*models.Track, preDownload bool) { // filter lo
 	*tracks = filteredTracks
 }
 
-
-func sanitizeName(s string) string { // return string with only letters and digits
-	var sanitizer = regexp.MustCompile(`[^\p{L}\d]+`)
-	return sanitizer.ReplaceAllString(s, "")
-}
-
 func getFilename(title, artist string) string {
 	const maxBytes = 240
 
 	// Remove illegal characters for file naming
-	re := regexp.MustCompile(`[^\p{L}\d._,\-]+`)
-	t := re.ReplaceAllString(title, "_")
-	a := re.ReplaceAllString(artist, "_")
+	t := util.FilenameSafe(title)
+	a :=util.FilenameSafe(artist)
 
 	// truncate long filename
 	runes := []rune(fmt.Sprintf("%s-%s", t, a))

src/downloader/slskd.go

@@ -239,9 +239,9 @@ func (c Slskd) deleteSearch(ID string) error {
 }
 
 func (c Slskd) CollectFiles(track models.Track, searchResults SearchResults) ([]File, error) { // Collect all files in response that match criteria
-	sanitizedArtist := sanitizeName(track.MainArtist)
-	sanitizedAlbum := sanitizeName(track.Album)
-	sanitizedTitle := sanitizeName(track.CleanTitle)
+	sanitizedArtist := util.AlnumOnly(track.MainArtist)
+	sanitizedAlbum := util.AlnumOnly(track.Album)
+	sanitizedTitle := util.AlnumOnly(track.CleanTitle)
 
 	files := slices.Collect(func(yield func(File) bool) {
 		for _, result := range searchResults {
@@ -250,7 +250,7 @@ func (c Slskd) CollectFiles(track models.Track, searchResults SearchResults) ([]
 					file.Extension = strings.TrimPrefix(strings.ToLower(file.Extension), ".")
 					if file.Extension == "" {
 						extension := strings.TrimPrefix(strings.ToLower(filepath.Ext(string(file.Name))), ".")
-						file.Extension = sanitizeName(extension) // sanitize extension incase of bad chars
+						file.Extension = util.AlnumOnly(extension) // sanitize extension incase of bad chars
 					}
 
 					if !slices.Contains(c.Cfg.Filters.Extensions, file.Extension) && ContainsKeyword(track, file.Name, c.Cfg.Filters.FilterList) {
@@ -261,7 +261,7 @@ func (c Slskd) CollectFiles(track models.Track, searchResults SearchResults) ([]
 						continue
 					}
 
-					sanitizedFilename := sanitizeName(string(file.Name))
+					sanitizedFilename := util.AlnumOnly(string(file.Name))
 					if (containsLower(sanitizedFilename, sanitizedArtist) || containsLower(sanitizedFilename, sanitizedAlbum)) && containsLower(sanitizedFilename, sanitizedTitle) {
 						file.Username = result.Username
 						if !yield(file) {

src/util/sanitize.go

@@ -0,0 +1,18 @@
+package util
+
+import "regexp"
+
+var (
+	filenameRe = regexp.MustCompile(`[^\p{L}\d._,\-]+`)
+	alnumRe    = regexp.MustCompile(`[^\p{L}\d]+`)
+)
+
+// FilenameSafe replaces characters unsafe for filenames with '_'
+func FilenameSafe(s string) string {
+	return filenameRe.ReplaceAllString(s, "_")
+}
+
+// AlnumOnly removes everything except letters and digits
+func AlnumOnly(s string) string {
+	return alnumRe.ReplaceAllString(s, "")
+}