From 36c44e53041f1feee3b3e646722d5e8b5297d968 Mon Sep 17 00:00:00 2001
From: Shihaam Abdul Rahman <shihaam@shihaam.me>
Date: Sun, 12 Nov 2023 12:55:40 +0500
Subject: [PATCH] converstion and var fixes

---
 bot.sh   | 18 +++++++++---------
 fil.json |  1 +
 speed.sh | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 fil.json
 create mode 100644 speed.sh

diff --git a/bot.sh b/bot.sh
index 2dc236e..d8fc4b7 100755
--- a/bot.sh
+++ b/bot.sh
@@ -32,14 +32,14 @@ ookla_country=$(jq -r '.server.country' "$speedtest_ookla")
 ookla_ping=$(jq '.ping' "$speedtest_ookla")
 ookla_download=$(jq '.download' "$speedtest_ookla")
 ookla_upload=$(jq '.upload' "$speedtest_ookla")
-ooka_bytes_received=$(jq '.bytes_received' "$speedtest_ookla")
-ooka_bytes_sent=$(jq '.bytes_sent' "$speedtest_ookla")
+ookla_bytes_received=$(jq '.bytes_received' "$speedtest_ookla")
+ookla_bytes_sent=$(jq '.bytes_sent' "$speedtest_ookla")
 
 # Converting to human readable units
-ookla_download_mbps=$(echo "scale=4; $download / 1000000" | bc)
-ookla_upload_mbps=$(echo "scale=4; $upload / 1000000" | bc)
-ookla_bytes_received_mb=$(echo "scale=2; $bytes_received / 1048576" | bc)
-ookla_bytes_sent_mb=$(echo "scale=2; $bytes_sent / 1048576" | bc)
+ookla_download_mbps=$(echo "scale=4; $ookla_download / 1000000" | bc)
+ookla_upload_mbps=$(echo "scale=4; $ookla_upload / 1000000" | bc)
+ookla_bytes_received_mb=$(echo "scale=2; $ookla_bytes_received / 1048576" | bc)
+ookla_bytes_sent_mb=$(echo "scale=2; $ookla_bytes_sent / 1048576" | bc)
 
 echo Starting LibreSpeed
 librespeed-cli --json > $speedtest_libre
@@ -53,8 +53,8 @@ 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; $bytes_sent / 1048576" | bc)
-libre_bytes_received_mb=$(echo "scale=2; $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)
 
 echo Starting Fast
 fast --upload --json > $speedtest_fast
@@ -101,7 +101,7 @@ $current_weather
 🌐 *Server*: $libre_server_name
 🏓 *Latency*: $libre_ping ms
 ⬇️  *Download*: $libre_download Mbit/s, Used: $libre_bytes_received_mb MB
-⬆️  *Upload*: Upload: $libre_uploadv Mbit/s, Used $libre_bytes_sent_mb MB
+⬆️  *Upload*: Upload: $libre_upload Mbit/s, Used $libre_bytes_sent_mb MB
 
 *Fast Powered by Netflix*:
 🏓 *Latency*: $fast_latency ms
diff --git a/fil.json b/fil.json
new file mode 100644
index 0000000..8bef56c
--- /dev/null
+++ b/fil.json
@@ -0,0 +1 @@
+{"download": 38823491.68750661, "upload": 35415911.54118075, "ping": 107.185, "server": {"url": "http://co2dsvr03.speedtest.starhub.com:8080/speedtest/upload.php", "lat": "1.3000", "lon": "103.8000", "name": "Singapore", "country": "Singapore", "cc": "SG", "sponsor": "StarHub Ltd", "id": "4235", "host": "co2dsvr03.speedtest.starhub.com:8080", "d": 13.168430515716555, "latency": 107.185}, "timestamp": "2023-11-12T07:49:46.615855Z", "bytes_sent": 45031424, "bytes_received": 49206836, "share": null, "client": {"ip": "178.128.25.69", "lat": "1.3078", "lon": "103.6818", "isp": "Digital Ocean", "isprating": "3.7", "rating": "0", "ispdlavg": "0", "ispulavg": "0", "loggedin": "0", "country": "SG"}}
diff --git a/speed.sh b/speed.sh
new file mode 100644
index 0000000..da327ec
--- /dev/null
+++ b/speed.sh
@@ -0,0 +1,36 @@
+speedtest_ookla=fil.json
+ # Run speedtest and output to a file
+ speedtest --json > $speedtest_ookla
+ # Extract information from the speedtest output
+
+ # Parsing JSON data
+ ookla_server=$(jq -r '.server.sponsor' "$speedtest_ookla")
+ ookla_city=$(jq -r '.server.name' "$speedtest_ookla")
+ ookla_country=$(jq -r '.server.country' "$speedtest_ookla")
+ ookla_ping=$(jq '.ping' "$speedtest_ookla")
+ ookla_download=$(jq '.download' "$speedtest_ookla")
+ ookla_upload=$(jq '.upload' "$speedtest_ookla")
+ ooka_bytes_received=$(jq '.bytes_received' "$speedtest_ookla")
+ ooka_bytes_sent=$(jq '.bytes_sent' "$speedtest_ookla")
+
+ # Converting to human readable units
+ ookla_download_mbps=$(echo "scale=4; $download / 1000000" | bc)
+ ookla_upload_mbps=$(echo "scale=4; $upload / 1000000" | bc)
+ ookla_bytes_received_mb=$(echo "scale=2; $bytes_received / 1048576" | bc)
+ ookla_bytes_sent_mb=$(echo "scale=2; $bytes_sent / 1048576" | bc)
+
+# Converting to human-readable units
+ookla_download_mbps=$(echo "scale=4; $ookla_download / 1000000" | bc)
+ookla_upload_mbps=$(echo "scale=4; $ookla_upload / 1000000" | bc)
+ookla_bytes_received_mb=$(echo "scale=2; $ookla_bytes_received / 1048576" | bc)
+ookla_bytes_sent_mb=$(echo "scale=2; $ookla_bytes_sent / 1048576" | bc)
+
+# Display the results
+echo "Server: $ookla_server"
+echo "City: $ookla_city"
+echo "Country: $ookla_country"
+echo "Ping: $ookla_ping ms"
+echo "Download Speed: $ookla_download_mbps Mbps"
+echo "Upload Speed: $ookla_upload_mbps Mbps"
+echo "Bytes Received: $ookla_bytes_received_mb MB"
+echo "Bytes Sent: $ookla_bytes_sent_mb MB"