refactor

cmd/api/connection.go

@@ -10,7 +10,7 @@ import (
 )
 
 // GetConnections fetches the connection data from the API and returns the response body as a byte slice.
-func GetConnections(stationFrom string, stationTo string, time string, arrdep string) ([]byte, error) {
+func GetConnections(stationFrom string, stationTo string) ([]byte, error) {
 	url := fmt.Sprintf("https://api.irail.be/connections/?from=%s&to=%s&timesel=departure&format=json&lang=en&typeOfTransport=automatic&alerts=false&results=6", stationFrom, stationTo)
 
 	resp, err := http.Get(url)
@@ -46,7 +46,7 @@ func ParseConnections(body []byte) ([]Connection, error) {
 func GetDurationInMinutes(c Connection) string {
 	duration, err := strconv.Atoi(c.Duration)
 	if err != nil {
-		fmt.Printf("Duration could not be parsed: %s", duration)
+		fmt.Printf("Duration could not be parsed: %d", duration)
 	}
 
 	duration /= 60
@@ -67,7 +67,7 @@ func (c Connection) GetDelayInSeconds() int {
 func (c Connection) GetUnixDepartureTime() int {
 	depTime, err := strconv.Atoi(c.Departure.Time)
 	if err != nil {
-		fmt.Println("Error converting departuretime: %s", c.Departure.Time)
+		fmt.Printf("Error converting departuretime: %s\n", c.Departure.Time)
 	}
 	return depTime
 }

cmd/api/irail-api.go

@@ -28,7 +28,7 @@ func makeAPIRequest(url string) ([]byte, error) {
 }
 
 // GetSNCBStationTimeTable fetches the timetable for a specific station
-func GetSNCBStationTimeTable(stationName string, time string, arrdep string) ([]byte, error) {
+func GetSNCBStationTimeTable(stationName string) ([]byte, error) {
 	url := fmt.Sprintf("https://api.irail.be/liveboard/?station=%s&lang=nl&format=json", stationName)
 	return makeAPIRequest(url)
 }

cmd/api/timetableDepartureStruct.go

@@ -8,7 +8,7 @@ import (
 func (d TimetableDeparture) GetUnixDepartureTime() int {
 	time, err := strconv.Atoi(d.Time)
 	if err != nil {
-		fmt.Println("Error converting departure time: %s", d.Time)
+		fmt.Printf("Error converting departure time: %s\n", d.Time)
 	}
 
 	return time
@@ -17,7 +17,7 @@ func (d TimetableDeparture) GetUnixDepartureTime() int {
 func (d TimetableDeparture) GetDelayInSeconds() int {
 	delay, err := strconv.Atoi(d.Delay)
 	if err != nil {
-		fmt.Println("Error converting delay: %s", d.Delay)
+		fmt.Printf("Error converting delay: %s\n", d.Delay)
 	}
 	return delay
 }

cmd/tables/tableUtil.go

@@ -10,7 +10,10 @@ import (
 const (
 	Gray               = "240"
 	White              = "15"
+	Green              = "2"
+	Orange             = "214"
 	Mauve              = "97"
+	Red                = "9"
 	BorderColor        = Gray
 	SelectedForeground = White
 	SelectedBackground = Mauve
@@ -20,12 +23,12 @@ const (
 var DetailsBoxStyle = lipgloss.NewStyle().Padding(1)
 
 var (
-	baseOccupancyStyle = lipgloss.NewStyle().Italic(true)
+	OccupancyStyle = lipgloss.NewStyle().Italic(true)
 
-	lowOccupancyStyle     = baseOccupancyStyle.Copy().Foreground(lipgloss.Color("2"))   // green
-	mediumOccupancyStyle  = baseOccupancyStyle.Copy().Foreground(lipgloss.Color("214")) // orange
-	highOccupancyStyle    = baseOccupancyStyle.Copy().Foreground(lipgloss.Color("9"))   // red
-	unknownOccupancyStyle = baseOccupancyStyle.Copy().Faint(true)
+	lowOccupancyStyle     = OccupancyStyle.Copy().Foreground(lipgloss.Color(Green))
+	mediumOccupancyStyle  = OccupancyStyle.Copy().Foreground(lipgloss.Color(Orange))
+	highOccupancyStyle    = OccupancyStyle.Copy().Foreground(lipgloss.Color(Red))
+	unknownOccupancyStyle = OccupancyStyle.Copy().Faint(true)
 )
 
 func styleOccupancy(s string) string {

cmd/util.go

@@ -3,17 +3,9 @@ package cmd
 import (
 	"fmt"
 	"strconv"
-	"strings"
 	"time"
 )
 
-// TODO: needed for flag parsing
-func normalizeTime(time string) string {
-	time = strings.ReplaceAll(time, " ", "")
-	time = strings.ReplaceAll(time, ":", "")
-	return time
-}
-
 func UnixToHHMM(unixTime string) string {
 	unixTimeInt, err := strconv.ParseInt(unixTime, 10, 64)
 	if err != nil {

go.mod

@@ -28,6 +28,6 @@ require (
 	github.com/rivo/uniseg v0.4.6 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/term v0.6.0
 	golang.org/x/text v0.3.8 // indirect
 )

main.go

@@ -31,7 +31,7 @@ func handleConnection(stationFrom string, stationTo string) {
 	s := cmd.NewSpinner(" ", " fetching connections...", 1*time.Second)
 	s.Start()
 
-	connectionsJSON, err := api.GetConnections(stationFrom, stationTo, "", "")
+	connectionsJSON, err := api.GetConnections(stationFrom, stationTo)
 	if err != nil {
 		panic(err)
 	}
@@ -42,10 +42,10 @@ func handleConnection(stationFrom string, stationTo string) {
 	}
 
 	columns := []teaTable.Column{
-		{Title: "Departure", Width: 7},
+		{Title: "Dep", Width: 7},
 		{Title: "", Width: 4},
 		{Title: " ⏲", Width: 7},
-		{Title: "Arrival", Width: 7},
+		{Title: "Arr", Width: 7},
 		{Title: "Track", Width: 10},
 	}
 
@@ -88,7 +88,7 @@ func handleTimetable(stationName string) {
 	s := cmd.NewSpinner(" ", " fetching timetable...", 1*time.Second)
 	s.Start()
 
-	timetableJSON, err := api.GetSNCBStationTimeTable(stationName, "", "departure")
+	timetableJSON, err := api.GetSNCBStationTimeTable(stationName)
 	if err != nil {
 		panic(err)
 	}