request station info in separate function
This commit is contained in:
parent
7416b1c92b
commit
2698b50232
36
departure.sh
36
departure.sh
|
@ -161,6 +161,30 @@ get_cvag_station_name()
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get_cvag_station_info()
|
||||||
|
{
|
||||||
|
local -n _STATION_STOPS=$2
|
||||||
|
local -n _STATION_NOW=$3
|
||||||
|
local -n _STATION_DESTINATIONS=$4
|
||||||
|
local -n _STATION_LINES=$5
|
||||||
|
local -n _STATION_ACTUAL_DEPARTURE=$6
|
||||||
|
local -n _REALSTATION_NOW=$7
|
||||||
|
local -n _THISDATE=$8
|
||||||
|
|
||||||
|
STATION_SCHEDULE="$(curl --connect-timeout 5 -s http://cvag.de/eza/mis/stops/station/CAG-${STATION_ID[$1]})"
|
||||||
|
|
||||||
|
_STATION_STOPS=$(echo "$STATION_SCHEDULE" | jq -r ".stops | .[]")
|
||||||
|
_STATION_NOW=$(echo "$STATION_SCHEDULE" | jq -r ".now")
|
||||||
|
_STATION_DESTINATIONS=($(echo -n "$_STATION_STOPS" | jq -r ".destination"))
|
||||||
|
_STATION_LINES=($(echo -n "$_STATION_STOPS" | jq -r ".line"))
|
||||||
|
_STATION_ACTUAL_DEPARTURE=($(echo -n "$_STATION_STOPS" | jq -r ".actualDeparture"))
|
||||||
|
[ ${#_STATION_NOW} -lt 1 ] && _STATION_NOW="0"
|
||||||
|
REALSTATION_NOWMS=$(( "$_STATION_NOW" % 1000 ))
|
||||||
|
[ ${#REALSTATION_NOWMS} -lt 3 ] && REALSTATION_NOWMS="0$REALSTATION_NOWMS"
|
||||||
|
_REALSTATION_NOW=$(( "$_STATION_NOW" / 1000))
|
||||||
|
_THISDATE=$(date --date="@$_REALSTATION_NOW" +"%d.%m.%Y %T")",$REALSTATION_NOWMS"
|
||||||
|
}
|
||||||
|
|
||||||
draw_logo_time()
|
draw_logo_time()
|
||||||
{
|
{
|
||||||
local -n _MYOUTPUT=$1
|
local -n _MYOUTPUT=$1
|
||||||
|
@ -185,18 +209,8 @@ while true; do
|
||||||
MYOUTPUT="\\n "
|
MYOUTPUT="\\n "
|
||||||
|
|
||||||
for ((j=0; j<"${#STATION_ID[*]}"; j++)); do
|
for ((j=0; j<"${#STATION_ID[*]}"; j++)); do
|
||||||
STATION_SCHEDULE="$(curl --connect-timeout 5 -s http://cvag.de/eza/mis/stops/station/CAG-${STATION_ID[$j]})"
|
|
||||||
|
|
||||||
STATION_STOPS=$(echo "$STATION_SCHEDULE" | jq -r ".stops | .[]")
|
get_cvag_station_info $j STATION_STOPS STATION_NOW STATION_DESTINATIONS STATION_LINES STATION_ACTUAL_DEPARTURE REALSTATION_NOW THISDATE
|
||||||
STATION_NOW=$(echo "$STATION_SCHEDULE" | jq -r ".now")
|
|
||||||
STATION_DESTINATIONS=($(echo -n "$STATION_STOPS" | jq -r ".destination"))
|
|
||||||
STATION_LINES=($(echo -n "$STATION_STOPS" | jq -r ".line"))
|
|
||||||
STATION_ACTUAL_DEPARTURE=($(echo -n "$STATION_STOPS" | jq -r ".actualDeparture"))
|
|
||||||
[ ${#STATION_NOW} -lt 1 ] && STATION_NOW="0"
|
|
||||||
REALSTATION_NOWMS=$(( "$STATION_NOW" % 1000 ))
|
|
||||||
[ ${#REALSTATION_NOWMS} -lt 3 ] && REALSTATION_NOWMS="0$REALSTATION_NOWMS"
|
|
||||||
REALSTATION_NOW=$(( "$STATION_NOW" / 1000))
|
|
||||||
THISDATE=$(date --date="@$REALSTATION_NOW" +"%d.%m.%Y %T")",$REALSTATION_NOWMS"
|
|
||||||
|
|
||||||
# Wenn Logo gezeichnet werden soll, baue Urzeit ran und zeichne
|
# Wenn Logo gezeichnet werden soll, baue Urzeit ran und zeichne
|
||||||
[ "$j" -eq "$LOGO_LINES_POSITION" ] && draw_logo_time MYOUTPUT $REALSTATION_NOW
|
[ "$j" -eq "$LOGO_LINES_POSITION" ] && draw_logo_time MYOUTPUT $REALSTATION_NOW
|
||||||
|
|
Loading…
Reference in New Issue