shihaam/starlink_status
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enabled libre and fast, added average speed meter

Browse Source
This commit is contained in:
Shihaam Abdul Rahman 2023-11-27 22:00:42 +05:00
parent 6c96c6efb5
commit d173d6904d
Signed by: shihaam
GPG Key ID: 6DA2E87EBC227636
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bot.sh
View File

@ -71,33 +71,35 @@ ookla_bytes_sent_mb=$(echo "scale=2; $ookla_bytes_sent / 1048576" | bc)
ookla_total=$(echo $ookla_bytes_sent_mb+$ookla_bytes_received_mb | bc)
#echo Starting LibreSpeed
#librespeed-cli --json > $speedtest_libre
librespeed-cli --json > $speedtest_libre
# Parsing JSON data
#libre_bytes_sent=$(jq '.[0].bytes_sent' "$speedtest_libre")
#libre_bytes_received=$(jq '.[0].bytes_received' "$speedtest_libre")
#libre_ping=$(jq '.[0].ping' "$speedtest_libre")
#libre_upload=$(jq '.[0].upload' "$speedtest_libre")
#libre_download=$(jq '.[0].download' "$speedtest_libre")
#libre_server_name=$(jq -r '.[0].server.name' "$speedtest_libre")
libre_bytes_sent=$(jq '.[0].bytes_sent' "$speedtest_libre")
libre_bytes_received=$(jq '.[0].bytes_received' "$speedtest_libre")
libre_ping=$(jq '.[0].ping' "$speedtest_libre")
libre_upload=$(jq '.[0].upload' "$speedtest_libre")
libre_download=$(jq '.[0].download' "$speedtest_libre")
libre_server_name=$(jq -r '.[0].server.name' "$speedtest_libre")
# Converting to human readable units
#libre_bytes_sent_mb=$(echo "scale=2; $libre_bytes_sent / 1048576" | bc)
#libre_bytes_received_mb=$(echo "scale=2; $libre_bytes_received / 1048576" | bc)
libre_bytes_sent_mb=$(echo "scale=2; $libre_bytes_sent / 1048576" | bc)
libre_bytes_received_mb=$(echo "scale=2; $libre_bytes_received / 1048576" | bc)
#libre_total=$(echo $libre_bytes_sent_mb+$libre_bytes_received_mb | bc)
libre_total=$(echo $libre_bytes_sent_mb+$libre_bytes_received_mb | bc)
#echo Starting Fast
#fast --upload --json > $speedtest_fast
#fast_download_speed=$(jq '.downloadSpeed' "$speedtest_fast")
#fast_upload_speed=$(jq '.uploadSpeed' "$speedtest_fast")
#fast_latency=$(jq '.latency' "$speedtest_fast")
#fast_downloaded=$(jq '.downloaded' "$speedtest_fast")
#fast_uploaded=$(jq '.uploaded' "$speedtest_fast")
fast --upload --json > $speedtest_fast
fast_download_speed=$(jq '.downloadSpeed' "$speedtest_fast")
fast_upload_speed=$(jq '.uploadSpeed' "$speedtest_fast")
fast_latency=$(jq '.latency' "$speedtest_fast")
fast_downloaded=$(jq '.downloaded' "$speedtest_fast")
fast_uploaded=$(jq '.uploaded' "$speedtest_fast")
#fast_total=$(echo $fast_downloaded+$fast_uploaded | bc)
fast_total=$(echo $fast_downloaded+$fast_uploaded | bc)
total_wasted=$ookla_total
average_download=$(echo $ookla_download_mbps+$libre_download+$fast_download_speed/3 | bc)
average_upload=$(echo $ookla_upload+$libre_upload+$fast_upload_speed/3| bc)
total_wasted=$(echo $ookla_total+$libre_total+$fast_total | bc)
echo Speedtests complete
#################################################################################
@ -150,32 +152,33 @@ echo Weather checked
#################################################################################
#################################################################################
ookla_download_angle=$(echo "scale=2; -118 + ($ookla_download_mbps - 0) / ($MAX_DOWNLOAD_SPEED - 0) * (118 - -118)" | bc)
ookla_upload_angle=$(echo "scale=2; -118 + ($ookla_upload_mbps - 0) / ($MAX_UPLOAD_SPEED - 0) * (118 - -118)" | bc)
download_angle=$(echo "scale=2; -118 + ($average_download - 0) / ($MAX_DOWNLOAD_SPEED - 0) * (118 - -118)" | bc)
upload_angle=$(echo "scale=2; -118 + ($average_upload - 0) / ($MAX_UPLOAD_SPEED - 0) * (118 - -118)" | bc)
convert $download_meter \
\( $needle -background none \
-rotate $ookla_download_angle \) \
-rotate $download_angle \) \
-gravity center \
-compose over \
-composite \
-pointsize 41 \
-font $font \
-fill white \
-annotate +0+-15 $ookla_download_mbps \
-annotate +0+-15 $average_download \
-annotate +120+85 $MAX_DOWNLOAD_SPEED \
$speedtest_download_meter
convert $upload_meter \
\( $needle -background none \
-rotate $ookla_upload_angle \) \
-rotate $upload_angle \) \
-gravity center \
-compose over \
-composite \
-pointsize 41 \
-font $font \
-fill white \
-annotate +0+-15 $ookla_upload_mbps \
-annotate +0+-15 $average_upload \
-annotate +120+85 $MAX_UPLOAD_SPEED \
$speedtest_upload_meter
@ -207,6 +210,17 @@ $current_weather
⬇️ *Download*: $ookla_download_mbps Mbit/s, Used: $ookla_bytes_received_mb MB
⬆️ *Upload*: $ookla_upload_mbps Mbit/s, Used: $ookla_bytes_sent_mb MB
*LibreSpeed*:
🌐 *Server*: $libre_server_name
🏓 *Latency*: $libre_ping ms
⬇️ *Download*: $libre_download Mbit/s, Used: $libre_bytes_received_mb MB
⬆️ *Upload*: $libre_upload Mbit/s, Used $libre_bytes_sent_mb MB
*Fast Powered by Netflix*:
🏓 *Latency*: $fast_latency ms
⬇️ *Download*: $fast_download_speed Mbit/s, Used: $fast_downloaded MB
⬆️ *Upload*: $fast_upload_speed Mbit/s, Used: $fast_uploaded MB
Total data wasted: $total_wasted MB
"