add adaptive message for arrival times

Signed-off-by: Daniel Stamer <[email protected]>

Author: helloworlddan

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -44,3 +45,7 @@ func unixMillisToTime(millis uint64) time.Time {
 	seconds := int64(millis / 1000)
 	return time.Unix(seconds, 0)
 }
+
+func formatTimeDelta(d time.Duration) string {
+	return strings.Split(d.String(), ".")[0]
+}

cmd/stops.go

@@ -40,7 +40,10 @@ var stopsCmd = &cobra.Command{
 				if remainingDuration < 0 {
 					return "-"
 				}
-				return remainingDuration.String()
+				if remainingDuration < time.Duration(time.Minute*3) {
+					return "GET OUT NOW"
+				}
+				return formatTimeDelta(remainingDuration)
 			}()
 			stopView.DelayReasons = func() string {
 				reasons := []string{}

cmd/trip.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/spf13/cobra"
 
@@ -33,14 +34,15 @@ type Trip struct {
 	NextStop           string `header:"Next Stop"`
 	StopsToDestination int
 	Progress           string `header:"Progress"`
+	TimeToArrival      string `header:"Arriving"`
 }
 
 type StopInfo struct {
 	ScheduledNext     string `json:"scheduledNext"`
 	ActualNext        string `json:"actualNext"`
 	ActualLast        string `json:"actualLast"`
 	ActualLastStarted string `json:"actualLastStarted"`
-	FinalStationName  string `header:"FD" json:"finalStationName"`
+	FinalStationName  string `json:"finalStationName"`
 }
 
 type Stop struct {
@@ -199,6 +201,21 @@ func refreshTrip() (Trip, error) {
 		}
 		return fmt.Sprintf("%d/%d", departedStops, envelope.Trip.StopsToDestination)
 	}()
+	envelope.Trip.TimeToArrival = func() string {
+		var arrival uint64
+		for _, stop := range envelope.Trip.Stops {
+			if stop.Station.Name == envelope.Trip.YourDestination {
+				arrival = stop.TimeTable.ActualArrivalTime
+				break
+			}
+		}
+		arrivalTime := unixMillisToTime(arrival)
+		remainingDuration := time.Until(arrivalTime)
+		if remainingDuration < time.Duration(time.Minute*3) {
+			return "GET OUT NOW"
+		}
+		return formatTimeDelta(remainingDuration)
+	}()
 
 	return envelope.Trip, nil
 }