Refactor: reduce the use of strings.TrimSpace

This commit is contained in:
MkQtS
2026-01-02 00:24:20 +08:00
parent aa99dcb556
commit 0c623c88d3

19
main.go
View File

@@ -123,14 +123,6 @@ func exportPlainTextList(list []string, refName string, pl *ParsedList) {
} }
} }
func removeComment(line string) string {
idx := strings.Index(line, "#")
if idx == -1 {
return line
}
return strings.TrimSpace(line[:idx])
}
func parseDomain(domain string, entry *Entry) error { func parseDomain(domain string, entry *Entry) error {
kv := strings.Split(domain, ":") kv := strings.Split(domain, ":")
if len(kv) == 1 { if len(kv) == 1 {
@@ -166,7 +158,6 @@ func parseAttribute(attr string) (*router.Domain_Attribute, error) {
} }
func parseEntry(line string) (Entry, error) { func parseEntry(line string) (Entry, error) {
line = strings.TrimSpace(line)
parts := strings.Split(line, " ") parts := strings.Split(line, " ")
var entry Entry var entry Entry
@@ -201,9 +192,13 @@ func Load(path string) (*List, error) {
} }
scanner := bufio.NewScanner(file) scanner := bufio.NewScanner(file)
for scanner.Scan() { for scanner.Scan() {
line := strings.TrimSpace(scanner.Text()) line := scanner.Text()
line = removeComment(line) // Remove comments
if len(line) == 0 { if idx := strings.Index(line, "#"); idx != -1 {
line = line[:idx]
}
line = strings.TrimSpace(line)
if line == "" {
continue continue
} }
entry, err := parseEntry(line) entry, err := parseEntry(line)