From cf45023a9144668e1453df078bada66b003849f6 Mon Sep 17 00:00:00 2001 From: hornet <88428122+HornetMaidan@users.noreply.github.com> Date: Wed, 17 Apr 2024 04:22:39 +0500 Subject: [PATCH] Revert "Refactored Code and README for better readability" --- README.md | 74 +++++++------------- weather.sh | 202 +++++++++++++++++++++++------------------------------ 2 files changed, 113 insertions(+), 163 deletions(-) diff --git a/README.md b/README.md index 97d66c0..282edb7 100644 --- a/README.md +++ b/README.md @@ -1,54 +1,32 @@ -🌤️ **weather_bash** +# weather_bash +a simple bash script that fetches a weather report for your location right into your terminal +------------------------------------------------- +this is just a simple script for myself to get the current weather right in terminal,\ +but feel free to use it as you like, as it is licensed with GNU GPL v.3.0.\ +a considerable amount of uwu is present +------------------------------------------------- +to-do: -A simple bash script that fetches a weather report for your location right into your terminal. ☔ +v.0.2 ----- OUTDATED\ +#colorcode the output --- DONE\ +#automatic detection of packet manager to install jq(at least apt/pacman/xbps/etc..) --- DONE(semi-auto preferred)\ +#uwufy everything --- DONE(though it's a constant process) -#### Note: - - This is just a straightforward script for myself to get the current weather right in the terminal, but feel free to use it as you like. -It is licensed under GNU GPL v3.0. A considerable amount of uwu is present. 😎 +v.0.3 ----- OUTDATED\ +#add 24-hour forecast as an option --- DONE\ +#add ANSI/ASCII art as icons for weather descriptions(not sure yet) --- DISCARDED\ +#CLI overhaul for new features --- DONE ---- +v.1.0(initial release) ----- OUTDATED\ +#fix the forecast showing past time data --- DONE\ +#strong wind alert --- DONE\ +#code cleaning --- DONE -### Release Information +v.1.1 ----- CURRENT\ +#temperature alert --- DONE\ +#minor additions --- DONE -Latest Release: **v1.1** ---- +further updates will be most likely only to fix something, i think this project is now complete\ +if you may experience any issue with this script or want to suggest to add something - you are more than welcome! -**Todos and Dones:** - -***v1.1*** - **CURRENT** - -- Temperature alert: ✔️ -- Minor additions: ✔️ - -***v1.0 (initial release)*** - **DEPRECATED** - -- Fix the forecast showing past time data: ✔️ -- Strong wind alert: ✔️ -- Code cleaning: ✔️ - -***v0.3*** - **DEPRECATED** - -- Add 24-hour forecast as an option: ✔️ -- CLI overhaul for new features: ✔️ - -***v0.2*** - **DEPRECATED** - -- Color code the output: ✔️ -- Automatic detection of packet manager to install jq (at least apt/pacman/xbps/etc..) - ✔️ (semi-auto preferred) -- Uwufy everything: ✔️ (though it's a constant process) ---- - -## Anything Else to Know? - -Further updates will most likely only be to fix something. I think this project is now complete. If you experience any issues with this script or want to suggest adding something, you are more than welcome! - -**P.S: API keys are intentionally left as variables in the script so you can change them to your own or any other if they reach the request limit.** - ---- - -## Discarded ideas - -- Add ANSI/ASCII art as icons for weather descriptions ---- - -#### 📝 This project is licensed under the GNU General Public License v3.0. +P.S: api keys are intentionally left right in the script as variables so you can change them to your own/any other if they reach the request limit diff --git a/weather.sh b/weather.sh index b3601e2..117954e 100755 --- a/weather.sh +++ b/weather.sh @@ -1,63 +1,31 @@ #!/bin/bash -# # # # # # # # # # # # # # # # # # # # # # # # # # -# Written by: https://github.com/HornetMaidan/ # -# https://github.com/HornetMaidan/ # -# # -# Refactored by: # -# https://github.com/0n1cOn3 # -# # # # # # # # # # # # # # # # # # # # # # # # # # - -# Variables for weather.sh -api_key="1dfeef54f6e423266e0f09920919f297" -ipinfo_key="adc827a697c024" - -user_ip=$(curl -s https://ifconfig.me/ip) -location_info=$(curl -s "https://ipinfo.io/$user_ip?token=$ipinfo_key") - -api_url="https://api.openweathermap.org/data/2.5/weather?lat=$lat&lon=$lon&units=metric&appid=$api_key" -forecast_url="https://api.openweathermap.org/data/2.5/forecast?lat=$lat&lon=$lon&units=metric&appid=$api_key" - -lat=$(echo "$location_info" | jq -r '.loc' | cut -d ',' -f 1) -lon=$(echo "$location_info" | jq -r '.loc' | cut -d ',' -f 2) - -weather_data=$(curl -s "$api_url") -forecast_data=$(curl -s "$forecast_url") - -weather_desc=$(echo "$weather_data" | jq -r '.weather[].description') -wind_speed=$(echo "$weather_data" | jq -r '.wind.speed') - -# Main application # -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - -# Check if the user has jq installed +#verify if user has jq installed if ! command -v jq &> /dev/null; then - if [ "$(id -u)" -ne 0 ]; then - echo "You need root privileges to install jq." - exit 1 - fi - echo "It seems that jq is not installed. Please select your package manager:" - echo "[1] apt" - echo "[2] pacman" - echo "[3] xbps" - echo "[4] yum" - echo "[5] dnf" - echo "[6] brew" - echo "[7] zypper" - read -rp "Your choice: " choice - case $choice in - 1) sudo apt-get update && sudo apt-get install jq awk;; - 2) sudo pacman --sync jq awk;; - 3) sudo xbps-install -S jq awk;; - 4) sudo yum install epel-release && sudo yum install jq awk ;; - 5) sudo dnf install jq awk;; - 6) brew install jq awk;; - 7) sudo zypper install jq awk ;; - *) echo "Invalid input! Please try again or install jq manually."; exit 1 ;; +echo "oww, it seems that you don't have jq JSON pawsew installed... pwease do :3" +echo "sewect youw package managew..." +echo "[1] apt" +echo "[2] pacman" +echo "[3] xbps" +echo "[4] yum" +echo "[5] dnf" +echo "[6] brew" +echo "[7] zypper" +read -rp "youw choice: " choice +case $choice in + 1) sudo apt-get update && sudo apt-get install jq awk;; + 2) sudo pacman --sync jq awk;; + 3) sudo xbps-install -S jq awk;; + 4) sudo yum install epel-release && sudo yum install jq awk ;; + 5) sudo dnf install jq awk;; + 6) brew install jq awk;; + 7) sudo zypper install jq awk ;; + *) echo "oww, you've done a fucky wucky! twy again ow install it manually~"; exit 1 ;; esac fi -# Functions for text formatting +#formatting the output + strip_ansi_escape_codes() { echo -ne "$1" | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" } @@ -70,76 +38,80 @@ pad_string() { printf "%s%*s" "$string" "$spaces" "" } -# Adjusting city name +#api requests + +api_key="1dfeef54f6e423266e0f09920919f297" +ipinfo_key="adc827a697c024" +user_ip=$(curl -s https://ifconfig.me/ip) + +location_info=$(curl -s "https://ipinfo.io/$user_ip?token=$ipinfo_key") +lat=$(echo "$location_info" | jq -r '.loc' | cut -d ',' -f 1) +lon=$(echo "$location_info" | jq -r '.loc' | cut -d ',' -f 2) + +api_url="https://api.openweathermap.org/data/2.5/weather?lat=$lat&lon=$lon&units=metric&appid=$api_key" +forecast_url="https://api.openweathermap.org/data/2.5/forecast?lat=$lat&lon=$lon&units=metric&appid=$api_key" + +weather_data=$(curl -s "$api_url") +forecast_data=$(curl -s "$forecast_url") + +weather_desc=$(echo "$weather_data" | jq -r '.weather[].description') +wind_speed=$(echo "$weather_data" | jq -r '.wind.speed') + city=$(echo "$weather_data" | jq -r '.name') -if [[ "$city" == "Nur-Sultan" ]]; then - city='Astana'; +if [[ "$city" == "Nur-Sultan" ]] ; then +city='Astana'; fi -# CLI output -echo "" -echo -e "\tHello $USER! I hope you are doing well!" -echo -e "\tHere is the current weather report for $city." -echo -echo -e "$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' =)" -echo -e "\t$(pad_string "Current" 40) Forecast" -echo -e "$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' -)" -echo -echo -e "\t$(pad_string "Time: $(date +"%H:%M")" 40) $(echo "$forecast_data" | jq -r '.list[2].dt_txt' | sed 's#-#/#g;s#...$##;') ----- $(echo "$forecast_data" | jq -r '[.list[0].weather[].description, .list[0].main.temp] | join(", ")')°C" -echo -e "\t$(pad_string "Date: $(date +"%d/%m/%Y")" 40) $(echo "$forecast_data" | jq -r '.list[3].dt_txt' | sed 's#-#/#g;s#...$##') ----- $(echo "$forecast_data" | jq -r '[.list[1].weather[].description, .list[1].main.temp] | join(", ")')°C" -echo -e "\t$(pad_string "Weather: $(echo "$weather_data" | jq -r '.weather[].description')" 40) $(echo "$forecast_data" | jq -r '.list[4].dt_txt' | sed 's#-#/#g;s#...$##') ----- $(echo "$forecast_data" | jq -r '[.list[2].weather[].description, .list[2].main.temp] | join(", ")')°C" -echo -e "\t$(pad_string "Temperature: $(echo "$weather_data" | jq -r '.main.temp')°C" 40) $(echo "$forecast_data" | jq -r '.list[5].dt_txt' | sed 's#-#/#g;s#...$##') ----- $(echo "$forecast_data" | jq -r '[.list[3].weather[].description, .list[3].main.temp] | join(", ")')°C" -echo -e "\t$(pad_string "Wind: $(echo "$weather_data" | jq -r '.wind.speed')m/s, Azimuth: $(echo "$weather_data" | jq -r '.wind.deg')" 40) $(echo "$forecast_data" | jq -r '.list[6].dt_txt' | sed 's#-#/#g;s#...$##') ----- $(echo "$forecast_data" | jq -r '[.list[4].weather[].description, .list[4].main.temp] | join(", ")')°C" -echo -e "\t$(pad_string "Clouds: $(echo "$weather_data" | jq -r '.clouds.all')%" 40) $(echo "$forecast_data" | jq -r '.list[7].dt_txt' | sed 's#-#/#g;s#...$##') ----- $(echo "$forecast_data" | jq -r '[.list[5].weather[].description, .list[5].main.temp] | join(", ")')°C" -echo -echo -e "$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' -)" -# Weather description -case "$weather_desc" in - "clear sky") - echo -e "\tSeems to be a pretty clear sky today!" - ;; - *"clouds"*) - echo -e "\tSome clouds are present but it's okay. I like clouds!" - ;; - *"rain"* | *"drizzle"*) - echo -e "\tLooks like it's raining today. Make sure you bring an umbrella with you." - ;; - *"thunderstorm"*) - echo -e "\tA thunderstorm is coming! Prepare yourself!" - ;; - *"snow"*) - echo -e "\tThere is going to be snow today! Be careful outside." - ;; - "fog" | "mist") - echo -e "\tThe fog is coming." - ;; - "smoke" | "haze") - echo -e "\tSomebody is grilling really hard today! Expect some smoke." - ;; -esac +#cli output + +echo "" +echo -e "\t\e[37mhewwo \e[35m$USER!\e[37m i hope u awe doing gweat today!\e[0m" +echo -e "\t\e[37mhewe is the cuwwent weathew wepowt fow \e[32m$city\e[37m uwu~\e[0m" +echo +echo -e "\e[32m$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' =)\e[0m" +echo -e "\e[32m\t$(pad_string "cuwwent" 40) fowecast" +echo -e "\e[32m$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' -)\e[0m" +echo +echo -e "\t$(pad_string "\e[37mtime: $(date +"%H:%M")" 40)\e[0m $(echo "$forecast_data" | jq -r '.list[2].dt_txt' | sed 's#-#/#g;s#...$##;') ----- \e[33m$(echo "$forecast_data" | jq -r '[.list[0].weather[].description, .list[0].main.temp] | join(", ")')°C\e[0m" +echo -e "\t$(pad_string "\e[37mdate: $(date +"%d/%m/%Y")" 40)\e[0m $(echo "$forecast_data" | jq -r '.list[3].dt_txt' | sed 's#-#/#g;s#...$##') ----- \e[33m$(echo "$forecast_data" | jq -r '[.list[1].weather[].description, .list[1].main.temp] | join(", ")')°C\e[0m" +echo -e "\t$(pad_string "weathew: \e[33m\e[5m$(echo "$weather_data" | jq -r '.weather[].description')\e[0m" 40) $(echo "$forecast_data" | jq -r '.list[4].dt_txt' | sed 's#-#/#g;s#...$##') ----- \e[33m$(echo "$forecast_data" | jq -r '[.list[2].weather[].description, .list[2].main.temp] | join(", ")')°C\e[0m" +echo -e "\t$(pad_string "\e[37mtempewatuwe: \e[35m$(echo "$weather_data" | jq -r '.main.temp')°C\e[0m" 40) $(echo "$forecast_data" | jq -r '.list[5].dt_txt' | sed 's#-#/#g;s#...$##') ----- \e[33m$(echo "$forecast_data" | jq -r '[.list[3].weather[].description, .list[3].main.temp] | join(", ")')°C\e[0m" +echo -e "\t$(pad_string "\e[37mwind: \e[37m\e[36m$(echo "$weather_data" | jq -r '.wind.speed')m/s, azimuth: $(echo "$weather_data" | jq -r '.wind.deg')\e[0m" 40) $(echo "$forecast_data" | jq -r '.list[6].dt_txt' | sed 's#-#/#g;s#...$##') ----- \e[33m$(echo "$forecast_data" | jq -r '[.list[4].weather[].description, .list[4].main.temp] | join(", ")')°C\e[0m" +echo -e "\t$(pad_string "\e[37mcwouds: \e[37m\e[34m$(echo "$weather_data" | jq -r '.clouds.all')%\e[0m" 40) $(echo "$forecast_data" | jq -r '.list[7].dt_txt' | sed 's#-#/#g;s#...$##') ----- \e[33m$(echo "$forecast_data" | jq -r '[.list[5].weather[].description, .list[5].main.temp] | join(", ")')°C\e[0m" +echo +echo -e "\e[32m$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' -)\e[0m" +if [[ "$weather_desc" == "clear sky" ]]; then + echo -e "\t\e[33mseems to be a pwetty cleaw sky today!\e[0m" +elif [[ "$weather_desc" == *"clouds"* ]]; then + echo -e "\t\e[34msome cwouds awe pwesent but it's ok :3 i like cwouds!!!!\e[0m" +elif [[ "$weather_desc" == *"rain"* || "$weather_desc" == *"drizzle"* ]]; then + echo -e "\t\e[36mlooks like it's wainin today, make suwe u bwing an umbwella with u :3\\e[0m" +elif [[ "$weather_desc" == *"thunderstorm"* ]]; then + echo -e "\t\e[31ma thundewsowm is coming! pwepawe youwself!\e[0m" +elif [[ "$weather_desc" == *"snow"* ]]; then + echo -e "\t\e[37mthewe is going to be snow today! be caweful outside~\e[0m" +elif [[ "$weather_desc" == "fog" || "$weather_desc" == "mist" ]]; then + echo -e "\t\e[31mthe fog is coming owo~\e[0m" +elif [[ "$weather_desc" == "smoke" || "$weather_desc" == "haze" ]]; then + echo -e "\t\e[31msomebody is gwilling weally hawd today!! expect some smoke~\e[0m" +fi -# Check for strong wind wind_speed_rounded=$(echo "$wind_speed" | awk '{ print int($1) }') -if [ "$wind_speed_rounded" -gt 8 ]; then - echo -e "\tWind is strong. Be careful!" +if [ "$wind_speed_rounded" -gt 8 ] ; then + echo -e "\t\e[36mwind is stwong, be caweful!\e[0m" fi -# Special message for New Year's Eve if [ "$(date +"%d/%m")" == "31/12" ]; then - echo -e "\tHappy New Year!!!" + echo -e "\t\e[35m\e[5mhappy new yeaw!!! >w<\e[0m" fi -# Check for extreme temperatures -temperature_rounded=$(echo "$weather_data" | jq -r '.main.temp' | awk '{ print int($1) }') -if [ "$temperature_rounded" -gt 30 ]; then - echo -e "\tThe weather is really hot today. Make sure you drink enough water!" -elif [ "$temperature_rounded" -lt 15 ]; then - echo -e "\tThe weather is really cold today. Make sure you dress properly!" -elif [ "$temperature_rounded" -lt -20 ]; then - echo -e "\tIt's freezing outside!! Take care and dress properly!" +temperaure_rounded=$(echo "$weather_data" | jq -r '.main.temp' | awk '{ print int($1) }') +if [ "$temperaure_rounded" -gt 30 ] ; then + echo -e "\t\e[31mthe weathew is weally hot today, make suwe u dwink enough watew!\e[0m" +elif [ "$temperaure_rounded" -lt 15 ] ; then + echo -e "\t\e[34mthe weathew is weally cowd today, make suwe u dwess pwopewwy!\e[0m" +elif [ "$temperaure_rounded" -lt -20 ] ; then + echo -e "\t\e[37mit's fucking fweezing outside!! take cawe and dwess pwopewly!!! TwT\e[0m" fi -echo -e "$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' =)" - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# End # +echo -e "\e[32m$(printf '%*s\n' "${COLUMNS:-$(stty size 2>/dev/null | cut -d' ' -f2)}" '' | tr ' ' =)\e[0m"