cleanup (#12)

* update (#10)

* removed overlap in different models

* implemented showing message after closing table with selection

* added quit option "escape"

quits table with any additional info

* updated to more correct color name lol

* show detailed information for a departure

* fixed import path

* Update README.md

added installation options

* Dev (#8)

* fixed import path

* added autobuild

* Update README.md (#9)

added installation options

* created const

* cleanup and refactor

* corrected if-else block

* refactor of project structure

cmd/connection.go → cmd/api/connection.go

@@ -1,4 +1,4 @@
-package cmd
+package api
 
 import (
 	"encoding/json"

cmd/irail-api.go → cmd/api/irail-api.go

@@ -1,4 +1,4 @@
-package cmd
+package api
 
 // https://docs.irail.be/
 
@@ -29,7 +29,7 @@ func GetSNCBStationTimeTable(stationName string, time string, arrdep string) ([]
 }
 
 // ParseiRailDepartures handles fetching of timetable departures
-func ParseiRailDepartures(jsonData []byte) ([]timetableDeparture, error) {
+func ParseiRailDepartures(jsonData []byte) ([]TimetableDeparture, error) {
 	var response StationTimetableResponse
 	err := json.Unmarshal(jsonData, &response)
 	if err != nil {

cmd/irail-api_test.go → cmd/api/irail-api_test.go

@@ -1,4 +1,4 @@
-package cmd
+package api
 
 import (
 	"reflect"

cmd/timetable_departure_object.go → cmd/api/timetable_departure_object.go

@@ -1,4 +1,4 @@
-package cmd
+package api
 
 type StationTimetableResponse struct {
 	Version     string      `json:"version"`
@@ -18,10 +18,10 @@ type StationInfo struct {
 
 type Departures struct {
 	Number    string               `json:"number"`
-	Departure []timetableDeparture `json:"departure"`
+	Departure []TimetableDeparture `json:"departure"`
 }
 
-type timetableDeparture struct {
+type TimetableDeparture struct {
 	ID                  string       `json:"id"`
 	Station             string       `json:"station"`
 	StationInfo         StationInfo  `json:"stationinfo"`

cmd/departure-table.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/Kaya-Sem/commandtrein/cmd/api"
 	"os"
 
 	"github.com/charmbracelet/bubbles/table"
@@ -24,12 +25,12 @@ type tableModel struct {
 	relativeTime string
 	showMessage  bool
 	message      string
-	departures   []timetableDeparture
+	departures   []api.TimetableDeparture
 }
 
 func (m tableModel) Init() tea.Cmd { return nil }
 
-func getDetailedDepartureInfo(d timetableDeparture) string {
+func getDetailedDepartureInfo(d api.TimetableDeparture) string {
 	return fmt.Sprintf(`
 Detailed info:
 Destination: %s
@@ -80,6 +81,8 @@ func (m tableModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, cmd
 }
 
+var italicStyle = lipgloss.NewStyle().Italic(true)
+
 func (m tableModel) View() string {
 	if m.showMessage {
 		// Show the message instead of the table if the flag is set
@@ -88,15 +91,15 @@ func (m tableModel) View() string {
 
 	// Add the relative time to the view only if there is a selected row
 	if m.relativeTime != "" {
-		return baseStyle1.Render(m.table.View()) + "\n\n" + "Departure in: " + m.relativeTime + "\n"
+		return baseStyle1.Render(m.table.View()) + "\n\n" + "Departure in: " + italicStyle.Render(m.relativeTime) + "\n"
 	}
 	return baseStyle1.Render(m.table.View()) + "\n"
 }
 
 func RenderTable(
 	columnItems []table.Column,
 	rowItems []table.Row,
-	departures []timetableDeparture,
+	departures []api.TimetableDeparture,
 ) {
 	fmt.Println()
 

cmd/table.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/Kaya-Sem/commandtrein/cmd/api"
 	"os"
 	"strconv"
 
@@ -10,9 +11,6 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
-var baseStyle = lipgloss.NewStyle().
-	BorderForeground(lipgloss.Color("9"))
-
 type model struct {
 	table        table.Model
 	relativeTime string
@@ -27,10 +25,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		switch msg.String() {
 		case "q", "ctrl+c":
 			return m, tea.Quit
-			// case "enter":
-			// 	return m, tea.Batch(
-			// 		tea.Printf("Let's go to %s!", m.table.SelectedRow()[0]),
-			// 	)
+		case "enter":
+			return m, tea.Batch(
+				tea.Printf("detailed info here"),
+			)
 		}
 	}
 
@@ -57,7 +55,7 @@ func (m model) View() string {
 	return baseStyle1.Render(m.table.View()) + "\n"
 }
 
-func PrintDepartureTable(connections []Connection) {
+func PrintDepartureTable(connections []api.Connection) {
 	fmt.Println()
 	columns := []table.Column{
 		{Title: "Departure", Width: 10},

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/Kaya-Sem/commandtrein/cmd"
+	"github.com/Kaya-Sem/commandtrein/cmd/api"
 	"os"
 	"time"
 
@@ -32,12 +33,12 @@ func handleConnection(stationFrom string, stationTo string) {
 	s.Start()
 	time.Sleep(1 * time.Second)
 
-	connectionsJSON, err := cmd.GetConnections(stationFrom, stationTo, "", "")
+	connectionsJSON, err := api.GetConnections(stationFrom, stationTo, "", "")
 	if err != nil {
 		panic(err)
 	}
 
-	connections, err := cmd.ParseConnections(connectionsJSON)
+	connections, err := api.ParseConnections(connectionsJSON)
 	if err != nil {
 		panic(err)
 	}
@@ -47,8 +48,8 @@ func handleConnection(stationFrom string, stationTo string) {
 }
 
 func handleSearch() {
-	stationsJSON := cmd.GetSNCBStationsJSON()
-	stations, err := cmd.ParseStations(stationsJSON)
+	stationsJSON := api.GetSNCBStationsJSON()
+	stations, err := api.ParseStations(stationsJSON)
 	if err != nil {
 		panic(err)
 	}
@@ -65,12 +66,12 @@ func handleTimetable(stationName string) {
 	s.Start()
 	time.Sleep(1 * time.Second)
 
-	timetableJSON, err := cmd.GetSNCBStationTimeTable(stationName, "", "departure")
+	timetableJSON, err := api.GetSNCBStationTimeTable(stationName, "", "departure")
 	if err != nil {
 		panic(err)
 	}
 
-	departures, err := cmd.ParseiRailDepartures(timetableJSON)
+	departures, err := api.ParseiRailDepartures(timetableJSON)
 	if err != nil {
 		fmt.Printf("failed to parse iRail departures JSON: %v", err)
 	}