separate Tours when multiple are loaded

This commit is contained in:
tjp 2024-03-31 10:15:00 -05:00
parent 3449bf236d
commit 175e45b49c
1 changed files with 4 additions and 4 deletions

View File

@ -137,7 +137,7 @@ func getTours() (map[string]*Tour, error) {
} }
tours := make(map[string]*Tour) tours := make(map[string]*Tour)
var current Tour var current *Tour
var currentName string var currentName string
f, err := os.Open(path) f, err := os.Open(path)
@ -151,10 +151,10 @@ func getTours() (map[string]*Tour, error) {
line := rdr.Text() line := rdr.Text()
if strings.HasSuffix(line, ":") { if strings.HasSuffix(line, ":") {
if currentName != "" { if currentName != "" {
tours[currentName] = &current tours[currentName] = current
} }
currentName = strings.TrimSuffix(line, ":") currentName = strings.TrimSuffix(line, ":")
current = Tour{} current = &Tour{}
} else { } else {
u, err := url.Parse(line) u, err := url.Parse(line)
if err != nil { if err != nil {
@ -168,7 +168,7 @@ func getTours() (map[string]*Tour, error) {
} }
if currentName != "" { if currentName != "" {
tours[currentName] = &current tours[currentName] = current
} }
return tours, nil return tours, nil