improved string cleaning

main.go

@@ -9,7 +9,6 @@ import (
 	"log"
 	"os"
 	"path"
-	"regexp"
 	"strings"
 	"text/template"
 	"time"
@@ -451,19 +450,28 @@ func moveFile(source, destination string) (err error) {
 }
 
 func cleanPath(str string) string {
-	return doClean(str, `[<>:"|?*]`)
+	return doClean(str, func(r rune) rune {
+		switch r {
+		case '<', '>', ':', '\'', '"', '|', '?', '*':
+			return '_'
+		}
+		return r
+	})
 }
 
 func cleanTemplateVariable(str string) string {
-	return doClean(str, `[<>:"|?*/\\.]`)
+	return doClean(str, func(r rune) rune {
+		switch r {
+		case '<', '>', ':', '\'', '"', '|', '?', '*', '/', '\\', '.':
+			return '_'
+		}
+		return r
+	})
 }
 
-func doClean(str string, reg string) string {
+func doClean(str string, mapping func(rune) rune) string {
-	re := regexp.MustCompile(reg)
+	t := transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC, runes.Map(mapping))
-	s := re.ReplaceAllString(str, "")
+    result, _, err := transform.String(t, str)
-
-	t := transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
-    result, _, err := transform.String(t, s)
     if err != nil {
         panic(err)
     }