+
- On the bottom left, click ` Development`
-
+
- Create a new Application by clicking the button, then:
- Give it a name (for example, "Planefence")
- - Add a URL (if you don't have one, use something like "https://airwaves.social/@myhandle" (replace `myhandle` by your Mastodon handle))
+ - Add a URL (if you don't have one, use something like "This website shows a list of aircraft of interest that were heard by
-
Plane-Alert is part of KX1T's PlaneFence Open Source Project, available on GitHub. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join.
-
© Copyright 2020, 2021 by Ramón F. Kolb. Please see here for attributions to our contributors and open source packages used.
-
-
-
+
Plane-Alert is part of KX1T's PlaneFence Open Source Project, available on GitHub. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join.
+
© Copyright 2020-2024 by Ramón F. Kolb. Please see here for attributions to our contributors and open source packages used.
+
+
+
diff --git a/rootfs/usr/share/plane-alert/pa_query.sh b/rootfs/usr/share/plane-alert/pa_query.sh
index 8d9bc75b..93455e81 100755
--- a/rootfs/usr/share/plane-alert/pa_query.sh
+++ b/rootfs/usr/share/plane-alert/pa_query.sh
@@ -5,10 +5,10 @@
# Usage: pf_php.sh [hex=] [call=] [start=] [end=] file=
# File argument is always required and at least 1 additional argument is required.
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/plane-alert/plane-alert.conf b/rootfs/usr/share/plane-alert/plane-alert.conf
index b1e5b93d..d3d2f027 100644
--- a/rootfs/usr/share/plane-alert/plane-alert.conf
+++ b/rootfs/usr/share/plane-alert/plane-alert.conf
@@ -1,9 +1,9 @@
# PLANE-ALERT.CONF - user changeable variables for PLANE-ALERT.SH
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/plane-alert/
+# https://github.com/sdr-enthusiasts/plane-alert/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -43,8 +43,18 @@
OUTAPPDATE=true
#
# -----------------------------------------------------------------------------------
-# Flight link provided by... (not yet implemented - will use adsbexchange regardless of this parameter)
- TRACKSERVICE="adsbexchange"
+# Flight link to an tar1090-based service. Only the URL/location is needed.
+# Examples inlude:
+# globe.adsbexchange.com
+# my.adsb.radar/tar1090
+# globe.airplanes.live
+# et cetera
+ TRACKSERVICE=globe.adsbexchange.com
+#
+# -----------------------------------------------------------------------------------
+# Limits to the number of aircraft shown in a link in the list on the top of the plane-alert webpage
+# Don't make this larger than 1000 as that will probably the user's browser
+ TRACKLIMIT=250
#
# -----------------------------------------------------------------------------------
# Where to get the list of planes of interest. If you want to change this file, please ensure to keep the same format.
@@ -134,12 +144,14 @@ set -a
set +a
# MASTODON parameters for MASTODON notifications as an alternative to Twitter:
# MASTODON_SERVER contains the mastodon server name, for example "airwaves.social"
-# MASTODON_ACCESS_TOKEN contains the mastodon access token needed for posting
- MASTODON_SERVER=
- MASTODON_ACCESS_TOKEN=
- MASTODON_VISIBILITY=unlisted
- MASTODON_MAXIMGS=1
- MASTODON_RETENTION_TIME=
+# MASTODON_NAME contains the @ name of the Mastodon account
+ MASTODON_SERVER=
+ MASTODON_ACCESS_TOKEN=
+ MASTODON_VISIBILITY=unlisted
+ MASTODON_NAME=
+ MASTODON_MAXIMGS=1
+ MASTODON_RETENTION_TIME=
+ ATTRIB="#adsb #planefence #planealert by kx1t - https://sdr-e.com/docker-planefence"
#
# AUTOREFRESH controls if the web page auto-refreshed. The refresh interval is the same as $PFINTERVAL.
diff --git a/rootfs/usr/share/plane-alert/plane-alert.footer.html b/rootfs/usr/share/plane-alert/plane-alert.footer.html
index 1027e03c..7b553d57 100644
--- a/rootfs/usr/share/plane-alert/plane-alert.footer.html
+++ b/rootfs/usr/share/plane-alert/plane-alert.footer.html
@@ -2,7 +2,7 @@
Plane-Alert version ##VERSION## is part of KX1T's PlaneFence Open Source Project, available under the GPLv3 license on Github. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join.
-
Build: ##BUILD##. © Copyright 2020 - 2023 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
+
Build: ##BUILD##. © Copyright 2020 - 2024 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
diff --git a/rootfs/usr/share/plane-alert/plane-alert.header.html b/rootfs/usr/share/plane-alert/plane-alert.header.html
index 8c8330e9..41b3baed 100644
--- a/rootfs/usr/share/plane-alert/plane-alert.header.html
+++ b/rootfs/usr/share/plane-alert/plane-alert.header.html
@@ -6,10 +6,10 @@
# are always welcome. Join me at the GitHub link shown below, or via email
# at kx1t (at) amsat (dot) org.
#
-# Copyright 2021-2023 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/plane-alert/
+# https://github.com/sdr-enthusiasts/plane-alert/
#
# The package contains parts of, links to, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -54,6 +54,7 @@
top: 0;
}
+ ##MASTOHEADER##
@@ -73,9 +74,11 @@ This website shows a list of aircraft of interest that were heard by Aircraft are listed in reverse chronological order. Click the header of a column to resort.
Note that for each aircraft, only the first observation of the day is listed. Additional flights, if any, can be seen on the Flight Map link.
Only aircraft that have been seen in the last ##HISTTIME## days will be displayed below. The CSV version contains the complete history.
- Click on the Transponder ID to see the aircraft history on ADSBExchange
+ Click on the Transponder ID to see the aircraft history on ##TRACKSERVICE##
Click on the Tail number to see the flight history, potentially with routing information, on FlightAware
+ ##MEGALINK##
##PFLINK##
+ ##MASTODONLINK##
diff --git a/rootfs/usr/share/plane-alert/plane-alert.sh b/rootfs/usr/share/plane-alert/plane-alert.sh
index 26aeba26..38d634a4 100755
--- a/rootfs/usr/share/plane-alert/plane-alert.sh
+++ b/rootfs/usr/share/plane-alert/plane-alert.sh
@@ -5,10 +5,10 @@
#
# Usage: ./plane-alert.sh
#
-# Copyright 2021-2023 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -66,7 +66,7 @@ APPNAME="$(hostname)/plane-alert"
[[ "$SCREENSHOT_TIMEOUT" == "" ]] && SCREENSHOT_TIMEOUT=45
-[[ "$BASETIME" != "" ]] && echo "10a1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: parse alert list into dictionary" || true
+[[ -n "$BASETIME" ]] && echo "10a1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: parse alert list into dictionary" || true
#
# Now let's start
@@ -90,7 +90,7 @@ while IFS="" read -r line; do
((ALERT_ENTRIES=ALERT_ENTRIES+1))
done < "$PLANEFILE"
-[[ "$BASETIME" != "" ]] && echo "10a2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: check input for hex numbers on alert list" || true
+[[ -n "$BASETIME" ]] && echo "10a2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: check input for hex numbers on alert list" || true
# Now search through the input file to see if we detect any planes in the alert list
@@ -127,7 +127,7 @@ fi
# Let's figure out if we also need to find SQUAWKS
rm -f "$TMPDIR"/patmp
touch "$TMPDIR"/patmp
-if [[ "$SQUAWKS" != "" ]]
+if [[ -n "$SQUAWKS" ]]
then
IFS="," read -ra sq <<< "$SQUAWKS"
# add some zeros to the front, in case there are less than 4 chars
@@ -189,7 +189,7 @@ cp -f "$OUTFILE" /tmp/pa-old.csv
# 0=hex_ident,1=altitude(feet),2=latitude,3=longitude,4=date,5=time,6=angle,7=distance(kilometer),8=squawk,9=ground_speed(knotph),10=track,11=callsign
# A0B674,750,42.29663,-71.00664,2021/03/17,16:43:52.598,122.36,30.2,0305,139,321,N145NE
-[[ "$BASETIME" != "" ]] && echo "10b. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start processing new data" || true
+[[ -n "$BASETIME" ]] && echo "10b. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start processing new data" || true
while IFS= read -r line
do
@@ -199,7 +199,7 @@ do
# Skip the line if it's out of range
awk "BEGIN{ exit (${pa_record[7]} < $RANGE) }" && continue
- PLANELINE="${ALERT_DICT["${pa_record[0]}"]}"
+ PLANELINE="${ALERT_DICT[${pa_record[0]}]}"
IFS="," read -ra TAGLINE <<< "$PLANELINE"
# Parse this into a single line with syntax ICAO,TailNr,Owner,PlaneDescription,date,time,lat,lon,callsign,adsbx_url,squawk
@@ -234,7 +234,7 @@ do
outrec+="${pa_record[11]/ */}," # callsign or flt nr (stripped spaces)
epoch_sec="$(date -d"${pa_record[4]} ${pa_record[5]}" +%s)"
- outrec+="https://globe.adsbexchange.com/?icao=${pa_record[0]}&showTrace=$(date -u -d@"${epoch_sec}" "+%Y-%m-%d")&zoom=$MAPZOOM&lat=${pa_record[2]}&lon=${pa_record[3]}×tamp=${epoch_sec}," # ICAO for insertion into ADSBExchange link
+ outrec+="https://$TRACKSERVICE/?icao=${pa_record[0]}&showTrace=$(date -u -d@"${epoch_sec}" "+%Y-%m-%d")&zoom=$MAPZOOM&lat=${pa_record[2]}&lon=${pa_record[3]}×tamp=${epoch_sec}," # ICAO for insertion into ADSBExchange link
# only add squawk if its in the list
x=""
@@ -242,7 +242,7 @@ do
do
x+=$(awk "{if(\$1 ~ /${sq[i]}/){print}}" <<< "${pa_record[8]}")
done
- [[ "$x" != "" ]] && outrec+="${pa_record[8]}" # squawk
+ [[ -n "$x" ]] && outrec+="${pa_record[8]}" # squawk
echo "$outrec" >> "$OUTFILE" # Append this line to $OUTWRITEFILE
@@ -252,7 +252,7 @@ sort -t',' -k5,5 -k1,1 -k11,11 -u -o /tmp/pa-new.csv "$OUTFILE" # sort by fiel
sort -t',' -k5,5 -k6,6 -o "$OUTFILE" /tmp/pa-new.csv # sort once more by date and time but keep all entries
# the log files are now done, but we want to figure out what is new
-[[ "$BASETIME" != "" ]] && echo "10c. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done processing new data" || true
+[[ -n "$BASETIME" ]] && echo "10c. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done processing new data" || true
# create some diff files
rm -f /tmp/pa-diff.csv
@@ -269,10 +269,10 @@ comm -23 <(sort < "$OUTFILE") <(sort < /tmp/pa-old.csv ) >/tmp/pa-diff.csv
# Read the header - we will need it a few times later:
# shellcheck disable=SC2001
-[[ "$ALERTHEADER" != "" ]] && IFS="," read -ra header <<< "$(sed 's/\#\$/$#/g' <<< "$ALERTHEADER")" || IFS="," read -ra header <<< "$(head -n1 "$PLANEFILE" | sed 's/\#\$/$#/g')"
+[[ -n "$ALERTHEADER" ]] && IFS="," read -ra header <<< "$(sed 's/\#\$/$#/g' <<< "$ALERTHEADER")" || IFS="," read -ra header <<< "$(head -n1 "$PLANEFILE" | sed 's/\#\$/$#/g')"
# if ALERTHEADER is set, then use that one instead of
-[[ "$BASETIME" != "" ]] && echo "10d. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start Tweet run" || true
+[[ -n "$BASETIME" ]] && echo "10d. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start Tweet run" || true
# If there's any new alerts send them out
if [[ "$(cat /tmp/pa-diff.csv | wc -l)" != "0" ]]
@@ -287,7 +287,7 @@ then
unset pa_record
IFS=',' read -ra pa_record <<< "$line"
- [[ "$BASETIME" != "" ]] && echo "10d1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: processing ${pa_record[1]}" || true
+ [[ -n "$BASETIME" ]] && echo "10d1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: processing ${pa_record[1]}" || true
ICAO="${pa_record[0]}"
@@ -318,7 +318,7 @@ then
GOTSNAP="true"
[[ ! -f "/usr/share/planefence/persist/planepix/${ICAO}.jpg" ]] && cp "$snapfile" "/usr/share/planefence/persist/planepix/${ICAO}.jpg" || true
else
- [[ "$link" != "" ]] && echo "[$(date)][$APPNAME] Failed attempt to get picture from $link" || true
+ [[ -n "$link" ]] && echo "[$(date)][$APPNAME] Failed attempt to get picture from $link" || true
fi
fi
@@ -335,11 +335,11 @@ then
[[ "${header[0]:0:1}" == "$" ]] && pa_record[0]="#${pa_record[0]}" # ICAO field
- [[ "${header[1]:0:1}" == "$" ]] && [[ "${pa_record[1]}" != "" ]] && pa_record[1]="#${pa_record[1]//[[:space:]-]/}" # tail field
- [[ "${header[2]:0:1}" == "$" ]] && [[ "${pa_record[2]}" != "" ]] && pa_record[2]="#${pa_record[2]//[[:space:]]/}" # owner field, stripped off spaces
- [[ "${header[3]:0:1}" == "$" ]] && [[ "${pa_record[2]}" != "" ]] && pa_record[3]="#${pa_record[3]}" # equipment field
- [[ "${header[1]:0:1}" == "$" ]] && [[ "${pa_record[8]}" != "" ]] && pa_record[8]="#${pa_record[8]//[[:space:]-]/}" # flight nr field (connected to tail header)
- [[ "${pa_record[10]}" != "" ]] && pa_record[10]="#${pa_record[10]}" # # squawk
+ [[ "${header[1]:0:1}" == "$" ]] && [[ -n "${pa_record[1]}" ]] && pa_record[1]="#${pa_record[1]//[[:space:]-]/}" # tail field
+ [[ "${header[2]:0:1}" == "$" ]] && [[ -n "${pa_record[2]}" ]] && pa_record[2]="#${pa_record[2]//[[:space:]]/}" # owner field, stripped off spaces
+ [[ "${header[3]:0:1}" == "$" ]] && [[ -n "${pa_record[2]}" ]] && pa_record[3]="#${pa_record[3]}" # equipment field
+ [[ "${header[1]:0:1}" == "$" ]] && [[ -n "${pa_record[8]}" ]] && pa_record[8]="#${pa_record[8]//[[:space:]-]/}" # flight nr field (connected to tail header)
+ [[ -n "${pa_record[10]}" ]] && pa_record[10]="#${pa_record[10]}" # # squawk
# First build the text of the tweet: reminder:
# 0-ICAO,1-TailNr,2-Owner,3-PlaneDescription,4-date,5-time,6-lat,7-lon
@@ -347,10 +347,11 @@ then
TWITTEXT="#PlaneAlert "
TWITTEXT+="ICAO: ${pa_record[0]} "
- [[ "${pa_record[1]}" != "" ]] && TWITTEXT+="Tail: ${pa_record[1]} "
- [[ "${pa_record[8]}" != "" ]] && TWITTEXT+="Flt: ${pa_record[8]} "
- [[ "${pa_record[10]}" != "" ]] && TWITTEXT+="#Squawk: ${pa_record[10]}"
- [[ "${pa_record[2]}" != "" ]] && TWITTEXT+="\nOwner: ${pa_record[2]//[&\']/_}" # trailing ']}" for vim broken syntax
+ [[ -n "${pa_record[1]}" ]] && TWITTEXT+="Tail: ${pa_record[1]} "
+ [[ -n "${pa_record[8]}" ]] && TWITTEXT+="Flt: ${pa_record[8]} "
+ [[ -n "${pa_record[10]}" ]] && TWITTEXT+="#Squawk: ${pa_record[10]}"
+ [[ "${pa_record[10]//#/}" == "7700 " ]] && TWITTEXT+=" #EMERGENCY!"
+ [[ -n "${pa_record[2]}" ]] && TWITTEXT+="\nOwner: ${pa_record[2]//[&\']/_}" # trailing ']}" for vim broken syntax
TWITTEXT+="\nAircraft: ${pa_record[3]}\n"
TWITTEXT+="${pa_record[4]} $(sed 's|/|\\/|g' <<< "${pa_record[5]}")\n"
@@ -366,14 +367,16 @@ then
if [[ "${tag:0:4}" == "http" ]]
then
TWITTEXT+="$(sed 's|/|\\/|g' <<< "$tag") "
- elif [[ "$tag" != "" ]]
+ elif [[ -n "$tag" ]]
then
TWITTEXT+="#$(tr -dc '[:alnum:]' <<< "$tag") "
fi
fi
done
- TWITTEXT+="\n$(sed 's|/|\\/|g' <<< "${pa_record[9]}")"
+ TWITTEXT+="\n$(sed 's|/|\\/|g' <<< "${pa_record[9]//globe.adsbexchange.com/"$TRACKSERVICE"}")"
+
+ TWITTEXT+="\n\n$ATTRIB"
if [[ -n "$MASTODON_SERVER" ]] || [[ "$TWITTER" != "false" ]]
then
@@ -397,7 +400,7 @@ then
# check if there are any images in the plane-alert-db
field=()
- readarray -td, field <<< "${ALERT_DICT["${pa_record[0]#\#}"]}"
+ readarray -td, field <<< "${ALERT_DICT[${pa_record[0]#\#}]}"
for (( i=0 ; i<=20; i++ ))
do
@@ -480,7 +483,7 @@ then
fi
processedresult=$(echo "$rawresult" | jq '.errors[].message' 2>/dev/null || true) # parse the output through JQ and if there\'s an error, provide the text to $result
- if [[ "$processedresult" != "" ]]
+ if [[ -n "$processedresult" ]]
then
echo "[$(date)][$APPNAME] Plane-alert Tweet error for ${pa_record[0]}: $rawresult"
echo "[$(date)][$APPNAME] Diagnostics:"
@@ -535,7 +538,7 @@ then
fi
processedresult=$(echo "$rawresult" | jq '.errors[].message' 2>/dev/null || true) # parse the output through JQ and if there's an error, provide the text to $result
- if [[ "$processedresult" != "" ]]
+ if [[ -n "$processedresult" ]]
then
echo "[$(date)][$APPNAME] Plane-alert Tweet error for ${pa_record[0]}: $rawresult"
echo "[$(date)][$APPNAME] Diagnostics:"
@@ -551,7 +554,7 @@ then
done < /tmp/pa-diff.csv
fi
-[[ "$BASETIME" != "" ]] && echo "10e. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: finished Tweet run, start building webpage" || true
+[[ -n "$BASETIME" ]] && echo "10e. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: finished Tweet run, start building webpage" || true
(( ERRORCOUNT > 0 )) && echo "[$(date)][$APPNAME] There were $ERRORCOUNT tweet errors."
@@ -564,7 +567,7 @@ cp -f $PLANEALERTDIR/plane-alert.header.html "$TMPDIR"/plalert-index.tmp
exec 3>> "$TMPDIR"/plalert-index.tmp
SB="$(sed -n 's|^\s*SPORTSBADGER=\(.*\)|\1|p' /usr/share/planefence/persist/planefence.config)"
-if [[ "$SB" != "" ]]
+if [[ -n "$SB" ]]
then
cat <&3
@@ -591,7 +594,7 @@ fi
# figure out if there are squawks:
awk -F "," '$12 != "" {rc = 1} END {exit !rc}' "$OUTFILE" && sqx="true" || sqx="false"
-[[ "$BASETIME" != "" ]] && echo "10e1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table headers" || true
+[[ -n "$BASETIME" ]] && echo "10e1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table headers" || true
# first add the fixed part of the header:
cat <&3
@@ -621,7 +624,7 @@ do
done
echo "" >&3
-[[ "$BASETIME" != "" ]] && echo "10e2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table content" || true
+[[ -n "$BASETIME" ]] && echo "10e2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table content" || true
COUNTER=1
REFDATE=$(date -d "$HISTTIME days ago" '+%Y/%m/%d %H:%M:%S')
@@ -632,7 +635,7 @@ IMGBASE="silhouettes/"
while read -r line
do
IFS=',' read -ra pa_record <<< "$line"
- if [[ "${pa_record[0]}" != "" ]] && [[ "${pa_record[4]} ${pa_record[5]}" > "$REFDATE" ]]
+ if [[ -n "${pa_record[0]}" ]] && [[ "${pa_record[4]} ${pa_record[5]}" > "$REFDATE" ]]
then
# prep-work for later use:
PLANELINE="${ALERT_DICT["${pa_record[0]}"]}"
@@ -650,7 +653,7 @@ do
IMGURL="$IMGBASE"
# If there's a squawk, use it to determine the image:
- if [[ "${pa_record[10]}" != "" ]]
+ if [[ -n "${pa_record[10]}" ]]
then
if [[ -f /usr/share/planefence/html/plane-alert/$IMGURL${pa_record[10]}.bmp ]]
then
@@ -674,7 +677,7 @@ do
fi
fi
- if [[ "${pa_record[10]}" != "" ]]
+ if [[ -n "${pa_record[10]}" ]]
then
# print Squawk
@@ -711,7 +714,7 @@ do
printf " %s%s%s\n" "" "$IMG" " " >&3
fi
- printf " %s \n" "${pa_record[9]}" "${pa_record[0]}" >>"$TMPDIR"/plalert-index.tmp # column: ICAO
+ printf " %s \n" "${pa_record[9]//globe.adsbexchange.com/"$TRACKSERVICE"}" "${pa_record[0]}" >>"$TMPDIR"/plalert-index.tmp # column: ICAO
printf " %s \n" "https://flightaware.com/live/modes/${pa_record[0]}/ident/${pa_record[1]}/redirect" "${pa_record[1]}" >>"$TMPDIR"/plalert-index.tmp # column: Tail
# printf " %s%s%s\n" "" "${pa_record[0]}" " " >&3 # column: ICAO
# printf " %s%s%s\n" "" "${pa_record[1]}" " " >&3 # column: Tail
@@ -719,7 +722,7 @@ do
printf " %s%s%s\n" "" "${pa_record[3]}" " " >&3 # column: Plane Type
printf " %s%s%s\n" "" "${pa_record[4]} ${pa_record[5]}" " " >&3 # column: Date Time
# printf " %s%s%s\n" "" "${pa_record[6]}N, ${pa_record[7]}E" " " >&3 # column: LatN, LonE
- printf " %s%s%s\n" "" "${pa_record[6]}N, ${pa_record[7]}E" " " >&3 # column: LatN, LonE with link to adsbexchange
+ printf " %s%s%s\n" "" "${pa_record[6]}N, ${pa_record[7]}E" " " >&3 # column: LatN, LonE with link to adsbexchange
printf " %s%s%s\n" "" "${pa_record[8]}" " " >&3 # column: Flight No
[[ "$sqx" == "true" ]] && printf " %s%s%s\n" "" "${pa_record[10]}" " " >&3 # column: Squawk
printf " %s%s%s\n" "" >&3 # column: ADSBX link
@@ -743,12 +746,17 @@ do
fi
done <<< "$OUTSTRING"
-[[ "$BASETIME" != "" ]] && echo "10e3. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - done writing table content" || true
+[[ -n "$BASETIME" ]] && echo "10e3. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - done writing table content" || true
cat $PLANEALERTDIR/plane-alert.footer.html >&3
+echo "" >&3
+
+# Close the FD for $TMPDIR/plalert-index.tmp:
+exec 3>&-
# Now the basics have been written, we need to replace some of the variables in the template with real data:
sed -i "s|##PA_MOTD##|$PA_MOTD|g" "$TMPDIR"/plalert-index.tmp
+sed -i "s|##TRACKSERVICE##|$TRACKSERVICE|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##NAME##|$NAME|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##ADSBLINK##|$ADSBLINK|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##LASTUPDATE##|$LASTUPDATE|g" "$TMPDIR"/plalert-index.tmp
@@ -758,13 +766,21 @@ sed -i "s|##HISTTIME##|$HISTTIME|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##BUILD##|$([[ -f /usr/share/planefence/branch ]] && cat /usr/share/planefence/branch || cat /root/.buildtime)|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##VERSION##|$(sed -n 's/\(^\s*VERSION=\)\(.*\)/\2/p' /usr/share/planefence/planefence.conf)|g" "$TMPDIR"/plalert-index.tmp
[[ "${AUTOREFRESH,,}" == "true" ]] && sed -i "s|##AUTOREFRESH##|meta http-equiv=\"refresh\" content=\"$(sed -n 's/\(^\s*PF_INTERVAL=\)\(.*\)/\2/p' /usr/share/planefence/persist/planefence.config)\"|g" "$TMPDIR"/plalert-index.tmp || sed -i "s|##AUTOREFRESH##|!-- no auto-refresh --|g" "$TMPDIR"/plalert-index.tmp
-[[ "$PF_LINK" != "" ]] && sed -i "s|##PFLINK##| Additionally, click here to visit PlaneFence: a list of aircraft heard that are within a short distance of the station.|g" "$TMPDIR"/plalert-index.tmp || sed -i "s|##PFLINK##||g" "$TMPDIR"/plalert-index.tmp
-
-echo "" >&3
-
-# Close the FD for $TMPDIR/plalert-index.tmp:
-exec 3>&-
+[[ -n "$PF_LINK" ]] && sed -i "s|##PFLINK##| Additionally, click here to visit PlaneFence: a list of aircraft heard that are within a short distance of the station.|g" "$TMPDIR"/plalert-index.tmp || sed -i "s|##PFLINK##||g" "$TMPDIR"/plalert-index.tmp
+if [[ -n "$MASTODON_SERVER" && -n "$MASTODON_ACCESS_TOKEN" && -n "$MASTODON_NAME" ]]; then
+ sed -i "s|##MASTODONLINK##| Get notified instantaneously of aircraft in range by following @$MASTODON_NAME on the $MASTODON_SERVER Mastodon Server|g" "$TMPDIR"/plalert-index.tmp
+ sed -i "s|##MASTOHEADER##||g" "$TMPDIR"/plalert-index.tmp
+else
+ sed -i "s|##MASTODONLINK##||g" "$TMPDIR"/plalert-index.tmp
+ sed -i "s|##MASTOHEADER##||g" "$TMPDIR"/plalert-index.tmp
+fi
+if (( $(cat "$OUTFILE" | wc -l ) > 0 )); then
+ # shellcheck disable=SC2046
+ sed -i "s|##MEGALINK##| Click here for a map with the current locations of most recent $TRACKLIMIT unique aircraft|g" "$TMPDIR"/plalert-index.tmp
+else
+ sed -i "s|##MEGALINK##||g" "$TMPDIR"/plalert-index.tmp
+fi
#Finally, put the temp index into its place:
mv -f "$TMPDIR"/plalert-index.tmp "$WEBDIR"/index.html
-[[ "$BASETIME" != "" ]] && echo "10f. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done building webpage, finished Plane-Alert" || true
+[[ -n "$BASETIME" ]] && echo "10f. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done building webpage, finished Plane-Alert" || true
diff --git a/rootfs/usr/share/plane-alert/send-discord-alert.py b/rootfs/usr/share/plane-alert/send-discord-alert.py
index 13dfcde4..ed140bbe 100755
--- a/rootfs/usr/share/plane-alert/send-discord-alert.py
+++ b/rootfs/usr/share/plane-alert/send-discord-alert.py
@@ -4,10 +4,13 @@
#
# Usage: ./send-discord-alert.py
#
-# Copyright 2022 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2022-2024 Ramon F. Kolb, kx1t
+# Copyright 2022 Justin DiPierro
+#
+# Licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -98,6 +101,14 @@ def process_alert(config, plane):
else:
description += f"\nSeen near [**{location}**]({plane['adsbx_url']})"
+ # Replace adsbexchange link with whatever is configured:
+ try:
+ if config["PA_TRACKSERVICE"] != "":
+ description.replace("globe.adsbexchange.com",config["PA_TRACKSERVICE"])
+ description.replace("ADSB Exchange",config["PA_TRACKSERVICE"])
+ except:
+ pass
+
webhooks, embed = pf.discord.build(config["DISCORD_FEEDER_NAME"], config["PA_DISCORD_WEBHOOKS"], title, description, color=color)
pf.attach_media(config, "PA", dbinfo, webhooks, embed)
diff --git a/rootfs/usr/share/planefence/airlinename.sh b/rootfs/usr/share/planefence/airlinename.sh
index 9c2fd879..a9bef740 100755
--- a/rootfs/usr/share/planefence/airlinename.sh
+++ b/rootfs/usr/share/planefence/airlinename.sh
@@ -17,13 +17,13 @@
# In the future, we may add lookups for other countries (UK, Germany, Australia) too if
# there is a relatively easy API to access this data.
#
-# This package is part of https://github.com/kx1t/docker-planefence/ and may not work or have any
+# This package is part of https://github.com/sdr-enthusiasts/docker-planefence/ and may not work or have any
# value outside of this repository.
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/airlinename.sh.org b/rootfs/usr/share/planefence/airlinename.sh.org
index 588acd23..73018f71 100755
--- a/rootfs/usr/share/planefence/airlinename.sh.org
+++ b/rootfs/usr/share/planefence/airlinename.sh.org
@@ -17,13 +17,13 @@
# In the future, we may add lookups for other countries (UK, Germany, Australia) too if
# there is a relatively easy API to access this data.
#
-# This package is part of https://github.com/kx1t/docker-planefence/ and may not work or have any
+# This package is part of https://github.com/sdr-enthusiasts/docker-planefence/ and may not work or have any
# value outside of this repository.
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/config_tweeting.sh b/rootfs/usr/share/planefence/config_tweeting.sh
index 32301e0d..862138a2 100755
--- a/rootfs/usr/share/planefence/config_tweeting.sh
+++ b/rootfs/usr/share/planefence/config_tweeting.sh
@@ -6,10 +6,10 @@ APPNAME="config_tweeting"
echo "[$APPNAME][$(date)] Running config_tweeting"
# -----------------------------------------------------------------------------------
-# Copyright 2020, 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence4docker/
+# https://github.com/sdr-enthusiasts/planefence4docker/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
diff --git a/rootfs/usr/share/planefence/noise2fence.sh b/rootfs/usr/share/planefence/noise2fence.sh
index 792e655d..82cd0d47 100755
--- a/rootfs/usr/share/planefence/noise2fence.sh
+++ b/rootfs/usr/share/planefence/noise2fence.sh
@@ -5,7 +5,7 @@
# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
diff --git a/rootfs/usr/share/planefence/nominatim.sh b/rootfs/usr/share/planefence/nominatim.sh
index 760b50a0..a80903aa 100755
--- a/rootfs/usr/share/planefence/nominatim.sh
+++ b/rootfs/usr/share/planefence/nominatim.sh
@@ -5,13 +5,13 @@
# Returns
#
# -----------------------------------------------------------------------------------
-# This package is part of https://github.com/kx1t/docker-planefence/ and may not work or have any
+# This package is part of https://github.com/sdr-enthusiasts/docker-planefence/ and may not work or have any
# value outside of this repository.
#
-# Copyright 2023 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2023-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/pf_notify.sh b/rootfs/usr/share/planefence/pf_notify.sh
index 274baaf5..57e573c0 100755
--- a/rootfs/usr/share/planefence/pf_notify.sh
+++ b/rootfs/usr/share/planefence/pf_notify.sh
@@ -5,10 +5,10 @@
# This script is distributed as part of the PlaneFence package and is dependent
# on that package for its execution.
#
-# Copyright 2020-2022 by Ramon F. Kolb (kx1t) - licensed under the terms and conditions
+# Copyright 2020-2024 by Ramon F. Kolb (kx1t) - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence
+# https://github.com/sdr-enthusiasts/docker-planefence
#
# The package contains parts of, and modifications or derivatives to the following:
# - Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
diff --git a/rootfs/usr/share/planefence/pf_query.sh b/rootfs/usr/share/planefence/pf_query.sh
index 4e1ed9bc..33e12f0e 100755
--- a/rootfs/usr/share/planefence/pf_query.sh
+++ b/rootfs/usr/share/planefence/pf_query.sh
@@ -5,10 +5,10 @@
# Usage: pf_php.sh [hex=] [call=] [start=] [end=] file=
# File argument is always required and at least 1 additional argument is required.
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/planefence.conf b/rootfs/usr/share/planefence/planefence.conf
index 0f35333e..f8f7972d 100644
--- a/rootfs/usr/share/planefence/planefence.conf
+++ b/rootfs/usr/share/planefence/planefence.conf
@@ -1,9 +1,9 @@
# PLANEFENCE.CONF - user changeable variables for PLANEFENCE.SH
#
-# Copyright 2020 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -103,7 +103,7 @@
#
# ATTRIB contains the attribution line at the bottom of the tweet
- ATTRIB="Planefence by kx1t - docker:kx1t/planefence"
+ ATTRIB="#adsb #planefence by kx1t - https://sdr-e.com/docker-planefence"
#
# PlaneHeat is an add-on that gets installed by default. It tracks a daily heatmap for planes that fly inside the
@@ -353,9 +353,11 @@ set +a
# MASTODON parameters for MASTODON notifications as an alternative to Twitter:
# MASTODON_SERVER contains the mastodon server name, for example "airwaves.social"
# MASTODON_ACCESS_TOKEN contains the mastodon access token needed for posting
+# MASTODON_NAME contains the @ name of the Mastodon account
MASTODON_SERVER=
MASTODON_ACCESS_TOKEN=
MASTODON_VISIBILITY=unlisted
+ MASTODON_NAME=
#
# ---------------------------------------------------------------------
# NOTIFICATION_SERVER contains the address (hostname or IP address) to the Notification Server.
@@ -367,9 +369,15 @@ set +a
NOTIFICATION_SERVER=planefence-notifier
PF_MOTD=
-
+#
+# ---------------------------------------------------------------------
+# TRACKSERVICE indicates which tar1090-style tracking interface should be used. Use only the hostname without http(s)://
+# If left empty, it will default to globe.adsbexchange.com
+ TRACKSERVICE=
+#
+# ---------------------------------------------------------------------
# Last, the version. Although you could change this, for tracking purposes, we'd like you to leave it to whatever the
# official version number is. If you fork this software, we'd appreciate if you add on to the version number rather than
# replace the entire number. That way, it's easy to understand from which version you forked. For example, VERSION=3.11-myfork-1.0
- VERSION=5.24-release
+ VERSION=5.25-dev
diff --git a/rootfs/usr/share/planefence/planefence.sh b/rootfs/usr/share/planefence/planefence.sh
index b9934fa2..02737b65 100755
--- a/rootfs/usr/share/planefence/planefence.sh
+++ b/rootfs/usr/share/planefence/planefence.sh
@@ -1,6 +1,6 @@
#!/command/with-contenv bash
#shellcheck shell=bash
-#shellcheck disable=SC2015,SC1091
+#shellcheck disable=SC2015,SC1091,SC2129
#
# PLANEFENCE - a Bash shell script to render a HTML and CSV table with nearby aircraft
#
@@ -9,7 +9,7 @@
# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -395,7 +395,7 @@ EOF
printf " %s \n" "$((COUNTER++))" >&3 # table index number
#printf " %s \n" "$(tr -dc '[[:print:]]' <<< "${NEWVALUES[6]}")" "${NEWVALUES[0]}" >&3 # ICAO
# why check for non-printable characters, the file we process is trusted, if there are non-printable chars, fix the input file generation instead of this band-aid
- printf " %s \n" "${NEWVALUES[6]}" "${NEWVALUES[0]}" >&3 # ICAO
+ printf " %s \n" "${NEWVALUES[6]//globe.adsbexchange.com/"$TRACKSERVICE"}" "${NEWVALUES[0]}" >&3 # ICAO
printf " %s \n" "https://flightaware.com/live/modes/${NEWVALUES[0]}/ident/${CALLSIGN}/redirect" "${CALLSIGN}" >&3 # Flight number; strip "@" if there is any at the beginning of the record
if [[ "$AIRLINECODES" != "" ]]; then
if [[ "${CALLSIGN}" != "" ]] && [[ "${CALLSIGN}" != "link" ]]; then
@@ -481,7 +481,7 @@ EOF
if [[ "${NEWVALUES[1]::1}" == "@" ]]; then
# Print "yes" and add a link if available
if [[ "${NEWVALUES[-1]::13}" == "https://t.co/" ]]; then
- printf " tweet \n" "$(tr -dc '[:print:]' <<< "${NEWVALUES[-1]}")" >&3
+ printf " tweet \n" "$(tr -dc '[:print:]' <<< "${NEWVALUES[-1]}")" >&3
else
printf " discord \n" >&3
fi
@@ -761,7 +761,11 @@ then
fi
# rewrite LINESFILTERED to file
-[[ -f /run/planefence/filtered-$FENCEDATE ]] && read -r i < "/run/planefence/filtered-$FENCEDATE" || i=0
+if [[ -f /run/planefence/filtered-$FENCEDATE ]]; then
+ read -r i < "/run/planefence/filtered-$FENCEDATE"
+else
+ i=0
+fi
echo $((LINESFILTERED + i)) > "/run/planefence/filtered-$FENCEDATE"
# if IGNOREDUPES is ON then remove duplicates
@@ -775,7 +779,11 @@ then
mv -f /tmp/pf-out.tmp "$OUTFILECSV"
fi
# rewrite LINESFILTERED to file
- if [[ -f /run/planefence/filtered-$FENCEDATE ]]; then read -r i < "/run/planefence/filtered-$FENCEDATE"; else i=0; fi
+ if [[ -f /run/planefence/filtered-$FENCEDATE ]]; then
+ read -r i < "/run/planefence/filtered-$FENCEDATE"
+ else
+ i=0
+ fi
echo $((LINESFILTERED + i)) > "/run/planefence/filtered-$FENCEDATE"
fi
@@ -829,7 +837,10 @@ fi
[[ "$BASETIME" != "" ]] && echo "10. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- done getting NoiseCapt stuff, invoking plane-alert.sh" || true
# If $PLANEALERT=on then lets call plane-alert to see if the new lines contain any planes of special interest:
-[ "$PLANEALERT" == "ON" ] && ( LOG "Calling Plane-Alert as $PLALERTFILE $INFILETMP"; $PLALERTFILE "$INFILETMP"; )
+if [[ "$PLANEALERT" == "ON" ]]; then
+ LOG "Calling Plane-Alert as $PLALERTFILE $INFILETMP"
+ $PLALERTFILE "$INFILETMP"
+fi
# Next, we are going to print today's HTML file:
# Note - all text between 'cat' and 'EOF' is HTML code:
@@ -845,14 +856,14 @@ cat <"$OUTFILEHTMTMP"
# are always welcome. Join me at the GitHub link shown below, or via email
# at kx1t (at) amsat (dot) org.
#
-# Copyright 2020 - 2023 Ramon F. Kolb, kx1t - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon. Kolb, kx1t - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# The package contains contributions from several other packages, that may be licensed
# under different terms. Attributions and our thanks can be found at
-# https://github.com/kx1t/docker-planefence/blob/main/ATTRIBUTION.md, or at "/attribution.txt"
+# https://github.com/sdr-enthusiasts/docker-planefence/blob/main/ATTRIBUTION.md, or at "/attribution.txt"
# using the same base URL as you used to get to this web page.
#
# Summary of License Terms
@@ -919,6 +930,7 @@ z-index: 100;
top: 0;
}
+$(if [[ -n "$MASTODON_SERVER" ]] && [[ -n "$MASTODON_ACCESS_TOKEN" ]] && [[ -n "$MASTODON_NAME" ]]; then echo ""; fi)
@@ -932,17 +944,19 @@ ${PF_MOTD}
Executive Summary
-- Last update: $(date +"%b %d, %Y %R:%S %Z")
-
- Maximum distance from ${LAT_VIS}°N, ${LON_VIS}°E: $DIST $DISTUNIT
-
-
- Only aircraft below $(printf "%'.0d" "$MAXALT") $ALTUNIT are reported
-
- Data extracted from $(printf "%'.0d" "$TOTALLINES") ADS-B messages received since midnight today
-
+
- Last update: $(date +"%b %d, %Y %R:%S %Z")
+
- Maximum distance from ${LAT_VIS}°N, ${LON_VIS}°E: $DIST $DISTUNIT
+
- Only aircraft below $(printf "%'.0d" "$MAXALT") $ALTUNIT are reported
+
- Data extracted from $(printf "%'.0d" $TOTALLINES) ADS-B messages received since midnight today
EOF
-[[ "$FUDGELOC" != "" ]] && printf "
- Please note that the reported station coordinates and the center of the circle on the heatmap are rounded for privacy protection. They do not reflect the exact location of the station.\n" >> "$OUTFILEHTMTMP"
-
-[[ -f "/run/planefence/filtered-$FENCEDATE" ]] && [[ -f "$IGNORELIST" ]] && (( $(grep -c "^[^#;]" "$IGNORELIST") > 0 )) && printf "
- %d entries were filtered out today because of an ignore list\n" "$(<"/run/planefence/filtered-$FENCEDATE")" >> "$OUTFILEHTMTMP"
-[[ "$PA_LINK" != "" ]] && printf "
- Additionally, click here to visit Plane Alert: a watchlist of aircraft in general range of the station.\n" "$PA_LINK" >> "$OUTFILEHTMTMP"
+{ [[ -n "$FUDGELOC" ]] && printf "
- Please note that the reported station coordinates and the center of the circle on the heatmap are rounded for privacy protection. They do not reflect the exact location of the station\n"
+ [[ -f "/run/planefence/filtered-$FENCEDATE" ]] && [[ -f "$IGNORELIST" ]] && (( $(grep -c "^[^#;]" "$IGNORELIST") > 0 )) && printf "
- %d entries were filtered out today because of an ignore list\n" "$(Get notified instantaneously of aircraft in range by following @%s@%s on Mastodon" \
+ "$MASTODON_SERVER" "$MASTODON_NAME" "$MASTODON_NAME" "$MASTODON_SERVER"
+ fi
+ [[ -n "$PA_LINK" ]] && printf "
- Additionally, click here to visit Plane Alert: a watchlist of aircraft in general range of the station\n" "$PA_LINK"
+} >> "$OUTFILEHTMTMP"
# shellcheck disable=SC2129
cat <
>"$OUTFILEHTMTMP"
@@ -966,18 +980,19 @@ cat <>"$OUTFILEHTMTMP"
EOF
-printf "- Click on the Transponder ID to see the full flight information/history (from AdsbExchange)" "$LAT_VIS" "$LON_VIS" >> "$OUTFILEHTMTMP"
-printf "
- Click on the Flight Number to see the full flight information/history (from FlightAware)" >> "$OUTFILEHTMTMP"
-printf "
- Click on the Owner Information to see the FAA record for this plane (private, US registered planes only)" >> "$OUTFILEHTMTMP"
-(( ALTCORR > 0 )) && printf "
- Minimum altitude is the altitude above local ground level, which is %s %s MSL." "$ALTCORR" "$ALTUNIT" >> "$OUTFILEHTMTMP" || printf "
- Minimum altitude is the altitude above sea level." >> "$OUTFILEHTMTMP"
+{ printf "
- Click on the Transponder ID to see the full flight information/history (from $TRACKSERVICE)" "$LAT_VIS" "$LON_VIS"
+ printf "
- Click on the Flight Number to see the full flight information/history (from FlightAware)"
+ printf "
- Click on the Owner Information to see the FAA record for this plane (private, US registered planes only)"
+ (( ALTCORR > 0 )) && printf "
- Minimum altitude is the altitude above local ground level, which is %s %s MSL." "$ALTCORR" "$ALTUNIT" >> "$OUTFILEHTMTMP" || printf "
- Minimum altitude is the altitude above sea level"
-[[ "$PLANETWEET" != "" ]] && printf "
- Click on the word "yes" in the Tweeted column to see the Tweet.\n
- Note that tweets are issued after a slight delay\n" >> "$OUTFILEHTMTMP"
-[[ "$PLANETWEET" != "" ]] && printf "
- Get notified instantaneously of aircraft in range by following @%s on Twitter!\n" "$PLANETWEET" "$PLANETWEET" >> "$OUTFILEHTMTMP"
-(( $(find "$TMPDIR"/noisecapt-spectro*.png -daystart -maxdepth 1 -mmin -1440 -print 2>/dev/null | wc -l ) > 0 )) && printf "
- Click on the word "Spectrogram" to see the audio spectrogram of the noisiest period while the aircraft was in range\n" >> "$OUTFILEHTMTMP"
-[[ "$PLANEALERT" == "ON" ]] && printf "
- See a list of aircraft matching the station's Alert List here\n" >> "$OUTFILEHTMTMP"
+ [[ "$PLANETWEET" != "" ]] && printf "
- Click on the word "yes" in the Tweeted column to see the Tweet.\n
- Note that tweets are issued after a slight delay\n"
+ [[ "$PLANETWEET" != "" ]] && printf "
- Get notified instantaneously of aircraft in range by following @%s on Twitter!\n" "$PLANETWEET" "$PLANETWEET"
+ (( $(find "$TMPDIR"/noisecapt-spectro*.png -daystart -maxdepth 1 -mmin -1440 -print 2>/dev/null | wc -l ) > 0 )) && printf "
- Click on the word "Spectrogram" to see the audio spectrogram of the noisiest period while the aircraft was in range\n"
+ [[ "$PLANEALERT" == "ON" ]] && printf "
- See a list of aircraft matching the station's Alert List here\n"
-printf "
- Press the header of any of the columns to sort by that column.\n" >> "$OUTFILEHTMTMP"
-printf "
" >> "$OUTFILEHTMTMP"
+ printf "- Press the header of any of the columns to sort by that column\n"
+ printf "
\n"
+} >> "$OUTFILEHTMTMP"
[[ "$BASETIME" != "" ]] && echo "12. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- starting to write the PF table to the website" || true
@@ -1070,7 +1085,7 @@ cat <>"$OUTFILEHTMTMP"
PlaneFence $VERSION is part of KX1T's PlaneFence Open Source Project, available on GitHub. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join.
$(if [[ -f /root/.buildtime ]]; then printf " Build: %s" "$([[ -f /usr/share/planefence/branch ]] && cat /usr/share/planefence/branch || cat /root/.buildtime)"; fi)
-
© Copyright 2020 - 2023 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
+
© Copyright 2020-2024 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
diff --git a/rootfs/usr/share/planefence/planefence_notify.sh b/rootfs/usr/share/planefence/planefence_notify.sh
index 92ec804b..a5ca475f 100755
--- a/rootfs/usr/share/planefence/planefence_notify.sh
+++ b/rootfs/usr/share/planefence/planefence_notify.sh
@@ -12,10 +12,10 @@
# This script is distributed as part of the PlaneFence package and is dependent
# on that package for its execution.
#
-# Copyright 2020 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence
+# https://github.com/sdr-enthusiasts/docker-planefence
#
# The package contains parts of, and modifications or derivatives to the following:
# - Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -64,11 +64,11 @@ PLANEFILE=/usr/share/planefence/persist/plane-alert-db.txt
(( TWEET_MINTIME > 0 )) && MINTIME=$TWEET_MINTIME || MINTIME=100
# $ATTRIB contains the attribution line at the bottom of the tweet
-[[ "x$ATTRIB" == "x" ]] && ATTRIB="#Planefence by kx1t - docker:kx1t/planefence"
+[[ -z "$ATTRIB" ]] && ATTRIB="#adsb #planefence by kx1t - http://github.com/sdr-enthusiasts/docker-planefence"
if [ "$SOCKETCONFIG" != "" ]
then
- case "$(grep "^distanceunit=" $SOCKETCONFIG |sed "s/distanceunit=//g")" in
+ case "$(grep "^distanceunit=" "$SOCKETCONFIG" |sed "s/distanceunit=//g")" in
nauticalmile)
DISTUNIT="nm"
;;
@@ -87,7 +87,7 @@ fi
ALTUNIT="ft"
if [ "$SOCKETCONFIG" != "" ]
then
- case "$(grep "^altitudeunit=" $SOCKETCONFIG |sed "s/altitudeunit=//g")" in
+ case "$(grep "^altitudeunit=" "$SOCKETCONFIG" |sed "s/altitudeunit=//g")" in
feet)
ALTUNIT="ft"
;;
@@ -130,7 +130,7 @@ getRoute()
fi
# Now get the results object from the API:
- routeObj="$(curl -sL https://api.adsbdb.com/v0/callsign/$1)"
+ routeObj="$(curl -sL "https://api.adsbdb.com/v0/callsign/$1")"
# Unknown Call -> return empty
if [[ "$(jq '.response' <<< "$routeObj")" == "\"unknown callsign\"" ]]
@@ -194,13 +194,13 @@ done
if [ -f "$CSVFILE" ]
then
- while read CSVLINE
+ while read -r CSVLINE
do
- XX=$(echo -n $CSVLINE | tr -d '[:cntrl:]')
+ XX=$(echo -n "$CSVLINE" | tr -d '[:cntrl:]')
CSVLINE=$XX
unset RECORD
# Read the line, but first clean it up as it appears to have a newline in it
- IFS="," read -aRECORD <<< "$CSVLINE"
+ IFS="," read -raRECORD <<< "$CSVLINE"
# LOG "${#RECORD[*]} records in the current line: (${RECORD[*]})"
# $TIMEDIFF contains the difference in seconds between the current record and "now".
# We want this to be at least $MINDIFF to avoid tweeting before all noise data is captured
@@ -208,15 +208,17 @@ then
# start time (not POST -> RECORD[2]) of the observation time
[[ "$TWEET_BEHAVIOR" == "POST" ]] && TIMEDIFF=$(( $(date +%s) - $(date -d "${RECORD[3]}" +%s) )) || TIMEDIFF=$(( $(date +%s) - $(date -d "${RECORD[2]}" +%s) ))
+ # shellcheck disable=SC2126
+ # shellcheck disable=SC2094
if [[ "${RECORD[1]:0:1}" != "@" ]] && [[ $TIMEDIFF -gt $MINTIME ]] && [[ ( "$(grep "${RECORD[0]},@${RECORD[1]}" "$CSVFILE" | wc -l)" == "0" ) || "$TWEETEVERY" == "true" ]]
# ^not tweeted before^ ^older than $MINTIME^ ^No previous occurrence that was tweeted^ ...or... ^$TWEETEVERY is true^
then
- AIRLINE=$(/usr/share/planefence/airlinename.sh ${RECORD[1]#@} ${RECORD[0]} )
+ AIRLINE=$(/usr/share/planefence/airlinename.sh "${RECORD[1]#@}" "${RECORD[0]}" )
AIRLINETAG="#"
if [[ "${RECORD[1]}" != "" ]]
then
- AIRLINETAG+="$(echo $AIRLINE | tr -d '[:space:]-')"
+ AIRLINETAG+="$(echo "$AIRLINE" | tr -d '[:space:]-')"
ROUTE="$(getRoute "${RECORD[1]}")"
fi
@@ -240,23 +242,23 @@ then
[[ "$tagfield" != "" ]] && customtag="$(awk -F "," -v field="$tagfield" -v icao="${RECORD[0]}" '$1 == icao {print $field; exit;}' "$PLANEFILE")" || customtag=""
[[ "$customtag" != "" ]] && TWEET+="#$customtag "
+ TWEET+="%0A${RECORD[6]}"
# Add attribution to the tweet:
- TWEET+="%0A$ATTRIB%0A"
+ TWEET+="%0A$ATTRIB"
+
+ # swap adsbexchange for the $TRACKSERVICE:
+ TWEET="${TWEET//globe.adsbexchange.com/"$TRACKSERVICE"}"
# let's do some calcs on the actual tweet length, so we strip the minimum:
teststring="${TWEET//%0A/ }" # replace newlines with a single character
teststring="$(sed 's/https\?:\/\/[^ ]*\s/12345678901234567890123 /g' <<< "$teststring ")" # replace all URLS with 23 spaces - note the extra space after the string
tweetlength=$(( ${#teststring} - 1 ))
- (( tweetlength > 280 )) && echo "[$(date)][$APPNAME] Warning: PF tweet length is $tweetlength > 280: tweet will be truncated!"
- (( tweetlength > 280 )) && maxlength=$(( ${#TWEET} + 280 - tweetlength )) || maxlength=280
-
- TWEET="${TWEET:0:$maxlength}"
-
- # Now add the last field (attribution) without title or training Newline
- # Reason: this is a URL that Twitter reinterprets and previews on the web
- # Also, the Newline at the end tends to mess with Twurl
- TWEET+="${RECORD[6]}"
-
+ if (( tweetlength > 490 )); then
+ echo "[$(date)][$APPNAME] Warning: PF tweet length is $tweetlength > 490: tweet will be truncated!"
+ maxlength=$(( ${#TWEET} + 490 - tweetlength ))
+ TWEET="${TWEET:0:$maxlength}"
+ fi
+
LOG "Assessing ${RECORD[0]}: ${RECORD[1]:0:1}; diff=$TIMEDIFF secs; Tweeting... msg body: $TWEET" 1
# Before anything else, let's add the "tweeted" flag to the flight number:
@@ -268,17 +270,17 @@ then
GOTSNAP="false"
snapfile="/tmp/snapshot.png"
- newsnap="$(find /usr/share/planefence/persist/planepix -iname ${RECORD[0]}.jpg -print -quit 2>/dev/null || true)"
+ newsnap="$(find /usr/share/planefence/persist/planepix -iname "${RECORD[0]}.jpg" -print -quit 2>/dev/null || true)"
# echo "-0- in planetweet: newsnap=\"$newsnap\" (find /usr/share/planefence/persist/planepix -iname ${RECORD[0]}.jpg -print -quit)"
if [[ "$newsnap" != "" ]]
then
GOTSNAP="true"
- rm -f $snapfile
- ln -sf $newsnap $snapfile
+ rm -f "$snapfile"
+ ln -sf "$newsnap" "$snapfile"
echo "[$(date)][$APPNAME] Using picture from $newsnap"
else
link=$(awk -F "," -v icao="${RECORD[0],,}" 'tolower($1) == icao { print $2 ; exit }' /usr/share/planefence/persist/planepix.txt 2>/dev/null || true)
- if [[ "$link" != "" ]] && curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Firefox/97.0" -s -L --fail $link -o $snapfile --show-error 2>/dev/stdout
+ if [[ "$link" != "" ]] && curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Firefox/97.0" -s -L --fail "$link" -o $snapfile --show-error 2>/dev/stdout
then
echo "[$(date)][$APPNAME] Using picture from $link"
GOTSNAP="true"
@@ -288,7 +290,7 @@ then
fi
fi
- if [[ "$GOTSNAP" == "false" ]] && curl -s -L --fail --max-time "$SCREENSHOT_TIMEOUT" $SCREENSHOTURL/snap/${RECORD[0]#\#} -o "/tmp/snapshot.png"
+ if [[ "$GOTSNAP" == "false" ]] && curl -s -L --fail --max-time "$SCREENSHOT_TIMEOUT" "$SCREENSHOTURL/snap/${RECORD[0]#\#}" -o "/tmp/snapshot.png"
then
GOTSNAP="true"
echo "[$(date)][$APPNAME] Screenshot successfully retrieved at $SCREENSHOTURL for ${RECORD[0]}"
@@ -299,8 +301,8 @@ then
if [[ "${PF_DISCORD,,}" == "on" || "${PF_DISCORD,,}" == "true" ]] && [[ "x$PF_DISCORD_WEBHOOKS" != "x" ]] && [[ "x$DISCORD_FEEDER_NAME" != "x" ]]
then
LOG "Planefence sending Discord notification"
- timeout 120 python3 "$PLANEFENCEDIR"/send-discord-alert.py "$CSVLINE" "$AIRLINE"
- fi
+ timeout 120 python3 "$PLANEFENCEDIR"/send-discord-alert.py "$CSVLINE" "$AIRLINE"
+ fi
# log the message we will try to tweet or toot:
if [[ -n "$MASTODON_SERVER" ]] || [ "$TWEETON" == "yes" ]
@@ -311,7 +313,8 @@ then
if [[ -n "$MASTODON_SERVER" ]]
then
mast_id="null"
- MASTTEXT="$(sed -e 's|\\/|/|g' -e 's|\\n|\n|g' -e 's|%0A|\n|g' <<< "${TWEET}")"
+ MASTTEXT="$(sed -e 's|\\/|/|g' -e 's|\\n|\n|g' -e 's|%0A|\n|g' <<< "${TWEET}")"
+
if [[ "$GOTSNAP" == "true" ]]
then
# we upload an image
@@ -360,6 +363,7 @@ then
LINK="$(echo "`twurl -r "status=$TWEET" /1.1/statuses/update.json`" | tee -a /tmp/tweets.log | jq '.entities."urls" | .[] | .url' | tr -d '\"')"
fi
+ # shellcheck disable=SC2028
[[ "${LINK:0:12}" == "https://t.co" ]] && echo "[$(date)][$APPNAME] Planefence post to Twitter generated successfully. Tweet available at: $LINK" || echo "[$(date)][$APPNAME] PlaneFence Tweet error. Twitter returned:\n$(tail -1 /tmp/tweets.log)"
rm -f $snapfile
diff --git a/rootfs/usr/share/planefence/planeheat.sh b/rootfs/usr/share/planefence/planeheat.sh
index c79c06a4..83385c2b 100755
--- a/rootfs/usr/share/planefence/planeheat.sh
+++ b/rootfs/usr/share/planefence/planeheat.sh
@@ -4,10 +4,10 @@
#
# Usage: ./planeheat.sh [date]
#
-# Copyright 2020,2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -334,7 +334,7 @@ cat <"$PLANEHEATHTML"
radius: 7,
maxZoom: 14,
blur: 11,
- attribution: "docker:kx1t/planefence"
+ attribution: "docker:ghcr.io/sdr-enthusiasts/docker-planefence"
}).addTo(map);
var circle = L.circle([ parseFloat("$LAT_VIS"), parseFloat("$LON_VIS")], {
color: 'blue',
diff --git a/rootfs/usr/share/planefence/prep-planefence.sh b/rootfs/usr/share/planefence/prep-planefence.sh
index 84fa0c58..83a4f607 100755
--- a/rootfs/usr/share/planefence/prep-planefence.sh
+++ b/rootfs/usr/share/planefence/prep-planefence.sh
@@ -1,10 +1,10 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2268,SC2174,SC1091,SC2154
# -----------------------------------------------------------------------------------
-# Copyright 2020, 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence4docker/
+# https://github.com/sdr-enthusiasts/planefence4docker/
#
# Programmers note: when using sed for URLs or file names, make sure NOT to use '/'
# as command separator, but use something else instead, for example '|'
@@ -51,6 +51,7 @@ chmod -fR a+rw /usr/share/planefence/persist/{.[!.]*,*}
chmod a=rwx /usr/share/planefence/persist/planepix
if [[ -f /usr/share/planefence/persist/planefence.config ]]; then
set -o allexport
+ # shellcheck disable=SC1091
source /usr/share/planefence/persist/planefence.config
set +o allexport
else
@@ -215,9 +216,20 @@ if chk_enabled "${PF_TWEET,,}"; then
sed -i 's/\(^\s*PLANETWEET=\).*/\1/' /usr/share/planefence/planefence.conf
else
sed -i 's|\(^\s*PLANETWEET=\).*|\1'"$(sed -n '/profiles:/{n;p;}' /root/.twurlrc | tr -d '[:blank:][=:=]')"'|' /usr/share/planefence/planefence.conf
- [[ -n "$PF_TWATTRIB" ]] && sed -i 's|\(^\s*ATTRIB=\).*|\1'"\"$PF_TWATTRIB\""'|' /usr/share/planefence/planefence.conf
- fi
+ [[ -n "$PF_TWATTRIB" ]] && sed -i 's|\(^\s*ATTRIB=\).*|\1'"\"$PF_TWATTRIB\""'|' /usr/share/planefence/planefence.conf
+ fi
fi
+
+# Despite the name, this variable also works for Mastodon and Discord notifications:
+# You can use PF_TWATTRIB/PA_TWATTRIB or PF_ATTRIB/PA_ATTRIB or simply $ATTRIB
+# If PA_[TW]ATTRIB isn't set, but PF_[TW]ATTRIB has a value, then the latter will also be used for Plane-Alert
+# Finally, if you set ATTRIB to a value, we will use that for both PA and PF and ignore any PF_[TW]ATTRIB/PA_[TW]ATTRIB values
+[[ -n "$PF_TWATTRIB$PF_ATTRIB" ]] && configure_planefence "ATTRIB" "\"$PF_TWATTRIB$PF_ATTRIB\""
+[[ -n "$PA_TWATTRIB$PA_ATTRIB" ]] && configure_planealert "ATTRIB" "\"$PA_TWATTRIB$PA_ATTRIB\""
+[[ -z "$PA_TWATTRIB$PA_ATTRIB" ]] && [[ -n "$PF_TWATTRIB$PF_ATTRIB" ]] && configure_planealert "ATTRIB" "\"$PF_TWATTRIB$PF_ATTRIB\""
+[[ -n "$ATTRIB" ]] && configure_both "ATTRIB" "\"$ATTRIB\""
+
+
# -----------------------------------------------------------------------------------
#
# Change the heatmap height and width if they are defined in the .env parameter file:
@@ -227,8 +239,7 @@ fi
#
# Also do this for files in the past -- /usr/share/planefence/html/planefence-??????.html
if find /usr/share/planefence/html/planefence-??????.html >/dev/null 2>&1; then
- for i in /usr/share/planefence/html/planefence-??????.html
- do
+ for i in /usr/share/planefence/html/planefence-??????.html; do
[[ -n "$PF_MAPWIDTH" ]] && sed -i 's|\(^\s*" <<< "$mast_result" >/dev/null 2>&1; then
+ configure_both "MASTODON_NAME" "$(jq -r '.acct' <<< "$mast_result")"
+ fi
if chk_enabled "${PF_MASTODON,,}"; then
configure_planefence "MASTODON_ACCESS_TOKEN" "$MASTODON_ACCESS_TOKEN"
configure_planefence "MASTODON_SERVER" "$MASTODON_SERVER"
@@ -354,6 +369,12 @@ configure_planefence "PF_MOTD" "\"$PF_MOTD\""
configure_planealert "PA_MOTD" "\"$PA_MOTD\""
#
#--------------------------------------------------------------------------------
+# Set TRACKSERVICE and TRACKLIMIT for Planefence and plane-alert.
+[[ -n "$PF_TRACKSERVICE" ]] && configure_planefence "TRACKSERVICE" "$PF_TRACKSERVICE" || configure_planefence "TRACKSERVICE" "globe.adsbexchange.com"
+[[ -n "$PA_TRACKSERVICE" ]] && configure_planealert "TRACKSERVICE" "$PA_TRACKSERVICE" || true
+[[ -n "$PA_TRACKLIMIT" ]] && configure_planealert "TRACKLIMIT" "$PA_TRACKLIMIT" || true
+#
+#--------------------------------------------------------------------------------
# Last thing - save the date we processed the config to disk. That way, if ~/.planefence/planefence.conf is changed,
# we know that we need to re-run this prep routine!
diff --git a/rootfs/usr/share/planefence/send-discord-alert.py b/rootfs/usr/share/planefence/send-discord-alert.py
index 344f55bf..14844471 100755
--- a/rootfs/usr/share/planefence/send-discord-alert.py
+++ b/rootfs/usr/share/planefence/send-discord-alert.py
@@ -4,10 +4,13 @@
#
# Usage: ./send-discord-alert.py
#
-# Copyright 2022 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2022-2024 Ramon F. Kolb, kx1t
+# Copyright 2022 Justin DiPierro
+#
+# Licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -63,6 +66,29 @@ def process_alert(config, plane):
name = plane['tail_num']
if plane["airline"] != "":
name = plane['airline']
+
+ try:
+ if config['PF_TRACKSERVICE'] == "":
+ trackservice="globe.adsbexchange.com"
+ trackname="AdsbExchange"
+ else:
+ trackservice=config['PF_TRACKSERVICE']
+ trackname=config['PF_TRACKSERVICE'].replace('https://','')
+ trackname=trackname.replace('http://','')
+ trackname=trackname.replace('www.','')
+ trackname=trackname.replace('globe.','')
+ trackname=trackname.replace('radar.','')
+ trackname=trackname.replace('tar1090.','')
+ trackname=trackname.replace('.com','')
+ trackname=trackname.replace('.org','')
+ trackname=trackname.replace('.net','')
+ trackname=trackname.replace('/tar1090','')
+ trackname=trackname.replace('/map','')
+ trackname=trackname.replace('/radar','')
+ trackname=trackname.replace('/','')
+ except:
+ trackservice="globe.adsbexchange.com"
+ trackname="AdsbExchange"
fa_link = pf.flightaware_link(plane['icao'], plane['tail_num'])
@@ -70,7 +96,7 @@ def process_alert(config, plane):
config["DISCORD_FEEDER_NAME"],
config["PF_DISCORD_WEBHOOKS"],
f"{name} is overhead at {pf.altitude_str(config, plane['alt'])}",
- f"[Track on ADS-B Exchange]({plane['adsbx_url']})")
+ f"[Track on {trackname}]({plane['adsbx_url'].replace('globe.adsbexchange.com',trackservice)})")
pf.attach_media(config, "PF", plane, webhooks, embed)
diff --git a/rootfs/usr/share/planefence/send_discord b/rootfs/usr/share/planefence/send_discord
index e3a27b6f..3b6b65b7 100755
--- a/rootfs/usr/share/planefence/send_discord
+++ b/rootfs/usr/share/planefence/send_discord
@@ -1,7 +1,7 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2164,SC1090,SC2154,SC1091
#---------------------------------------------------------------------------------------------
-# Copyright (C) 2022-2023, Ramon F. Kolb (kx1t)
+# Copyright (C) 2022-2024, Ramon F. Kolb (kx1t)
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
diff --git a/rootfs/usr/share/planefence/send_mastodon b/rootfs/usr/share/planefence/send_mastodon
index ad722aec..52f8d1ca 100755
--- a/rootfs/usr/share/planefence/send_mastodon
+++ b/rootfs/usr/share/planefence/send_mastodon
@@ -1,7 +1,7 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2164,SC1090,SC1091
#---------------------------------------------------------------------------------------------
-# Copyright (C) 2022-2023, Ramon F. Kolb (kx1t)
+# Copyright (C) 2022-2024, Ramon F. Kolb (kx1t)
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
diff --git a/rootfs/usr/share/planefence/stage/pa_query.php b/rootfs/usr/share/planefence/stage/pa_query.php
index 51d31914..7a1b80e6 100644
--- a/rootfs/usr/share/planefence/stage/pa_query.php
+++ b/rootfs/usr/share/planefence/stage/pa_query.php
@@ -50,7 +50,7 @@
echo "will return records of tail N141NE, N142NE, N143NE, and that have a timestamp that contains 2021/12/20 - 2021/21/29.
";
echo "
";
echo "Note that the date range is limited to the data available to Plane-Alert.
";
- echo "(C)opyright 2021 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
";
+ echo "(C)opyright 2021-2024 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
";
echo "
" . $hex . $tail . $name . $equipment . $timestamp . $call . $lat . $lon;
echo "
Plane-Alert is part of KX1T's PlaneFence Open Source Project, available on GitHub. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join. -
© Copyright 2020, 2021 by Ramón F. Kolb. Please see here for attributions to our contributors and open source packages used. -
-
-
+Plane-Alert is part of KX1T's PlaneFence Open Source Project, available on GitHub. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join. +
© Copyright 2020-2024 by Ramón F. Kolb. Please see here for attributions to our contributors and open source packages used. +
+
+
Plane-Alert version ##VERSION## is part of KX1T's PlaneFence Open Source Project, available under the GPLv3 license on Github. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join. -
Build: ##BUILD##. © Copyright 2020 - 2023 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used. +
Build: ##BUILD##. © Copyright 2020 - 2024 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
This website shows a list of aircraft of interest that were heard by Aircraft are listed in reverse chronological order. Click the header of a column to resort.
Note that for each aircraft, only the first observation of the day is listed. Additional flights, if any, can be seen on the Flight Map link.
Only aircraft that have been seen in the last ##HISTTIME## days will be displayed below. The CSV version contains the complete history.
- Click on the Transponder ID to see the aircraft history on ADSBExchange
+ Click on the Transponder ID to see the aircraft history on ##TRACKSERVICE##
Click on the Tail number to see the flight history, potentially with routing information, on FlightAware
+ ##MEGALINK##
##PFLINK##
+ ##MASTODONLINK##
diff --git a/rootfs/usr/share/plane-alert/plane-alert.sh b/rootfs/usr/share/plane-alert/plane-alert.sh
index 26aeba26..38d634a4 100755
--- a/rootfs/usr/share/plane-alert/plane-alert.sh
+++ b/rootfs/usr/share/plane-alert/plane-alert.sh
@@ -5,10 +5,10 @@
#
# Usage: ./plane-alert.sh
#
-# Copyright 2021-2023 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -66,7 +66,7 @@ APPNAME="$(hostname)/plane-alert"
[[ "$SCREENSHOT_TIMEOUT" == "" ]] && SCREENSHOT_TIMEOUT=45
-[[ "$BASETIME" != "" ]] && echo "10a1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: parse alert list into dictionary" || true
+[[ -n "$BASETIME" ]] && echo "10a1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: parse alert list into dictionary" || true
#
# Now let's start
@@ -90,7 +90,7 @@ while IFS="" read -r line; do
((ALERT_ENTRIES=ALERT_ENTRIES+1))
done < "$PLANEFILE"
-[[ "$BASETIME" != "" ]] && echo "10a2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: check input for hex numbers on alert list" || true
+[[ -n "$BASETIME" ]] && echo "10a2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: check input for hex numbers on alert list" || true
# Now search through the input file to see if we detect any planes in the alert list
@@ -127,7 +127,7 @@ fi
# Let's figure out if we also need to find SQUAWKS
rm -f "$TMPDIR"/patmp
touch "$TMPDIR"/patmp
-if [[ "$SQUAWKS" != "" ]]
+if [[ -n "$SQUAWKS" ]]
then
IFS="," read -ra sq <<< "$SQUAWKS"
# add some zeros to the front, in case there are less than 4 chars
@@ -189,7 +189,7 @@ cp -f "$OUTFILE" /tmp/pa-old.csv
# 0=hex_ident,1=altitude(feet),2=latitude,3=longitude,4=date,5=time,6=angle,7=distance(kilometer),8=squawk,9=ground_speed(knotph),10=track,11=callsign
# A0B674,750,42.29663,-71.00664,2021/03/17,16:43:52.598,122.36,30.2,0305,139,321,N145NE
-[[ "$BASETIME" != "" ]] && echo "10b. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start processing new data" || true
+[[ -n "$BASETIME" ]] && echo "10b. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start processing new data" || true
while IFS= read -r line
do
@@ -199,7 +199,7 @@ do
# Skip the line if it's out of range
awk "BEGIN{ exit (${pa_record[7]} < $RANGE) }" && continue
- PLANELINE="${ALERT_DICT["${pa_record[0]}"]}"
+ PLANELINE="${ALERT_DICT[${pa_record[0]}]}"
IFS="," read -ra TAGLINE <<< "$PLANELINE"
# Parse this into a single line with syntax ICAO,TailNr,Owner,PlaneDescription,date,time,lat,lon,callsign,adsbx_url,squawk
@@ -234,7 +234,7 @@ do
outrec+="${pa_record[11]/ */}," # callsign or flt nr (stripped spaces)
epoch_sec="$(date -d"${pa_record[4]} ${pa_record[5]}" +%s)"
- outrec+="https://globe.adsbexchange.com/?icao=${pa_record[0]}&showTrace=$(date -u -d@"${epoch_sec}" "+%Y-%m-%d")&zoom=$MAPZOOM&lat=${pa_record[2]}&lon=${pa_record[3]}×tamp=${epoch_sec}," # ICAO for insertion into ADSBExchange link
+ outrec+="https://$TRACKSERVICE/?icao=${pa_record[0]}&showTrace=$(date -u -d@"${epoch_sec}" "+%Y-%m-%d")&zoom=$MAPZOOM&lat=${pa_record[2]}&lon=${pa_record[3]}×tamp=${epoch_sec}," # ICAO for insertion into ADSBExchange link
# only add squawk if its in the list
x=""
@@ -242,7 +242,7 @@ do
do
x+=$(awk "{if(\$1 ~ /${sq[i]}/){print}}" <<< "${pa_record[8]}")
done
- [[ "$x" != "" ]] && outrec+="${pa_record[8]}" # squawk
+ [[ -n "$x" ]] && outrec+="${pa_record[8]}" # squawk
echo "$outrec" >> "$OUTFILE" # Append this line to $OUTWRITEFILE
@@ -252,7 +252,7 @@ sort -t',' -k5,5 -k1,1 -k11,11 -u -o /tmp/pa-new.csv "$OUTFILE" # sort by fiel
sort -t',' -k5,5 -k6,6 -o "$OUTFILE" /tmp/pa-new.csv # sort once more by date and time but keep all entries
# the log files are now done, but we want to figure out what is new
-[[ "$BASETIME" != "" ]] && echo "10c. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done processing new data" || true
+[[ -n "$BASETIME" ]] && echo "10c. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done processing new data" || true
# create some diff files
rm -f /tmp/pa-diff.csv
@@ -269,10 +269,10 @@ comm -23 <(sort < "$OUTFILE") <(sort < /tmp/pa-old.csv ) >/tmp/pa-diff.csv
# Read the header - we will need it a few times later:
# shellcheck disable=SC2001
-[[ "$ALERTHEADER" != "" ]] && IFS="," read -ra header <<< "$(sed 's/\#\$/$#/g' <<< "$ALERTHEADER")" || IFS="," read -ra header <<< "$(head -n1 "$PLANEFILE" | sed 's/\#\$/$#/g')"
+[[ -n "$ALERTHEADER" ]] && IFS="," read -ra header <<< "$(sed 's/\#\$/$#/g' <<< "$ALERTHEADER")" || IFS="," read -ra header <<< "$(head -n1 "$PLANEFILE" | sed 's/\#\$/$#/g')"
# if ALERTHEADER is set, then use that one instead of
-[[ "$BASETIME" != "" ]] && echo "10d. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start Tweet run" || true
+[[ -n "$BASETIME" ]] && echo "10d. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: start Tweet run" || true
# If there's any new alerts send them out
if [[ "$(cat /tmp/pa-diff.csv | wc -l)" != "0" ]]
@@ -287,7 +287,7 @@ then
unset pa_record
IFS=',' read -ra pa_record <<< "$line"
- [[ "$BASETIME" != "" ]] && echo "10d1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: processing ${pa_record[1]}" || true
+ [[ -n "$BASETIME" ]] && echo "10d1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: processing ${pa_record[1]}" || true
ICAO="${pa_record[0]}"
@@ -318,7 +318,7 @@ then
GOTSNAP="true"
[[ ! -f "/usr/share/planefence/persist/planepix/${ICAO}.jpg" ]] && cp "$snapfile" "/usr/share/planefence/persist/planepix/${ICAO}.jpg" || true
else
- [[ "$link" != "" ]] && echo "[$(date)][$APPNAME] Failed attempt to get picture from $link" || true
+ [[ -n "$link" ]] && echo "[$(date)][$APPNAME] Failed attempt to get picture from $link" || true
fi
fi
@@ -335,11 +335,11 @@ then
[[ "${header[0]:0:1}" == "$" ]] && pa_record[0]="#${pa_record[0]}" # ICAO field
- [[ "${header[1]:0:1}" == "$" ]] && [[ "${pa_record[1]}" != "" ]] && pa_record[1]="#${pa_record[1]//[[:space:]-]/}" # tail field
- [[ "${header[2]:0:1}" == "$" ]] && [[ "${pa_record[2]}" != "" ]] && pa_record[2]="#${pa_record[2]//[[:space:]]/}" # owner field, stripped off spaces
- [[ "${header[3]:0:1}" == "$" ]] && [[ "${pa_record[2]}" != "" ]] && pa_record[3]="#${pa_record[3]}" # equipment field
- [[ "${header[1]:0:1}" == "$" ]] && [[ "${pa_record[8]}" != "" ]] && pa_record[8]="#${pa_record[8]//[[:space:]-]/}" # flight nr field (connected to tail header)
- [[ "${pa_record[10]}" != "" ]] && pa_record[10]="#${pa_record[10]}" # # squawk
+ [[ "${header[1]:0:1}" == "$" ]] && [[ -n "${pa_record[1]}" ]] && pa_record[1]="#${pa_record[1]//[[:space:]-]/}" # tail field
+ [[ "${header[2]:0:1}" == "$" ]] && [[ -n "${pa_record[2]}" ]] && pa_record[2]="#${pa_record[2]//[[:space:]]/}" # owner field, stripped off spaces
+ [[ "${header[3]:0:1}" == "$" ]] && [[ -n "${pa_record[2]}" ]] && pa_record[3]="#${pa_record[3]}" # equipment field
+ [[ "${header[1]:0:1}" == "$" ]] && [[ -n "${pa_record[8]}" ]] && pa_record[8]="#${pa_record[8]//[[:space:]-]/}" # flight nr field (connected to tail header)
+ [[ -n "${pa_record[10]}" ]] && pa_record[10]="#${pa_record[10]}" # # squawk
# First build the text of the tweet: reminder:
# 0-ICAO,1-TailNr,2-Owner,3-PlaneDescription,4-date,5-time,6-lat,7-lon
@@ -347,10 +347,11 @@ then
TWITTEXT="#PlaneAlert "
TWITTEXT+="ICAO: ${pa_record[0]} "
- [[ "${pa_record[1]}" != "" ]] && TWITTEXT+="Tail: ${pa_record[1]} "
- [[ "${pa_record[8]}" != "" ]] && TWITTEXT+="Flt: ${pa_record[8]} "
- [[ "${pa_record[10]}" != "" ]] && TWITTEXT+="#Squawk: ${pa_record[10]}"
- [[ "${pa_record[2]}" != "" ]] && TWITTEXT+="\nOwner: ${pa_record[2]//[&\']/_}" # trailing ']}" for vim broken syntax
+ [[ -n "${pa_record[1]}" ]] && TWITTEXT+="Tail: ${pa_record[1]} "
+ [[ -n "${pa_record[8]}" ]] && TWITTEXT+="Flt: ${pa_record[8]} "
+ [[ -n "${pa_record[10]}" ]] && TWITTEXT+="#Squawk: ${pa_record[10]}"
+ [[ "${pa_record[10]//#/}" == "7700 " ]] && TWITTEXT+=" #EMERGENCY!"
+ [[ -n "${pa_record[2]}" ]] && TWITTEXT+="\nOwner: ${pa_record[2]//[&\']/_}" # trailing ']}" for vim broken syntax
TWITTEXT+="\nAircraft: ${pa_record[3]}\n"
TWITTEXT+="${pa_record[4]} $(sed 's|/|\\/|g' <<< "${pa_record[5]}")\n"
@@ -366,14 +367,16 @@ then
if [[ "${tag:0:4}" == "http" ]]
then
TWITTEXT+="$(sed 's|/|\\/|g' <<< "$tag") "
- elif [[ "$tag" != "" ]]
+ elif [[ -n "$tag" ]]
then
TWITTEXT+="#$(tr -dc '[:alnum:]' <<< "$tag") "
fi
fi
done
- TWITTEXT+="\n$(sed 's|/|\\/|g' <<< "${pa_record[9]}")"
+ TWITTEXT+="\n$(sed 's|/|\\/|g' <<< "${pa_record[9]//globe.adsbexchange.com/"$TRACKSERVICE"}")"
+
+ TWITTEXT+="\n\n$ATTRIB"
if [[ -n "$MASTODON_SERVER" ]] || [[ "$TWITTER" != "false" ]]
then
@@ -397,7 +400,7 @@ then
# check if there are any images in the plane-alert-db
field=()
- readarray -td, field <<< "${ALERT_DICT["${pa_record[0]#\#}"]}"
+ readarray -td, field <<< "${ALERT_DICT[${pa_record[0]#\#}]}"
for (( i=0 ; i<=20; i++ ))
do
@@ -480,7 +483,7 @@ then
fi
processedresult=$(echo "$rawresult" | jq '.errors[].message' 2>/dev/null || true) # parse the output through JQ and if there\'s an error, provide the text to $result
- if [[ "$processedresult" != "" ]]
+ if [[ -n "$processedresult" ]]
then
echo "[$(date)][$APPNAME] Plane-alert Tweet error for ${pa_record[0]}: $rawresult"
echo "[$(date)][$APPNAME] Diagnostics:"
@@ -535,7 +538,7 @@ then
fi
processedresult=$(echo "$rawresult" | jq '.errors[].message' 2>/dev/null || true) # parse the output through JQ and if there's an error, provide the text to $result
- if [[ "$processedresult" != "" ]]
+ if [[ -n "$processedresult" ]]
then
echo "[$(date)][$APPNAME] Plane-alert Tweet error for ${pa_record[0]}: $rawresult"
echo "[$(date)][$APPNAME] Diagnostics:"
@@ -551,7 +554,7 @@ then
done < /tmp/pa-diff.csv
fi
-[[ "$BASETIME" != "" ]] && echo "10e. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: finished Tweet run, start building webpage" || true
+[[ -n "$BASETIME" ]] && echo "10e. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: finished Tweet run, start building webpage" || true
(( ERRORCOUNT > 0 )) && echo "[$(date)][$APPNAME] There were $ERRORCOUNT tweet errors."
@@ -564,7 +567,7 @@ cp -f $PLANEALERTDIR/plane-alert.header.html "$TMPDIR"/plalert-index.tmp
exec 3>> "$TMPDIR"/plalert-index.tmp
SB="$(sed -n 's|^\s*SPORTSBADGER=\(.*\)|\1|p' /usr/share/planefence/persist/planefence.config)"
-if [[ "$SB" != "" ]]
+if [[ -n "$SB" ]]
then
cat <&3
@@ -591,7 +594,7 @@ fi
# figure out if there are squawks:
awk -F "," '$12 != "" {rc = 1} END {exit !rc}' "$OUTFILE" && sqx="true" || sqx="false"
-[[ "$BASETIME" != "" ]] && echo "10e1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table headers" || true
+[[ -n "$BASETIME" ]] && echo "10e1. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table headers" || true
# first add the fixed part of the header:
cat <&3
@@ -621,7 +624,7 @@ do
done
echo "" >&3
-[[ "$BASETIME" != "" ]] && echo "10e2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table content" || true
+[[ -n "$BASETIME" ]] && echo "10e2. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - writing table content" || true
COUNTER=1
REFDATE=$(date -d "$HISTTIME days ago" '+%Y/%m/%d %H:%M:%S')
@@ -632,7 +635,7 @@ IMGBASE="silhouettes/"
while read -r line
do
IFS=',' read -ra pa_record <<< "$line"
- if [[ "${pa_record[0]}" != "" ]] && [[ "${pa_record[4]} ${pa_record[5]}" > "$REFDATE" ]]
+ if [[ -n "${pa_record[0]}" ]] && [[ "${pa_record[4]} ${pa_record[5]}" > "$REFDATE" ]]
then
# prep-work for later use:
PLANELINE="${ALERT_DICT["${pa_record[0]}"]}"
@@ -650,7 +653,7 @@ do
IMGURL="$IMGBASE"
# If there's a squawk, use it to determine the image:
- if [[ "${pa_record[10]}" != "" ]]
+ if [[ -n "${pa_record[10]}" ]]
then
if [[ -f /usr/share/planefence/html/plane-alert/$IMGURL${pa_record[10]}.bmp ]]
then
@@ -674,7 +677,7 @@ do
fi
fi
- if [[ "${pa_record[10]}" != "" ]]
+ if [[ -n "${pa_record[10]}" ]]
then
# print Squawk
@@ -711,7 +714,7 @@ do
printf " %s%s%s\n" "" "$IMG" " " >&3
fi
- printf " %s \n" "${pa_record[9]}" "${pa_record[0]}" >>"$TMPDIR"/plalert-index.tmp # column: ICAO
+ printf " %s \n" "${pa_record[9]//globe.adsbexchange.com/"$TRACKSERVICE"}" "${pa_record[0]}" >>"$TMPDIR"/plalert-index.tmp # column: ICAO
printf " %s \n" "https://flightaware.com/live/modes/${pa_record[0]}/ident/${pa_record[1]}/redirect" "${pa_record[1]}" >>"$TMPDIR"/plalert-index.tmp # column: Tail
# printf " %s%s%s\n" "" "${pa_record[0]}" " " >&3 # column: ICAO
# printf " %s%s%s\n" "" "${pa_record[1]}" " " >&3 # column: Tail
@@ -719,7 +722,7 @@ do
printf " %s%s%s\n" "" "${pa_record[3]}" " " >&3 # column: Plane Type
printf " %s%s%s\n" "" "${pa_record[4]} ${pa_record[5]}" " " >&3 # column: Date Time
# printf " %s%s%s\n" "" "${pa_record[6]}N, ${pa_record[7]}E" " " >&3 # column: LatN, LonE
- printf " %s%s%s\n" "" "${pa_record[6]}N, ${pa_record[7]}E" " " >&3 # column: LatN, LonE with link to adsbexchange
+ printf " %s%s%s\n" "" "${pa_record[6]}N, ${pa_record[7]}E" " " >&3 # column: LatN, LonE with link to adsbexchange
printf " %s%s%s\n" "" "${pa_record[8]}" " " >&3 # column: Flight No
[[ "$sqx" == "true" ]] && printf " %s%s%s\n" "" "${pa_record[10]}" " " >&3 # column: Squawk
printf " %s%s%s\n" "" >&3 # column: ADSBX link
@@ -743,12 +746,17 @@ do
fi
done <<< "$OUTSTRING"
-[[ "$BASETIME" != "" ]] && echo "10e3. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - done writing table content" || true
+[[ -n "$BASETIME" ]] && echo "10e3. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: webpage - done writing table content" || true
cat $PLANEALERTDIR/plane-alert.footer.html >&3
+echo "" >&3
+
+# Close the FD for $TMPDIR/plalert-index.tmp:
+exec 3>&-
# Now the basics have been written, we need to replace some of the variables in the template with real data:
sed -i "s|##PA_MOTD##|$PA_MOTD|g" "$TMPDIR"/plalert-index.tmp
+sed -i "s|##TRACKSERVICE##|$TRACKSERVICE|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##NAME##|$NAME|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##ADSBLINK##|$ADSBLINK|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##LASTUPDATE##|$LASTUPDATE|g" "$TMPDIR"/plalert-index.tmp
@@ -758,13 +766,21 @@ sed -i "s|##HISTTIME##|$HISTTIME|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##BUILD##|$([[ -f /usr/share/planefence/branch ]] && cat /usr/share/planefence/branch || cat /root/.buildtime)|g" "$TMPDIR"/plalert-index.tmp
sed -i "s|##VERSION##|$(sed -n 's/\(^\s*VERSION=\)\(.*\)/\2/p' /usr/share/planefence/planefence.conf)|g" "$TMPDIR"/plalert-index.tmp
[[ "${AUTOREFRESH,,}" == "true" ]] && sed -i "s|##AUTOREFRESH##|meta http-equiv=\"refresh\" content=\"$(sed -n 's/\(^\s*PF_INTERVAL=\)\(.*\)/\2/p' /usr/share/planefence/persist/planefence.config)\"|g" "$TMPDIR"/plalert-index.tmp || sed -i "s|##AUTOREFRESH##|!-- no auto-refresh --|g" "$TMPDIR"/plalert-index.tmp
-[[ "$PF_LINK" != "" ]] && sed -i "s|##PFLINK##| Additionally, click here to visit PlaneFence: a list of aircraft heard that are within a short distance of the station.|g" "$TMPDIR"/plalert-index.tmp || sed -i "s|##PFLINK##||g" "$TMPDIR"/plalert-index.tmp
-
-echo "" >&3
-
-# Close the FD for $TMPDIR/plalert-index.tmp:
-exec 3>&-
+[[ -n "$PF_LINK" ]] && sed -i "s|##PFLINK##| Additionally, click here to visit PlaneFence: a list of aircraft heard that are within a short distance of the station.|g" "$TMPDIR"/plalert-index.tmp || sed -i "s|##PFLINK##||g" "$TMPDIR"/plalert-index.tmp
+if [[ -n "$MASTODON_SERVER" && -n "$MASTODON_ACCESS_TOKEN" && -n "$MASTODON_NAME" ]]; then
+ sed -i "s|##MASTODONLINK##| Get notified instantaneously of aircraft in range by following @$MASTODON_NAME on the $MASTODON_SERVER Mastodon Server|g" "$TMPDIR"/plalert-index.tmp
+ sed -i "s|##MASTOHEADER##||g" "$TMPDIR"/plalert-index.tmp
+else
+ sed -i "s|##MASTODONLINK##||g" "$TMPDIR"/plalert-index.tmp
+ sed -i "s|##MASTOHEADER##||g" "$TMPDIR"/plalert-index.tmp
+fi
+if (( $(cat "$OUTFILE" | wc -l ) > 0 )); then
+ # shellcheck disable=SC2046
+ sed -i "s|##MEGALINK##| Click here for a map with the current locations of most recent $TRACKLIMIT unique aircraft|g" "$TMPDIR"/plalert-index.tmp
+else
+ sed -i "s|##MEGALINK##||g" "$TMPDIR"/plalert-index.tmp
+fi
#Finally, put the temp index into its place:
mv -f "$TMPDIR"/plalert-index.tmp "$WEBDIR"/index.html
-[[ "$BASETIME" != "" ]] && echo "10f. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done building webpage, finished Plane-Alert" || true
+[[ -n "$BASETIME" ]] && echo "10f. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- plane-alert.sh: done building webpage, finished Plane-Alert" || true
diff --git a/rootfs/usr/share/plane-alert/send-discord-alert.py b/rootfs/usr/share/plane-alert/send-discord-alert.py
index 13dfcde4..ed140bbe 100755
--- a/rootfs/usr/share/plane-alert/send-discord-alert.py
+++ b/rootfs/usr/share/plane-alert/send-discord-alert.py
@@ -4,10 +4,13 @@
#
# Usage: ./send-discord-alert.py
#
-# Copyright 2022 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2022-2024 Ramon F. Kolb, kx1t
+# Copyright 2022 Justin DiPierro
+#
+# Licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -98,6 +101,14 @@ def process_alert(config, plane):
else:
description += f"\nSeen near [**{location}**]({plane['adsbx_url']})"
+ # Replace adsbexchange link with whatever is configured:
+ try:
+ if config["PA_TRACKSERVICE"] != "":
+ description.replace("globe.adsbexchange.com",config["PA_TRACKSERVICE"])
+ description.replace("ADSB Exchange",config["PA_TRACKSERVICE"])
+ except:
+ pass
+
webhooks, embed = pf.discord.build(config["DISCORD_FEEDER_NAME"], config["PA_DISCORD_WEBHOOKS"], title, description, color=color)
pf.attach_media(config, "PA", dbinfo, webhooks, embed)
diff --git a/rootfs/usr/share/planefence/airlinename.sh b/rootfs/usr/share/planefence/airlinename.sh
index 9c2fd879..a9bef740 100755
--- a/rootfs/usr/share/planefence/airlinename.sh
+++ b/rootfs/usr/share/planefence/airlinename.sh
@@ -17,13 +17,13 @@
# In the future, we may add lookups for other countries (UK, Germany, Australia) too if
# there is a relatively easy API to access this data.
#
-# This package is part of https://github.com/kx1t/docker-planefence/ and may not work or have any
+# This package is part of https://github.com/sdr-enthusiasts/docker-planefence/ and may not work or have any
# value outside of this repository.
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/airlinename.sh.org b/rootfs/usr/share/planefence/airlinename.sh.org
index 588acd23..73018f71 100755
--- a/rootfs/usr/share/planefence/airlinename.sh.org
+++ b/rootfs/usr/share/planefence/airlinename.sh.org
@@ -17,13 +17,13 @@
# In the future, we may add lookups for other countries (UK, Germany, Australia) too if
# there is a relatively easy API to access this data.
#
-# This package is part of https://github.com/kx1t/docker-planefence/ and may not work or have any
+# This package is part of https://github.com/sdr-enthusiasts/docker-planefence/ and may not work or have any
# value outside of this repository.
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/config_tweeting.sh b/rootfs/usr/share/planefence/config_tweeting.sh
index 32301e0d..862138a2 100755
--- a/rootfs/usr/share/planefence/config_tweeting.sh
+++ b/rootfs/usr/share/planefence/config_tweeting.sh
@@ -6,10 +6,10 @@ APPNAME="config_tweeting"
echo "[$APPNAME][$(date)] Running config_tweeting"
# -----------------------------------------------------------------------------------
-# Copyright 2020, 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence4docker/
+# https://github.com/sdr-enthusiasts/planefence4docker/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
diff --git a/rootfs/usr/share/planefence/noise2fence.sh b/rootfs/usr/share/planefence/noise2fence.sh
index 792e655d..82cd0d47 100755
--- a/rootfs/usr/share/planefence/noise2fence.sh
+++ b/rootfs/usr/share/planefence/noise2fence.sh
@@ -5,7 +5,7 @@
# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
diff --git a/rootfs/usr/share/planefence/nominatim.sh b/rootfs/usr/share/planefence/nominatim.sh
index 760b50a0..a80903aa 100755
--- a/rootfs/usr/share/planefence/nominatim.sh
+++ b/rootfs/usr/share/planefence/nominatim.sh
@@ -5,13 +5,13 @@
# Returns
#
# -----------------------------------------------------------------------------------
-# This package is part of https://github.com/kx1t/docker-planefence/ and may not work or have any
+# This package is part of https://github.com/sdr-enthusiasts/docker-planefence/ and may not work or have any
# value outside of this repository.
#
-# Copyright 2023 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2023-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/pf_notify.sh b/rootfs/usr/share/planefence/pf_notify.sh
index 274baaf5..57e573c0 100755
--- a/rootfs/usr/share/planefence/pf_notify.sh
+++ b/rootfs/usr/share/planefence/pf_notify.sh
@@ -5,10 +5,10 @@
# This script is distributed as part of the PlaneFence package and is dependent
# on that package for its execution.
#
-# Copyright 2020-2022 by Ramon F. Kolb (kx1t) - licensed under the terms and conditions
+# Copyright 2020-2024 by Ramon F. Kolb (kx1t) - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence
+# https://github.com/sdr-enthusiasts/docker-planefence
#
# The package contains parts of, and modifications or derivatives to the following:
# - Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
diff --git a/rootfs/usr/share/planefence/pf_query.sh b/rootfs/usr/share/planefence/pf_query.sh
index 4e1ed9bc..33e12f0e 100755
--- a/rootfs/usr/share/planefence/pf_query.sh
+++ b/rootfs/usr/share/planefence/pf_query.sh
@@ -5,10 +5,10 @@
# Usage: pf_php.sh [hex=] [call=] [start=] [end=] file=
# File argument is always required and at least 1 additional argument is required.
#
-# Copyright 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2021-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# Summary of License Terms
# This program is free software: you can redistribute it and/or modify it under the terms of
diff --git a/rootfs/usr/share/planefence/planefence.conf b/rootfs/usr/share/planefence/planefence.conf
index 0f35333e..f8f7972d 100644
--- a/rootfs/usr/share/planefence/planefence.conf
+++ b/rootfs/usr/share/planefence/planefence.conf
@@ -1,9 +1,9 @@
# PLANEFENCE.CONF - user changeable variables for PLANEFENCE.SH
#
-# Copyright 2020 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -103,7 +103,7 @@
#
# ATTRIB contains the attribution line at the bottom of the tweet
- ATTRIB="Planefence by kx1t - docker:kx1t/planefence"
+ ATTRIB="#adsb #planefence by kx1t - https://sdr-e.com/docker-planefence"
#
# PlaneHeat is an add-on that gets installed by default. It tracks a daily heatmap for planes that fly inside the
@@ -353,9 +353,11 @@ set +a
# MASTODON parameters for MASTODON notifications as an alternative to Twitter:
# MASTODON_SERVER contains the mastodon server name, for example "airwaves.social"
# MASTODON_ACCESS_TOKEN contains the mastodon access token needed for posting
+# MASTODON_NAME contains the @ name of the Mastodon account
MASTODON_SERVER=
MASTODON_ACCESS_TOKEN=
MASTODON_VISIBILITY=unlisted
+ MASTODON_NAME=
#
# ---------------------------------------------------------------------
# NOTIFICATION_SERVER contains the address (hostname or IP address) to the Notification Server.
@@ -367,9 +369,15 @@ set +a
NOTIFICATION_SERVER=planefence-notifier
PF_MOTD=
-
+#
+# ---------------------------------------------------------------------
+# TRACKSERVICE indicates which tar1090-style tracking interface should be used. Use only the hostname without http(s)://
+# If left empty, it will default to globe.adsbexchange.com
+ TRACKSERVICE=
+#
+# ---------------------------------------------------------------------
# Last, the version. Although you could change this, for tracking purposes, we'd like you to leave it to whatever the
# official version number is. If you fork this software, we'd appreciate if you add on to the version number rather than
# replace the entire number. That way, it's easy to understand from which version you forked. For example, VERSION=3.11-myfork-1.0
- VERSION=5.24-release
+ VERSION=5.25-dev
diff --git a/rootfs/usr/share/planefence/planefence.sh b/rootfs/usr/share/planefence/planefence.sh
index b9934fa2..02737b65 100755
--- a/rootfs/usr/share/planefence/planefence.sh
+++ b/rootfs/usr/share/planefence/planefence.sh
@@ -1,6 +1,6 @@
#!/command/with-contenv bash
#shellcheck shell=bash
-#shellcheck disable=SC2015,SC1091
+#shellcheck disable=SC2015,SC1091,SC2129
#
# PLANEFENCE - a Bash shell script to render a HTML and CSV table with nearby aircraft
#
@@ -9,7 +9,7 @@
# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -395,7 +395,7 @@ EOF
printf " %s \n" "$((COUNTER++))" >&3 # table index number
#printf " %s \n" "$(tr -dc '[[:print:]]' <<< "${NEWVALUES[6]}")" "${NEWVALUES[0]}" >&3 # ICAO
# why check for non-printable characters, the file we process is trusted, if there are non-printable chars, fix the input file generation instead of this band-aid
- printf " %s \n" "${NEWVALUES[6]}" "${NEWVALUES[0]}" >&3 # ICAO
+ printf " %s \n" "${NEWVALUES[6]//globe.adsbexchange.com/"$TRACKSERVICE"}" "${NEWVALUES[0]}" >&3 # ICAO
printf " %s \n" "https://flightaware.com/live/modes/${NEWVALUES[0]}/ident/${CALLSIGN}/redirect" "${CALLSIGN}" >&3 # Flight number; strip "@" if there is any at the beginning of the record
if [[ "$AIRLINECODES" != "" ]]; then
if [[ "${CALLSIGN}" != "" ]] && [[ "${CALLSIGN}" != "link" ]]; then
@@ -481,7 +481,7 @@ EOF
if [[ "${NEWVALUES[1]::1}" == "@" ]]; then
# Print "yes" and add a link if available
if [[ "${NEWVALUES[-1]::13}" == "https://t.co/" ]]; then
- printf " tweet \n" "$(tr -dc '[:print:]' <<< "${NEWVALUES[-1]}")" >&3
+ printf " tweet \n" "$(tr -dc '[:print:]' <<< "${NEWVALUES[-1]}")" >&3
else
printf " discord \n" >&3
fi
@@ -761,7 +761,11 @@ then
fi
# rewrite LINESFILTERED to file
-[[ -f /run/planefence/filtered-$FENCEDATE ]] && read -r i < "/run/planefence/filtered-$FENCEDATE" || i=0
+if [[ -f /run/planefence/filtered-$FENCEDATE ]]; then
+ read -r i < "/run/planefence/filtered-$FENCEDATE"
+else
+ i=0
+fi
echo $((LINESFILTERED + i)) > "/run/planefence/filtered-$FENCEDATE"
# if IGNOREDUPES is ON then remove duplicates
@@ -775,7 +779,11 @@ then
mv -f /tmp/pf-out.tmp "$OUTFILECSV"
fi
# rewrite LINESFILTERED to file
- if [[ -f /run/planefence/filtered-$FENCEDATE ]]; then read -r i < "/run/planefence/filtered-$FENCEDATE"; else i=0; fi
+ if [[ -f /run/planefence/filtered-$FENCEDATE ]]; then
+ read -r i < "/run/planefence/filtered-$FENCEDATE"
+ else
+ i=0
+ fi
echo $((LINESFILTERED + i)) > "/run/planefence/filtered-$FENCEDATE"
fi
@@ -829,7 +837,10 @@ fi
[[ "$BASETIME" != "" ]] && echo "10. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- done getting NoiseCapt stuff, invoking plane-alert.sh" || true
# If $PLANEALERT=on then lets call plane-alert to see if the new lines contain any planes of special interest:
-[ "$PLANEALERT" == "ON" ] && ( LOG "Calling Plane-Alert as $PLALERTFILE $INFILETMP"; $PLALERTFILE "$INFILETMP"; )
+if [[ "$PLANEALERT" == "ON" ]]; then
+ LOG "Calling Plane-Alert as $PLALERTFILE $INFILETMP"
+ $PLALERTFILE "$INFILETMP"
+fi
# Next, we are going to print today's HTML file:
# Note - all text between 'cat' and 'EOF' is HTML code:
@@ -845,14 +856,14 @@ cat <"$OUTFILEHTMTMP"
# are always welcome. Join me at the GitHub link shown below, or via email
# at kx1t (at) amsat (dot) org.
#
-# Copyright 2020 - 2023 Ramon F. Kolb, kx1t - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon. Kolb, kx1t - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/docker-planefence/
+# https://github.com/sdr-enthusiasts/docker-planefence/
#
# The package contains contributions from several other packages, that may be licensed
# under different terms. Attributions and our thanks can be found at
-# https://github.com/kx1t/docker-planefence/blob/main/ATTRIBUTION.md, or at "/attribution.txt"
+# https://github.com/sdr-enthusiasts/docker-planefence/blob/main/ATTRIBUTION.md, or at "/attribution.txt"
# using the same base URL as you used to get to this web page.
#
# Summary of License Terms
@@ -919,6 +930,7 @@ z-index: 100;
top: 0;
}
+$(if [[ -n "$MASTODON_SERVER" ]] && [[ -n "$MASTODON_ACCESS_TOKEN" ]] && [[ -n "$MASTODON_NAME" ]]; then echo ""; fi)
@@ -932,17 +944,19 @@ ${PF_MOTD}
Executive Summary
-- Last update: $(date +"%b %d, %Y %R:%S %Z")
-
- Maximum distance from ${LAT_VIS}°N, ${LON_VIS}°E: $DIST $DISTUNIT
-
-
- Only aircraft below $(printf "%'.0d" "$MAXALT") $ALTUNIT are reported
-
- Data extracted from $(printf "%'.0d" "$TOTALLINES") ADS-B messages received since midnight today
-
+
- Last update: $(date +"%b %d, %Y %R:%S %Z")
+
- Maximum distance from ${LAT_VIS}°N, ${LON_VIS}°E: $DIST $DISTUNIT
+
- Only aircraft below $(printf "%'.0d" "$MAXALT") $ALTUNIT are reported
+
- Data extracted from $(printf "%'.0d" $TOTALLINES) ADS-B messages received since midnight today
EOF
-[[ "$FUDGELOC" != "" ]] && printf "
- Please note that the reported station coordinates and the center of the circle on the heatmap are rounded for privacy protection. They do not reflect the exact location of the station.\n" >> "$OUTFILEHTMTMP"
-
-[[ -f "/run/planefence/filtered-$FENCEDATE" ]] && [[ -f "$IGNORELIST" ]] && (( $(grep -c "^[^#;]" "$IGNORELIST") > 0 )) && printf "
- %d entries were filtered out today because of an ignore list\n" "$(<"/run/planefence/filtered-$FENCEDATE")" >> "$OUTFILEHTMTMP"
-[[ "$PA_LINK" != "" ]] && printf "
- Additionally, click here to visit Plane Alert: a watchlist of aircraft in general range of the station.\n" "$PA_LINK" >> "$OUTFILEHTMTMP"
+{ [[ -n "$FUDGELOC" ]] && printf "
- Please note that the reported station coordinates and the center of the circle on the heatmap are rounded for privacy protection. They do not reflect the exact location of the station\n"
+ [[ -f "/run/planefence/filtered-$FENCEDATE" ]] && [[ -f "$IGNORELIST" ]] && (( $(grep -c "^[^#;]" "$IGNORELIST") > 0 )) && printf "
- %d entries were filtered out today because of an ignore list\n" "$(Get notified instantaneously of aircraft in range by following @%s@%s on Mastodon" \
+ "$MASTODON_SERVER" "$MASTODON_NAME" "$MASTODON_NAME" "$MASTODON_SERVER"
+ fi
+ [[ -n "$PA_LINK" ]] && printf "
- Additionally, click here to visit Plane Alert: a watchlist of aircraft in general range of the station\n" "$PA_LINK"
+} >> "$OUTFILEHTMTMP"
# shellcheck disable=SC2129
cat <
>"$OUTFILEHTMTMP"
@@ -966,18 +980,19 @@ cat <>"$OUTFILEHTMTMP"
EOF
-printf "- Click on the Transponder ID to see the full flight information/history (from AdsbExchange)" "$LAT_VIS" "$LON_VIS" >> "$OUTFILEHTMTMP"
-printf "
- Click on the Flight Number to see the full flight information/history (from FlightAware)" >> "$OUTFILEHTMTMP"
-printf "
- Click on the Owner Information to see the FAA record for this plane (private, US registered planes only)" >> "$OUTFILEHTMTMP"
-(( ALTCORR > 0 )) && printf "
- Minimum altitude is the altitude above local ground level, which is %s %s MSL." "$ALTCORR" "$ALTUNIT" >> "$OUTFILEHTMTMP" || printf "
- Minimum altitude is the altitude above sea level." >> "$OUTFILEHTMTMP"
+{ printf "
- Click on the Transponder ID to see the full flight information/history (from $TRACKSERVICE)" "$LAT_VIS" "$LON_VIS"
+ printf "
- Click on the Flight Number to see the full flight information/history (from FlightAware)"
+ printf "
- Click on the Owner Information to see the FAA record for this plane (private, US registered planes only)"
+ (( ALTCORR > 0 )) && printf "
- Minimum altitude is the altitude above local ground level, which is %s %s MSL." "$ALTCORR" "$ALTUNIT" >> "$OUTFILEHTMTMP" || printf "
- Minimum altitude is the altitude above sea level"
-[[ "$PLANETWEET" != "" ]] && printf "
- Click on the word "yes" in the Tweeted column to see the Tweet.\n
- Note that tweets are issued after a slight delay\n" >> "$OUTFILEHTMTMP"
-[[ "$PLANETWEET" != "" ]] && printf "
- Get notified instantaneously of aircraft in range by following @%s on Twitter!\n" "$PLANETWEET" "$PLANETWEET" >> "$OUTFILEHTMTMP"
-(( $(find "$TMPDIR"/noisecapt-spectro*.png -daystart -maxdepth 1 -mmin -1440 -print 2>/dev/null | wc -l ) > 0 )) && printf "
- Click on the word "Spectrogram" to see the audio spectrogram of the noisiest period while the aircraft was in range\n" >> "$OUTFILEHTMTMP"
-[[ "$PLANEALERT" == "ON" ]] && printf "
- See a list of aircraft matching the station's Alert List here\n" >> "$OUTFILEHTMTMP"
+ [[ "$PLANETWEET" != "" ]] && printf "
- Click on the word "yes" in the Tweeted column to see the Tweet.\n
- Note that tweets are issued after a slight delay\n"
+ [[ "$PLANETWEET" != "" ]] && printf "
- Get notified instantaneously of aircraft in range by following @%s on Twitter!\n" "$PLANETWEET" "$PLANETWEET"
+ (( $(find "$TMPDIR"/noisecapt-spectro*.png -daystart -maxdepth 1 -mmin -1440 -print 2>/dev/null | wc -l ) > 0 )) && printf "
- Click on the word "Spectrogram" to see the audio spectrogram of the noisiest period while the aircraft was in range\n"
+ [[ "$PLANEALERT" == "ON" ]] && printf "
- See a list of aircraft matching the station's Alert List here\n"
-printf "
- Press the header of any of the columns to sort by that column.\n" >> "$OUTFILEHTMTMP"
-printf "
" >> "$OUTFILEHTMTMP"
+ printf "- Press the header of any of the columns to sort by that column\n"
+ printf "
\n"
+} >> "$OUTFILEHTMTMP"
[[ "$BASETIME" != "" ]] && echo "12. $(bc -l <<< "$(date +%s.%2N) - $BASETIME")s -- starting to write the PF table to the website" || true
@@ -1070,7 +1085,7 @@ cat <>"$OUTFILEHTMTMP"
PlaneFence $VERSION is part of KX1T's PlaneFence Open Source Project, available on GitHub. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join.
$(if [[ -f /root/.buildtime ]]; then printf " Build: %s" "$([[ -f /usr/share/planefence/branch ]] && cat /usr/share/planefence/branch || cat /root/.buildtime)"; fi)
-
© Copyright 2020 - 2023 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
+
© Copyright 2020-2024 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
diff --git a/rootfs/usr/share/planefence/planefence_notify.sh b/rootfs/usr/share/planefence/planefence_notify.sh
index 92ec804b..a5ca475f 100755
--- a/rootfs/usr/share/planefence/planefence_notify.sh
+++ b/rootfs/usr/share/planefence/planefence_notify.sh
@@ -12,10 +12,10 @@
# This script is distributed as part of the PlaneFence package and is dependent
# on that package for its execution.
#
-# Copyright 2020 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence
+# https://github.com/sdr-enthusiasts/docker-planefence
#
# The package contains parts of, and modifications or derivatives to the following:
# - Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -64,11 +64,11 @@ PLANEFILE=/usr/share/planefence/persist/plane-alert-db.txt
(( TWEET_MINTIME > 0 )) && MINTIME=$TWEET_MINTIME || MINTIME=100
# $ATTRIB contains the attribution line at the bottom of the tweet
-[[ "x$ATTRIB" == "x" ]] && ATTRIB="#Planefence by kx1t - docker:kx1t/planefence"
+[[ -z "$ATTRIB" ]] && ATTRIB="#adsb #planefence by kx1t - http://github.com/sdr-enthusiasts/docker-planefence"
if [ "$SOCKETCONFIG" != "" ]
then
- case "$(grep "^distanceunit=" $SOCKETCONFIG |sed "s/distanceunit=//g")" in
+ case "$(grep "^distanceunit=" "$SOCKETCONFIG" |sed "s/distanceunit=//g")" in
nauticalmile)
DISTUNIT="nm"
;;
@@ -87,7 +87,7 @@ fi
ALTUNIT="ft"
if [ "$SOCKETCONFIG" != "" ]
then
- case "$(grep "^altitudeunit=" $SOCKETCONFIG |sed "s/altitudeunit=//g")" in
+ case "$(grep "^altitudeunit=" "$SOCKETCONFIG" |sed "s/altitudeunit=//g")" in
feet)
ALTUNIT="ft"
;;
@@ -130,7 +130,7 @@ getRoute()
fi
# Now get the results object from the API:
- routeObj="$(curl -sL https://api.adsbdb.com/v0/callsign/$1)"
+ routeObj="$(curl -sL "https://api.adsbdb.com/v0/callsign/$1")"
# Unknown Call -> return empty
if [[ "$(jq '.response' <<< "$routeObj")" == "\"unknown callsign\"" ]]
@@ -194,13 +194,13 @@ done
if [ -f "$CSVFILE" ]
then
- while read CSVLINE
+ while read -r CSVLINE
do
- XX=$(echo -n $CSVLINE | tr -d '[:cntrl:]')
+ XX=$(echo -n "$CSVLINE" | tr -d '[:cntrl:]')
CSVLINE=$XX
unset RECORD
# Read the line, but first clean it up as it appears to have a newline in it
- IFS="," read -aRECORD <<< "$CSVLINE"
+ IFS="," read -raRECORD <<< "$CSVLINE"
# LOG "${#RECORD[*]} records in the current line: (${RECORD[*]})"
# $TIMEDIFF contains the difference in seconds between the current record and "now".
# We want this to be at least $MINDIFF to avoid tweeting before all noise data is captured
@@ -208,15 +208,17 @@ then
# start time (not POST -> RECORD[2]) of the observation time
[[ "$TWEET_BEHAVIOR" == "POST" ]] && TIMEDIFF=$(( $(date +%s) - $(date -d "${RECORD[3]}" +%s) )) || TIMEDIFF=$(( $(date +%s) - $(date -d "${RECORD[2]}" +%s) ))
+ # shellcheck disable=SC2126
+ # shellcheck disable=SC2094
if [[ "${RECORD[1]:0:1}" != "@" ]] && [[ $TIMEDIFF -gt $MINTIME ]] && [[ ( "$(grep "${RECORD[0]},@${RECORD[1]}" "$CSVFILE" | wc -l)" == "0" ) || "$TWEETEVERY" == "true" ]]
# ^not tweeted before^ ^older than $MINTIME^ ^No previous occurrence that was tweeted^ ...or... ^$TWEETEVERY is true^
then
- AIRLINE=$(/usr/share/planefence/airlinename.sh ${RECORD[1]#@} ${RECORD[0]} )
+ AIRLINE=$(/usr/share/planefence/airlinename.sh "${RECORD[1]#@}" "${RECORD[0]}" )
AIRLINETAG="#"
if [[ "${RECORD[1]}" != "" ]]
then
- AIRLINETAG+="$(echo $AIRLINE | tr -d '[:space:]-')"
+ AIRLINETAG+="$(echo "$AIRLINE" | tr -d '[:space:]-')"
ROUTE="$(getRoute "${RECORD[1]}")"
fi
@@ -240,23 +242,23 @@ then
[[ "$tagfield" != "" ]] && customtag="$(awk -F "," -v field="$tagfield" -v icao="${RECORD[0]}" '$1 == icao {print $field; exit;}' "$PLANEFILE")" || customtag=""
[[ "$customtag" != "" ]] && TWEET+="#$customtag "
+ TWEET+="%0A${RECORD[6]}"
# Add attribution to the tweet:
- TWEET+="%0A$ATTRIB%0A"
+ TWEET+="%0A$ATTRIB"
+
+ # swap adsbexchange for the $TRACKSERVICE:
+ TWEET="${TWEET//globe.adsbexchange.com/"$TRACKSERVICE"}"
# let's do some calcs on the actual tweet length, so we strip the minimum:
teststring="${TWEET//%0A/ }" # replace newlines with a single character
teststring="$(sed 's/https\?:\/\/[^ ]*\s/12345678901234567890123 /g' <<< "$teststring ")" # replace all URLS with 23 spaces - note the extra space after the string
tweetlength=$(( ${#teststring} - 1 ))
- (( tweetlength > 280 )) && echo "[$(date)][$APPNAME] Warning: PF tweet length is $tweetlength > 280: tweet will be truncated!"
- (( tweetlength > 280 )) && maxlength=$(( ${#TWEET} + 280 - tweetlength )) || maxlength=280
-
- TWEET="${TWEET:0:$maxlength}"
-
- # Now add the last field (attribution) without title or training Newline
- # Reason: this is a URL that Twitter reinterprets and previews on the web
- # Also, the Newline at the end tends to mess with Twurl
- TWEET+="${RECORD[6]}"
-
+ if (( tweetlength > 490 )); then
+ echo "[$(date)][$APPNAME] Warning: PF tweet length is $tweetlength > 490: tweet will be truncated!"
+ maxlength=$(( ${#TWEET} + 490 - tweetlength ))
+ TWEET="${TWEET:0:$maxlength}"
+ fi
+
LOG "Assessing ${RECORD[0]}: ${RECORD[1]:0:1}; diff=$TIMEDIFF secs; Tweeting... msg body: $TWEET" 1
# Before anything else, let's add the "tweeted" flag to the flight number:
@@ -268,17 +270,17 @@ then
GOTSNAP="false"
snapfile="/tmp/snapshot.png"
- newsnap="$(find /usr/share/planefence/persist/planepix -iname ${RECORD[0]}.jpg -print -quit 2>/dev/null || true)"
+ newsnap="$(find /usr/share/planefence/persist/planepix -iname "${RECORD[0]}.jpg" -print -quit 2>/dev/null || true)"
# echo "-0- in planetweet: newsnap=\"$newsnap\" (find /usr/share/planefence/persist/planepix -iname ${RECORD[0]}.jpg -print -quit)"
if [[ "$newsnap" != "" ]]
then
GOTSNAP="true"
- rm -f $snapfile
- ln -sf $newsnap $snapfile
+ rm -f "$snapfile"
+ ln -sf "$newsnap" "$snapfile"
echo "[$(date)][$APPNAME] Using picture from $newsnap"
else
link=$(awk -F "," -v icao="${RECORD[0],,}" 'tolower($1) == icao { print $2 ; exit }' /usr/share/planefence/persist/planepix.txt 2>/dev/null || true)
- if [[ "$link" != "" ]] && curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Firefox/97.0" -s -L --fail $link -o $snapfile --show-error 2>/dev/stdout
+ if [[ "$link" != "" ]] && curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Firefox/97.0" -s -L --fail "$link" -o $snapfile --show-error 2>/dev/stdout
then
echo "[$(date)][$APPNAME] Using picture from $link"
GOTSNAP="true"
@@ -288,7 +290,7 @@ then
fi
fi
- if [[ "$GOTSNAP" == "false" ]] && curl -s -L --fail --max-time "$SCREENSHOT_TIMEOUT" $SCREENSHOTURL/snap/${RECORD[0]#\#} -o "/tmp/snapshot.png"
+ if [[ "$GOTSNAP" == "false" ]] && curl -s -L --fail --max-time "$SCREENSHOT_TIMEOUT" "$SCREENSHOTURL/snap/${RECORD[0]#\#}" -o "/tmp/snapshot.png"
then
GOTSNAP="true"
echo "[$(date)][$APPNAME] Screenshot successfully retrieved at $SCREENSHOTURL for ${RECORD[0]}"
@@ -299,8 +301,8 @@ then
if [[ "${PF_DISCORD,,}" == "on" || "${PF_DISCORD,,}" == "true" ]] && [[ "x$PF_DISCORD_WEBHOOKS" != "x" ]] && [[ "x$DISCORD_FEEDER_NAME" != "x" ]]
then
LOG "Planefence sending Discord notification"
- timeout 120 python3 "$PLANEFENCEDIR"/send-discord-alert.py "$CSVLINE" "$AIRLINE"
- fi
+ timeout 120 python3 "$PLANEFENCEDIR"/send-discord-alert.py "$CSVLINE" "$AIRLINE"
+ fi
# log the message we will try to tweet or toot:
if [[ -n "$MASTODON_SERVER" ]] || [ "$TWEETON" == "yes" ]
@@ -311,7 +313,8 @@ then
if [[ -n "$MASTODON_SERVER" ]]
then
mast_id="null"
- MASTTEXT="$(sed -e 's|\\/|/|g' -e 's|\\n|\n|g' -e 's|%0A|\n|g' <<< "${TWEET}")"
+ MASTTEXT="$(sed -e 's|\\/|/|g' -e 's|\\n|\n|g' -e 's|%0A|\n|g' <<< "${TWEET}")"
+
if [[ "$GOTSNAP" == "true" ]]
then
# we upload an image
@@ -360,6 +363,7 @@ then
LINK="$(echo "`twurl -r "status=$TWEET" /1.1/statuses/update.json`" | tee -a /tmp/tweets.log | jq '.entities."urls" | .[] | .url' | tr -d '\"')"
fi
+ # shellcheck disable=SC2028
[[ "${LINK:0:12}" == "https://t.co" ]] && echo "[$(date)][$APPNAME] Planefence post to Twitter generated successfully. Tweet available at: $LINK" || echo "[$(date)][$APPNAME] PlaneFence Tweet error. Twitter returned:\n$(tail -1 /tmp/tweets.log)"
rm -f $snapfile
diff --git a/rootfs/usr/share/planefence/planeheat.sh b/rootfs/usr/share/planefence/planeheat.sh
index c79c06a4..83385c2b 100755
--- a/rootfs/usr/share/planefence/planeheat.sh
+++ b/rootfs/usr/share/planefence/planeheat.sh
@@ -4,10 +4,10 @@
#
# Usage: ./planeheat.sh [date]
#
-# Copyright 2020,2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -334,7 +334,7 @@ cat <"$PLANEHEATHTML"
radius: 7,
maxZoom: 14,
blur: 11,
- attribution: "docker:kx1t/planefence"
+ attribution: "docker:ghcr.io/sdr-enthusiasts/docker-planefence"
}).addTo(map);
var circle = L.circle([ parseFloat("$LAT_VIS"), parseFloat("$LON_VIS")], {
color: 'blue',
diff --git a/rootfs/usr/share/planefence/prep-planefence.sh b/rootfs/usr/share/planefence/prep-planefence.sh
index 84fa0c58..83a4f607 100755
--- a/rootfs/usr/share/planefence/prep-planefence.sh
+++ b/rootfs/usr/share/planefence/prep-planefence.sh
@@ -1,10 +1,10 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2268,SC2174,SC1091,SC2154
# -----------------------------------------------------------------------------------
-# Copyright 2020, 2021 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2020-2024 Ramon F. Kolb - licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence4docker/
+# https://github.com/sdr-enthusiasts/planefence4docker/
#
# Programmers note: when using sed for URLs or file names, make sure NOT to use '/'
# as command separator, but use something else instead, for example '|'
@@ -51,6 +51,7 @@ chmod -fR a+rw /usr/share/planefence/persist/{.[!.]*,*}
chmod a=rwx /usr/share/planefence/persist/planepix
if [[ -f /usr/share/planefence/persist/planefence.config ]]; then
set -o allexport
+ # shellcheck disable=SC1091
source /usr/share/planefence/persist/planefence.config
set +o allexport
else
@@ -215,9 +216,20 @@ if chk_enabled "${PF_TWEET,,}"; then
sed -i 's/\(^\s*PLANETWEET=\).*/\1/' /usr/share/planefence/planefence.conf
else
sed -i 's|\(^\s*PLANETWEET=\).*|\1'"$(sed -n '/profiles:/{n;p;}' /root/.twurlrc | tr -d '[:blank:][=:=]')"'|' /usr/share/planefence/planefence.conf
- [[ -n "$PF_TWATTRIB" ]] && sed -i 's|\(^\s*ATTRIB=\).*|\1'"\"$PF_TWATTRIB\""'|' /usr/share/planefence/planefence.conf
- fi
+ [[ -n "$PF_TWATTRIB" ]] && sed -i 's|\(^\s*ATTRIB=\).*|\1'"\"$PF_TWATTRIB\""'|' /usr/share/planefence/planefence.conf
+ fi
fi
+
+# Despite the name, this variable also works for Mastodon and Discord notifications:
+# You can use PF_TWATTRIB/PA_TWATTRIB or PF_ATTRIB/PA_ATTRIB or simply $ATTRIB
+# If PA_[TW]ATTRIB isn't set, but PF_[TW]ATTRIB has a value, then the latter will also be used for Plane-Alert
+# Finally, if you set ATTRIB to a value, we will use that for both PA and PF and ignore any PF_[TW]ATTRIB/PA_[TW]ATTRIB values
+[[ -n "$PF_TWATTRIB$PF_ATTRIB" ]] && configure_planefence "ATTRIB" "\"$PF_TWATTRIB$PF_ATTRIB\""
+[[ -n "$PA_TWATTRIB$PA_ATTRIB" ]] && configure_planealert "ATTRIB" "\"$PA_TWATTRIB$PA_ATTRIB\""
+[[ -z "$PA_TWATTRIB$PA_ATTRIB" ]] && [[ -n "$PF_TWATTRIB$PF_ATTRIB" ]] && configure_planealert "ATTRIB" "\"$PF_TWATTRIB$PF_ATTRIB\""
+[[ -n "$ATTRIB" ]] && configure_both "ATTRIB" "\"$ATTRIB\""
+
+
# -----------------------------------------------------------------------------------
#
# Change the heatmap height and width if they are defined in the .env parameter file:
@@ -227,8 +239,7 @@ fi
#
# Also do this for files in the past -- /usr/share/planefence/html/planefence-??????.html
if find /usr/share/planefence/html/planefence-??????.html >/dev/null 2>&1; then
- for i in /usr/share/planefence/html/planefence-??????.html
- do
+ for i in /usr/share/planefence/html/planefence-??????.html; do
[[ -n "$PF_MAPWIDTH" ]] && sed -i 's|\(^\s*" <<< "$mast_result" >/dev/null 2>&1; then
+ configure_both "MASTODON_NAME" "$(jq -r '.acct' <<< "$mast_result")"
+ fi
if chk_enabled "${PF_MASTODON,,}"; then
configure_planefence "MASTODON_ACCESS_TOKEN" "$MASTODON_ACCESS_TOKEN"
configure_planefence "MASTODON_SERVER" "$MASTODON_SERVER"
@@ -354,6 +369,12 @@ configure_planefence "PF_MOTD" "\"$PF_MOTD\""
configure_planealert "PA_MOTD" "\"$PA_MOTD\""
#
#--------------------------------------------------------------------------------
+# Set TRACKSERVICE and TRACKLIMIT for Planefence and plane-alert.
+[[ -n "$PF_TRACKSERVICE" ]] && configure_planefence "TRACKSERVICE" "$PF_TRACKSERVICE" || configure_planefence "TRACKSERVICE" "globe.adsbexchange.com"
+[[ -n "$PA_TRACKSERVICE" ]] && configure_planealert "TRACKSERVICE" "$PA_TRACKSERVICE" || true
+[[ -n "$PA_TRACKLIMIT" ]] && configure_planealert "TRACKLIMIT" "$PA_TRACKLIMIT" || true
+#
+#--------------------------------------------------------------------------------
# Last thing - save the date we processed the config to disk. That way, if ~/.planefence/planefence.conf is changed,
# we know that we need to re-run this prep routine!
diff --git a/rootfs/usr/share/planefence/send-discord-alert.py b/rootfs/usr/share/planefence/send-discord-alert.py
index 344f55bf..14844471 100755
--- a/rootfs/usr/share/planefence/send-discord-alert.py
+++ b/rootfs/usr/share/planefence/send-discord-alert.py
@@ -4,10 +4,13 @@
#
# Usage: ./send-discord-alert.py
#
-# Copyright 2022 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2022-2024 Ramon F. Kolb, kx1t
+# Copyright 2022 Justin DiPierro
+#
+# Licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -63,6 +66,29 @@ def process_alert(config, plane):
name = plane['tail_num']
if plane["airline"] != "":
name = plane['airline']
+
+ try:
+ if config['PF_TRACKSERVICE'] == "":
+ trackservice="globe.adsbexchange.com"
+ trackname="AdsbExchange"
+ else:
+ trackservice=config['PF_TRACKSERVICE']
+ trackname=config['PF_TRACKSERVICE'].replace('https://','')
+ trackname=trackname.replace('http://','')
+ trackname=trackname.replace('www.','')
+ trackname=trackname.replace('globe.','')
+ trackname=trackname.replace('radar.','')
+ trackname=trackname.replace('tar1090.','')
+ trackname=trackname.replace('.com','')
+ trackname=trackname.replace('.org','')
+ trackname=trackname.replace('.net','')
+ trackname=trackname.replace('/tar1090','')
+ trackname=trackname.replace('/map','')
+ trackname=trackname.replace('/radar','')
+ trackname=trackname.replace('/','')
+ except:
+ trackservice="globe.adsbexchange.com"
+ trackname="AdsbExchange"
fa_link = pf.flightaware_link(plane['icao'], plane['tail_num'])
@@ -70,7 +96,7 @@ def process_alert(config, plane):
config["DISCORD_FEEDER_NAME"],
config["PF_DISCORD_WEBHOOKS"],
f"{name} is overhead at {pf.altitude_str(config, plane['alt'])}",
- f"[Track on ADS-B Exchange]({plane['adsbx_url']})")
+ f"[Track on {trackname}]({plane['adsbx_url'].replace('globe.adsbexchange.com',trackservice)})")
pf.attach_media(config, "PF", plane, webhooks, embed)
diff --git a/rootfs/usr/share/planefence/send_discord b/rootfs/usr/share/planefence/send_discord
index e3a27b6f..3b6b65b7 100755
--- a/rootfs/usr/share/planefence/send_discord
+++ b/rootfs/usr/share/planefence/send_discord
@@ -1,7 +1,7 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2164,SC1090,SC2154,SC1091
#---------------------------------------------------------------------------------------------
-# Copyright (C) 2022-2023, Ramon F. Kolb (kx1t)
+# Copyright (C) 2022-2024, Ramon F. Kolb (kx1t)
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
diff --git a/rootfs/usr/share/planefence/send_mastodon b/rootfs/usr/share/planefence/send_mastodon
index ad722aec..52f8d1ca 100755
--- a/rootfs/usr/share/planefence/send_mastodon
+++ b/rootfs/usr/share/planefence/send_mastodon
@@ -1,7 +1,7 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2164,SC1090,SC1091
#---------------------------------------------------------------------------------------------
-# Copyright (C) 2022-2023, Ramon F. Kolb (kx1t)
+# Copyright (C) 2022-2024, Ramon F. Kolb (kx1t)
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
diff --git a/rootfs/usr/share/planefence/stage/pa_query.php b/rootfs/usr/share/planefence/stage/pa_query.php
index 51d31914..7a1b80e6 100644
--- a/rootfs/usr/share/planefence/stage/pa_query.php
+++ b/rootfs/usr/share/planefence/stage/pa_query.php
@@ -50,7 +50,7 @@
echo "will return records of tail N141NE, N142NE, N143NE, and that have a timestamp that contains 2021/12/20 - 2021/21/29.
";
echo "
";
echo "Note that the date range is limited to the data available to Plane-Alert.
";
- echo "(C)opyright 2021 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
";
+ echo "(C)opyright 2021-2024 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
";
echo "
" . $hex . $tail . $name . $equipment . $timestamp . $call . $lat . $lon;
echo "
" "$IMG" "
Executive Summary
-
-
- Last update: $(date +"%b %d, %Y %R:%S %Z") -
- Maximum distance from ${LAT_VIS}°N, ${LON_VIS}°E: $DIST $DISTUNIT - -
- Only aircraft below $(printf "%'.0d" "$MAXALT") $ALTUNIT are reported -
- Data extracted from $(printf "%'.0d" "$TOTALLINES") ADS-B messages received since midnight today - +
- Last update: $(date +"%b %d, %Y %R:%S %Z") +
- Maximum distance from ${LAT_VIS}°N, ${LON_VIS}°E: $DIST $DISTUNIT +
- Only aircraft below $(printf "%'.0d" "$MAXALT") $ALTUNIT are reported +
- Data extracted from $(printf "%'.0d" $TOTALLINES) ADS-B messages received since midnight today EOF -[[ "$FUDGELOC" != "" ]] && printf "
- Please note that the reported station coordinates and the center of the circle on the heatmap are rounded for privacy protection. They do not reflect the exact location of the station.\n" >> "$OUTFILEHTMTMP" - -[[ -f "/run/planefence/filtered-$FENCEDATE" ]] && [[ -f "$IGNORELIST" ]] && (( $(grep -c "^[^#;]" "$IGNORELIST") > 0 )) && printf "
- %d entries were filtered out today because of an ignore list\n" "$(<"/run/planefence/filtered-$FENCEDATE")" >> "$OUTFILEHTMTMP" -[[ "$PA_LINK" != "" ]] && printf "
- Additionally, click here to visit Plane Alert: a watchlist of aircraft in general range of the station.\n" "$PA_LINK" >> "$OUTFILEHTMTMP" +{ [[ -n "$FUDGELOC" ]] && printf "
- Please note that the reported station coordinates and the center of the circle on the heatmap are rounded for privacy protection. They do not reflect the exact location of the station\n" + [[ -f "/run/planefence/filtered-$FENCEDATE" ]] && [[ -f "$IGNORELIST" ]] && (( $(grep -c "^[^#;]" "$IGNORELIST") > 0 )) && printf "
- %d entries were filtered out today because of an ignore list\n" "$(Get notified instantaneously of aircraft in range by following @%s@%s on Mastodon" \ + "$MASTODON_SERVER" "$MASTODON_NAME" "$MASTODON_NAME" "$MASTODON_SERVER" + fi + [[ -n "$PA_LINK" ]] && printf "
- Additionally, click here to visit Plane Alert: a watchlist of aircraft in general range of the station\n" "$PA_LINK"
+} >> "$OUTFILEHTMTMP"
# shellcheck disable=SC2129
cat <
>"$OUTFILEHTMTMP" @@ -966,18 +980,19 @@ cat < >"$OUTFILEHTMTMP" -
EOF
-printf "
- Click on the Transponder ID to see the full flight information/history (from AdsbExchange)" "$LAT_VIS" "$LON_VIS" >> "$OUTFILEHTMTMP" -printf "
- Click on the Flight Number to see the full flight information/history (from FlightAware)" >> "$OUTFILEHTMTMP" -printf "
- Click on the Owner Information to see the FAA record for this plane (private, US registered planes only)" >> "$OUTFILEHTMTMP" -(( ALTCORR > 0 )) && printf "
- Minimum altitude is the altitude above local ground level, which is %s %s MSL." "$ALTCORR" "$ALTUNIT" >> "$OUTFILEHTMTMP" || printf "
- Minimum altitude is the altitude above sea level." >> "$OUTFILEHTMTMP" +{ printf "
- Click on the Transponder ID to see the full flight information/history (from $TRACKSERVICE)" "$LAT_VIS" "$LON_VIS" + printf "
- Click on the Flight Number to see the full flight information/history (from FlightAware)" + printf "
- Click on the Owner Information to see the FAA record for this plane (private, US registered planes only)" + (( ALTCORR > 0 )) && printf "
- Minimum altitude is the altitude above local ground level, which is %s %s MSL." "$ALTCORR" "$ALTUNIT" >> "$OUTFILEHTMTMP" || printf "
- Minimum altitude is the altitude above sea level" -[[ "$PLANETWEET" != "" ]] && printf "
- Click on the word "yes" in the Tweeted column to see the Tweet.\n
- Note that tweets are issued after a slight delay\n" >> "$OUTFILEHTMTMP" -[[ "$PLANETWEET" != "" ]] && printf "
- Get notified instantaneously of aircraft in range by following @%s on Twitter!\n" "$PLANETWEET" "$PLANETWEET" >> "$OUTFILEHTMTMP" -(( $(find "$TMPDIR"/noisecapt-spectro*.png -daystart -maxdepth 1 -mmin -1440 -print 2>/dev/null | wc -l ) > 0 )) && printf "
- Click on the word "Spectrogram" to see the audio spectrogram of the noisiest period while the aircraft was in range\n" >> "$OUTFILEHTMTMP" -[[ "$PLANEALERT" == "ON" ]] && printf "
- See a list of aircraft matching the station's Alert List here\n" >> "$OUTFILEHTMTMP" + [[ "$PLANETWEET" != "" ]] && printf "
- Click on the word "yes" in the Tweeted column to see the Tweet.\n
- Note that tweets are issued after a slight delay\n" + [[ "$PLANETWEET" != "" ]] && printf "
- Get notified instantaneously of aircraft in range by following @%s on Twitter!\n" "$PLANETWEET" "$PLANETWEET" + (( $(find "$TMPDIR"/noisecapt-spectro*.png -daystart -maxdepth 1 -mmin -1440 -print 2>/dev/null | wc -l ) > 0 )) && printf "
- Click on the word "Spectrogram" to see the audio spectrogram of the noisiest period while the aircraft was in range\n" + [[ "$PLANEALERT" == "ON" ]] && printf "
- See a list of aircraft matching the station's Alert List here\n" -printf "
- Press the header of any of the columns to sort by that column.\n" >> "$OUTFILEHTMTMP" -printf "
- Press the header of any of the columns to sort by that column\n" + printf "
PlaneFence $VERSION is part of KX1T's PlaneFence Open Source Project, available on GitHub. Support is available on the #Planefence channel of the SDR Enthusiasts Discord Server. Click the Chat icon below to join. $(if [[ -f /root/.buildtime ]]; then printf " Build: %s" "$([[ -f /usr/share/planefence/branch ]] && cat /usr/share/planefence/branch || cat /root/.buildtime)"; fi) -
© Copyright 2020 - 2023 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used. +
© Copyright 2020-2024 by Ramón F. Kolb, kx1t. Please see here for attributions to our contributors and open source packages used.
" <<< "$mast_result" >/dev/null 2>&1; then
+ configure_both "MASTODON_NAME" "$(jq -r '.acct' <<< "$mast_result")"
+ fi
if chk_enabled "${PF_MASTODON,,}"; then
configure_planefence "MASTODON_ACCESS_TOKEN" "$MASTODON_ACCESS_TOKEN"
configure_planefence "MASTODON_SERVER" "$MASTODON_SERVER"
@@ -354,6 +369,12 @@ configure_planefence "PF_MOTD" "\"$PF_MOTD\""
configure_planealert "PA_MOTD" "\"$PA_MOTD\""
#
#--------------------------------------------------------------------------------
+# Set TRACKSERVICE and TRACKLIMIT for Planefence and plane-alert.
+[[ -n "$PF_TRACKSERVICE" ]] && configure_planefence "TRACKSERVICE" "$PF_TRACKSERVICE" || configure_planefence "TRACKSERVICE" "globe.adsbexchange.com"
+[[ -n "$PA_TRACKSERVICE" ]] && configure_planealert "TRACKSERVICE" "$PA_TRACKSERVICE" || true
+[[ -n "$PA_TRACKLIMIT" ]] && configure_planealert "TRACKLIMIT" "$PA_TRACKLIMIT" || true
+#
+#--------------------------------------------------------------------------------
# Last thing - save the date we processed the config to disk. That way, if ~/.planefence/planefence.conf is changed,
# we know that we need to re-run this prep routine!
diff --git a/rootfs/usr/share/planefence/send-discord-alert.py b/rootfs/usr/share/planefence/send-discord-alert.py
index 344f55bf..14844471 100755
--- a/rootfs/usr/share/planefence/send-discord-alert.py
+++ b/rootfs/usr/share/planefence/send-discord-alert.py
@@ -4,10 +4,13 @@
#
# Usage: ./send-discord-alert.py
#
-# Copyright 2022 Ramon F. Kolb - licensed under the terms and conditions
+# Copyright 2022-2024 Ramon F. Kolb, kx1t
+# Copyright 2022 Justin DiPierro
+#
+# Licensed under the terms and conditions
# of GPLv3. The terms and conditions of this license are included with the Github
# distribution of this package, and are also available here:
-# https://github.com/kx1t/planefence/
+# https://github.com/sdr-enthusiasts/planefence/
#
# The package contains parts of, and modifications or derivatives to the following:
# Dump1090.Socket30003 by Ted Sluis: https://github.com/tedsluis/dump1090.socket30003
@@ -63,6 +66,29 @@ def process_alert(config, plane):
name = plane['tail_num']
if plane["airline"] != "":
name = plane['airline']
+
+ try:
+ if config['PF_TRACKSERVICE'] == "":
+ trackservice="globe.adsbexchange.com"
+ trackname="AdsbExchange"
+ else:
+ trackservice=config['PF_TRACKSERVICE']
+ trackname=config['PF_TRACKSERVICE'].replace('https://','')
+ trackname=trackname.replace('http://','')
+ trackname=trackname.replace('www.','')
+ trackname=trackname.replace('globe.','')
+ trackname=trackname.replace('radar.','')
+ trackname=trackname.replace('tar1090.','')
+ trackname=trackname.replace('.com','')
+ trackname=trackname.replace('.org','')
+ trackname=trackname.replace('.net','')
+ trackname=trackname.replace('/tar1090','')
+ trackname=trackname.replace('/map','')
+ trackname=trackname.replace('/radar','')
+ trackname=trackname.replace('/','')
+ except:
+ trackservice="globe.adsbexchange.com"
+ trackname="AdsbExchange"
fa_link = pf.flightaware_link(plane['icao'], plane['tail_num'])
@@ -70,7 +96,7 @@ def process_alert(config, plane):
config["DISCORD_FEEDER_NAME"],
config["PF_DISCORD_WEBHOOKS"],
f"{name} is overhead at {pf.altitude_str(config, plane['alt'])}",
- f"[Track on ADS-B Exchange]({plane['adsbx_url']})")
+ f"[Track on {trackname}]({plane['adsbx_url'].replace('globe.adsbexchange.com',trackservice)})")
pf.attach_media(config, "PF", plane, webhooks, embed)
diff --git a/rootfs/usr/share/planefence/send_discord b/rootfs/usr/share/planefence/send_discord
index e3a27b6f..3b6b65b7 100755
--- a/rootfs/usr/share/planefence/send_discord
+++ b/rootfs/usr/share/planefence/send_discord
@@ -1,7 +1,7 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2164,SC1090,SC2154,SC1091
#---------------------------------------------------------------------------------------------
-# Copyright (C) 2022-2023, Ramon F. Kolb (kx1t)
+# Copyright (C) 2022-2024, Ramon F. Kolb (kx1t)
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
diff --git a/rootfs/usr/share/planefence/send_mastodon b/rootfs/usr/share/planefence/send_mastodon
index ad722aec..52f8d1ca 100755
--- a/rootfs/usr/share/planefence/send_mastodon
+++ b/rootfs/usr/share/planefence/send_mastodon
@@ -1,7 +1,7 @@
#!/command/with-contenv bash
#shellcheck shell=bash disable=SC2015,SC2164,SC1090,SC1091
#---------------------------------------------------------------------------------------------
-# Copyright (C) 2022-2023, Ramon F. Kolb (kx1t)
+# Copyright (C) 2022-2024, Ramon F. Kolb (kx1t)
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
diff --git a/rootfs/usr/share/planefence/stage/pa_query.php b/rootfs/usr/share/planefence/stage/pa_query.php
index 51d31914..7a1b80e6 100644
--- a/rootfs/usr/share/planefence/stage/pa_query.php
+++ b/rootfs/usr/share/planefence/stage/pa_query.php
@@ -50,7 +50,7 @@
echo "will return records of tail N141NE, N142NE, N143NE, and that have a timestamp that contains 2021/12/20 - 2021/21/29.
"; echo "
"; echo "Note that the date range is limited to the data available to Plane-Alert.
"; - echo "(C)opyright 2021 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
"; + echo "(C)opyright 2021-2024 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
"; echo "
" . $hex . $tail . $name . $equipment . $timestamp . $call . $lat . $lon; echo "
"; echo "
"; echo "Note that the date range is limited to the data available to Plane-Alert.
"; - echo "(C)opyright 2021 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
"; + echo "(C)opyright 2021-2024 by kx1t, available under GPL3 as defined at the PlaneFence repository at GitHub.
"; echo "
" . $hex . $tail . $name . $equipment . $timestamp . $call . $lat . $lon; echo "