modernize: replace SplitN(..., 2) -> Cut(...)

Author: 0uep

conf/files.go

@@ -28,7 +28,7 @@ func replaceDIR(path, flags string) string {
 	return strings.ReplaceAll(flags, "$DIR", filepath.Dir(path))
 }
 
-// getNameAndFlags returns model name and llama-server flags
+// getNameAndFlags returns model name and llama-server flags.
 func getNameAndFlags(root, path string) (name, flags_ string) {
 	truncated, flags := extractFlags(path)
 	name = beautifyModelName(root, truncated)
@@ -48,6 +48,7 @@ func beautifyModelName(root, truncated string) string {
 	name = strings.TrimSuffix(name, "_")
 	name = strings.TrimSuffix(name, "-GGUF")
 	name = strings.Replace(name, "-GGUF_", ":", 1)
+	name = strings.Replace(name, "-GGUF:", ":", 1)
 
 	return name
 }
@@ -96,6 +97,7 @@ func nameWithSlash(root, truncated, name string) string {
 			return string(out)
 		case !unicode.IsLower(char):
 			return nameWithDir(root, truncated, name)
+		default:
 		}
 	}
 	return nameWithDir(root, truncated, name)
@@ -116,22 +118,22 @@ func nameWithGGUF(name string) string {
 		return ""
 	}
 
-	// expected split:
-	// begin[0] = ggml-org     unsloth
-	// begin[1] = gpt-oss-120b Devstral-2-123B-Instruct-2512
-	begin := strings.SplitN(name[:pos], "_", 2)
-	if len(begin) != 2 {
+	// Expected Cut:
+	// grp   = ggml-org     unsloth
+	// model = gpt-oss-120b Devstral-2-123B-Instruct-2512
+	grp, model, ok := strings.Cut(name[:pos], "_")
+	if !ok {
 		return ""
 	}
 
 	// search for the duplicated model name
 	after := name[pos+len(gguf):]
-	pos = strings.Index(after, begin[1])
+	pos = strings.Index(after, model)
 	if pos < 0 {
 		return ""
 	}
 
-	name = begin[0] + "/" + begin[1]
+	name = grp + "/" + model
 	if pos > 1 {
 		quants := after[:pos-1]
 		name += ":" + quants
@@ -163,6 +165,7 @@ func nameWithDir(root, truncated, name string) string {
 			dash = i // number of letters before the dash
 		case !unicode.IsLower(char):
 			return name
+		default:
 		}
 	}
 	if dash > 0 {
@@ -212,10 +215,10 @@ func extractFlags(path string) (truncated, flags_ string) {
 
 	// Slice after the first '&' to avoid an empty first element.
 	for f := range strings.SplitSeq(truncated[pos+1:], "&") {
-		kv := strings.SplitN(f, "=", 2)
-		if len(kv) > 0 {
-			kv[0] = "-" + kv[0]
-			flags = append(flags, kv...)
+		key, value, ok := strings.Cut(f, "=")
+		if ok {
+			key = "-" + key
+			flags = append(flags, key, value)
 		}
 	}
 

conf/info.go

@@ -82,11 +82,11 @@ func (cfg *Cfg) refineModelInfo(name string) {
 	// after the first space, the arguments
 	pos := strings.Index(cfg.Swap.Models[name].Cmd, " ")
 	if pos > 1 {
-		// split the arguments at -m: -first -args -m path/to/file.gguf
-		args := strings.SplitN(cfg.Swap.Models[name].Cmd[pos:], " -m ", 2)
-		mi.Flags = args[0]
-		if len(args) > 1 {
-			mi.Path = args[1]
+		// split the arguments at -m: -arg1 -arg2 -m path/to/file.gguf
+		flags, path, ok := strings.Cut(cfg.Swap.Models[name].Cmd[pos:], " -m ")
+		mi.Flags = flags
+		if ok {
+			mi.Path = path
 			mi.Error = "file absent but configured in llama-swap.yml"
 		}
 	} else {

conf/read.go

@@ -158,12 +158,12 @@ func (cfg *Cfg) parseExtraModels(extra string) {
 
 	for pair := range strings.SplitSeq(extra, "|||") {
 		// split model=flags
-		mf := strings.SplitN(pair, "=", 2)
-		model := strings.TrimSpace(mf[0])
+		model, flags, ok := strings.Cut(pair, "=")
+		model = strings.TrimSpace(model)
+		model = strings.Replace(model, "-GGUF", "", 1)
 		cfg.ExtraModels[model] = ""
-		if len(mf) > 1 {
-			flags := strings.TrimSpace(mf[1])
-			cfg.ExtraModels[model] = flags
+		if ok {
+			cfg.ExtraModels[model] = strings.TrimSpace(flags)
 		}
 		// if DefaultModel unset => use the first ExtraModels
 		if cfg.DefaultModel == "" {