config.go

@@ -1,22 +0,0 @@
-package main
-
-import (
-	"github.com/BurntSushi/toml"
-	"os"
-)
-
-type Config struct {
-	Quays []Quay
-}
-
-func ReadConfigFromFile(filename string) (Config, error) {
-	var conf Config
-
-	contents, err := os.ReadFile(filename)
-	if err != nil {
-		return conf, err
-	}
-
-	_, err = toml.Decode(string(contents), &conf)
-	return conf, err
-}

go.mod

@@ -1,5 +1,3 @@
 module git.jasperbok.nl/jasperbok/busdepartures.git
 
 go 1.20
-
-require github.com/BurntSushi/toml v1.3.2

go.sum

@@ -1,2 +0,0 @@
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=

main.go

@@ -2,35 +2,18 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"net/http"
-	"os"
 )
 
 var BusClient *http.Client
-var Quays []Quay
+var Quays []Quay = []Quay{}
 
 func main() {
-	var confFilename string
 	var port int
 
-	flag.StringVar(&confFilename, "c", "", "Path to the configuration file")
 	flag.IntVar(&port, "p", 4444, "The port to start the server on")
 	flag.Parse()
 
-	if confFilename == "" {
-		fmt.Printf("No configuation file provided. Provide the path to a configuration file with the -c flag.\n")
-		os.Exit(0)
-	}
-
-	conf, err := ReadConfigFromFile(confFilename)
-	if err != nil {
-		fmt.Printf("%v\n", err)
-		os.Exit(1)
-	}
-
-	Quays = conf.Quays
-
 	BusClient = &http.Client{}
 	serveHttp(port)
 }

quay.go

@@ -6,10 +6,10 @@ import (
 )
 
 type Quay struct {
-	ID               string  `json:"quayid" toml:"id"`
-	Name             string  `json:"name" toml:"name"`
-	Town             string  `json:"town" toml:"town"`
-	RoutesOfInterest []Route `toml:"routes_of_interest"`
+	ID               string `json:"quayid"`
+	Name             string `json:"name"`
+	Town             string `json:"town"`
+	RoutesOfInterest []Route
 }
 
 func (q Quay) IsInterestingDeparture(d Departure) bool {

route.go

@@ -1,6 +1,6 @@
 package main
 
 type Route struct {
-	RouteShortName string `json:"route_short_name" toml:"short_name"`
-	RouteLongName  string `json:"route_long_name" toml:"long_name"`
+	RouteShortName string `json:"route_short_name"`
+	RouteLongName  string `json:"route_long_name"`
 }