style(代码风格): 精简内部实现，优化方法组织

goini.go

@@ -94,42 +94,6 @@ func (ini *GoINI) SaveFormatFile(filename string, perm os.FileMode) error {
 	return nil
 }
 
-func (ini *GoINI) save(data string) error {
-	if ini.filename == "" {
-		return errFilenameRequired
-	}
-	info, err := os.Stat(ini.filename)
-	if err != nil {
-		return err
-	}
-	return ini.saveFile(ini.filename, data, info.Mode().Perm())
-}
-
-func (ini *GoINI) saveFile(filename string, data string, perm os.FileMode) error {
-	if filename == "" {
-		return errFilenameRequired
-	}
-	perm = perm.Perm()
-	writePerm := perm | 0o200
-	if info, err := os.Stat(filename); err == nil {
-		if info.Mode().IsRegular() {
-			if err := os.Chmod(filename, writePerm); err != nil {
-				return err
-			}
-		}
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return err
-	}
-	if err := os.WriteFile(filename, []byte(data), writePerm); err != nil {
-		return err
-	}
-	if err := os.Chmod(filename, perm); err != nil {
-		return err
-	}
-	ini.filename = filename
-	return nil
-}
-
 // String 获取GoINI对象的字符串形式
 // 返回: string 配置文件内容
 func (ini *GoINI) String() string {
@@ -152,7 +116,7 @@ func (ini *GoINI) SetString(name string, key string, value string) {
 	if index, ok := ini.findSectionKeyLineIndex(name, key); ok {
 		ini.fileLines[index].keyValue = value
 		ini.fileLines[index].modified = true
-		ini.rebuildIndexes()
+		ini.sectionValues[name][key] = value
 		return
 	}
 	ini.ensureSectionLine(name)
@@ -229,6 +193,24 @@ func (ini *GoINI) GetNameKeys(name string, match string) []string {
 	return matchStrings(ini.sectionKeys[name], match)
 }
 
+// HasSection 判断分区是否存在
+// 入参: name 分区名称
+// 返回: bool 是否存在
+func (ini *GoINI) HasSection(name string) bool {
+	name = ini.normalizeSection(name)
+	_, ok := ini.sectionValues[name]
+	return ok
+}
+
+// HasKey 判断分区下配置项是否存在
+// 入参: name 分区名称, key 配置项名称
+// 返回: bool 是否存在
+func (ini *GoINI) HasKey(name string, key string) bool {
+	name = ini.normalizeSection(name)
+	_, ok := ini.sectionValues[name][key]
+	return ok
+}
+
 // GetString 获取单个配置项的字符串值
 // 入参: name 分区名称, key 配置项名称, value 默认值
 // 返回: string 配置项值

internal.go

@@ -1,6 +1,8 @@
 package goini
 
 import (
+	"errors"
+	"os"
 	"reflect"
 	"regexp"
 	"strconv"
@@ -68,6 +70,9 @@ func parseRawLine(rawLine string, sectionName string) (iniLine, string) {
 		line.sectionName = nextSection
 		return line, nextSection
 	}
+	if strings.HasPrefix(trimmed, "[") && strings.HasSuffix(trimmed, "]") {
+		return line, sectionName
+	}
 	if parsed, ok := parseKeyValue(rawLine); ok {
 		line.kind = lineKeyValue
 		line.keyName = parsed.key
@@ -204,9 +209,6 @@ func (ini *GoINI) findSectionLineIndex(sectionName string) (int, bool) {
 }
 
 func (ini *GoINI) findSectionKeyLineIndex(sectionName string, keyName string) (int, bool) {
-	if ini.sectionKeyLineIndexes[sectionName] == nil {
-		return 0, false
-	}
 	index, ok := ini.sectionKeyLineIndexes[sectionName][keyName]
 	return index, ok
 }
@@ -234,6 +236,9 @@ func (ini *GoINI) findSectionInsertIndex(sectionName string) int {
 	insert := len(ini.fileLines)
 	for i, line := range ini.fileLines {
 		if line.kind == lineSection {
+			if current == sectionName {
+				insert, _ = ini.commentRangeBefore(i)
+			}
 			current = line.sectionName
 			if current == sectionName {
 				insert = i + 1
@@ -250,9 +255,13 @@ func (ini *GoINI) findSectionInsertIndex(sectionName string) int {
 func (ini *GoINI) findRootInsertIndex() int {
 	for i, line := range ini.fileLines {
 		if line.kind == lineSection {
-			return i
+			start, _ := ini.commentRangeBefore(i)
+			return start
 		}
 	}
+	if len(ini.sectionKeys[ini.rootSection]) == 0 {
+		return ini.firstRootLineIndex()
+	}
 	return len(ini.fileLines)
 }
 
@@ -306,7 +315,11 @@ func (ini *GoINI) firstRootLineIndex() int {
 			return i
 		}
 	}
-	return 0
+	index := len(ini.fileLines)
+	for index > 0 && ini.fileLines[index-1].kind == lineBlank {
+		index--
+	}
+	return index
 }
 
 func commentLines(comment string) []iniLine {
@@ -323,7 +336,7 @@ func commentLines(comment string) []iniLine {
 
 func formatComment(comment string) string {
 	trimmed := strings.TrimLeftFunc(comment, unicode.IsSpace)
-	if strings.HasPrefix(trimmed, "#") || strings.HasPrefix(trimmed, ";") {
+	if isComment(trimmed) {
 		return comment
 	}
 	if comment == "" {
@@ -337,8 +350,7 @@ func stripComment(comment string) string {
 	if !isComment(trimmed) {
 		return trimmed
 	}
-	trimmed = strings.TrimPrefix(strings.TrimPrefix(trimmed, "#"), ";")
+	return strings.TrimPrefix(trimmed[1:], " ")
-	return strings.TrimPrefix(trimmed, " ")
 }
 
 func renderLine(line iniLine) string {
@@ -358,6 +370,29 @@ func renderLine(line iniLine) string {
 	}
 }
 
+func renderKeyValue(line iniLine) string {
+	separator := line.separator
+	if separator == "" || !strings.Contains(separator, "=") && strings.Contains(line.keyValue, "=") {
+		separator = defaultSeparator
+	}
+	value := formatValue(line.keyValue)
+	if strings.HasPrefix(line.keyName, "[") && strings.HasSuffix(value, "]") {
+		value = `"` + value + `"`
+	}
+	return line.indent + line.keyName + separator + value
+}
+
+func formatValue(value string) string {
+	if strings.TrimSpace(value) == value && !hasSurroundingQuotes(value) {
+		return value
+	}
+	quote := `"`
+	if strings.HasPrefix(value, `"`) && strings.HasSuffix(value, `"`) {
+		quote = "`"
+	}
+	return quote + value + quote
+}
+
 func (ini *GoINI) formatString() string {
 	formattedLines := make([]string, 0, len(ini.fileLines))
 	pendingComments := make([]string, 0)
@@ -373,7 +408,9 @@ func (ini *GoINI) formatString() string {
 		case lineKeyValue:
 			formattedLines = append(formattedLines, pendingComments...)
 			pendingComments = pendingComments[:0]
-			formattedLines = append(formattedLines, line.keyName+defaultSeparator+formatValue(line.keyValue))
+			line.indent = ""
+			line.separator = defaultSeparator
+			formattedLines = append(formattedLines, renderKeyValue(line))
 		case lineComment:
 			pendingComments = append(pendingComments, formatINIComment(line.text))
 		}
@@ -393,23 +430,40 @@ func formatINIComment(comment string) string {
 	return "# " + comment
 }
 
-func renderKeyValue(line iniLine) string {
+func (ini *GoINI) save(data string) error {
-	separator := line.separator
+	if ini.filename == "" {
-	if separator == "" {
+		return errFilenameRequired
-		separator = defaultSeparator
 	}
-	return line.indent + line.keyName + separator + formatValue(line.keyValue)
+	info, err := os.Stat(ini.filename)
+	if err != nil {
+		return err
+	}
+	return ini.saveFile(ini.filename, data, info.Mode().Perm())
 }
 
-func formatValue(value string) string {
+func (ini *GoINI) saveFile(filename string, data string, perm os.FileMode) error {
-	if strings.TrimSpace(value) == value && !hasSurroundingQuotes(value) {
+	if filename == "" {
-		return value
+		return errFilenameRequired
 	}
-	quote := `"`
+	perm = perm.Perm()
-	if strings.HasPrefix(value, `"`) && strings.HasSuffix(value, `"`) {
+	writePerm := perm | 0o200
-		quote = "`"
+	if info, err := os.Stat(filename); err == nil {
+		if info.Mode().IsRegular() {
+			if err := os.Chmod(filename, writePerm); err != nil {
+				return err
 			}
-	return quote + value + quote
+		}
+	} else if !errors.Is(err, os.ErrNotExist) {
+		return err
+	}
+	if err := os.WriteFile(filename, []byte(data), writePerm); err != nil {
+		return err
+	}
+	if err := os.Chmod(filename, perm); err != nil {
+		return err
+	}
+	ini.filename = filename
+	return nil
 }
 
 func matchStrings(items []string, match string) []string {