fix
This commit is contained in:
parent
d21e975479
commit
f5725a6cd2
1 changed files with 32 additions and 41 deletions
|
@ -4,29 +4,8 @@
|
||||||
|
|
||||||
secs=600 # Download a new doppler radar if one hasn't been downloaded in $secs seconds.
|
secs=600 # Download a new doppler radar if one hasn't been downloaded in $secs seconds.
|
||||||
radarloc="${XDG_CACHE_HOME:-$HOME/.cache}/radar"
|
radarloc="${XDG_CACHE_HOME:-$HOME/.cache}/radar"
|
||||||
radarger="${XDG_CACHE_HOME:-$HOME/.cache}/radarger"
|
|
||||||
doppler="${XDG_CACHE_HOME:-$HOME/.cache}/doppler.gif"
|
doppler="${XDG_CACHE_HOME:-$HOME/.cache}/doppler.gif"
|
||||||
|
|
||||||
pickger() { chosenger="$(echo "BAW: Baden-Württemberg
|
|
||||||
BAY: Bavaria
|
|
||||||
BBB: Berlin
|
|
||||||
BBB: Brandenburg
|
|
||||||
HES: Hesse
|
|
||||||
MVP: Mecklenburg-Western Pomerania
|
|
||||||
NIB: Lower Saxony
|
|
||||||
NIB: Bremen
|
|
||||||
NRW: North Rhine-Westphalia
|
|
||||||
RPS: Rhineland-Palatinate
|
|
||||||
RPS: Saarland
|
|
||||||
SAC: Saxony
|
|
||||||
SAA: Saxony-Anhalt
|
|
||||||
SHH: Schleswig-Holstein
|
|
||||||
SHH: Hamburg
|
|
||||||
THU: Thuringia" | dmenu -r -i -l 50 -p "Select a radar to use as default:" | sed "s/:.*//" | tr "[:upper:]" "[:lower:]")"
|
|
||||||
|
|
||||||
# Secondary sanity check of selection and ensure user did not escape for Germany.
|
|
||||||
echo "$chosenger" | grep -q "[a-z]" && echo "$chosenger" > "$radarger" ;}
|
|
||||||
|
|
||||||
pickloc() { chosen="$(echo "US: Northeast
|
pickloc() { chosen="$(echo "US: Northeast
|
||||||
US: Southeast
|
US: Southeast
|
||||||
US: PacNorthWest
|
US: PacNorthWest
|
||||||
|
@ -243,34 +222,46 @@ AF: TZ: Tanzania
|
||||||
AF: TN: Tunisia
|
AF: TN: Tunisia
|
||||||
AF: ZM: Zambia
|
AF: ZM: Zambia
|
||||||
AF: KE: Kenya
|
AF: KE: Kenya
|
||||||
AF: AO: Angola" | dmenu -r -i -l 50 -p "Select a radar to use as default:" | tr "[:lower:]" "[:upper:]")"
|
AF: AO: Angola
|
||||||
|
DE: BAW: Baden-Württemberg
|
||||||
|
DE: BAY: Bavaria
|
||||||
|
DE: BBB: Berlin
|
||||||
|
DE: BBB: Brandenburg
|
||||||
|
DE: HES: Hesse
|
||||||
|
DE: MVP: Mecklenburg-Western Pomerania
|
||||||
|
DE: NIB: Lower Saxony
|
||||||
|
DE: NIB: Bremen
|
||||||
|
DE: NRW: North Rhine-Westphalia
|
||||||
|
DE: RPS: Rhineland-Palatinate
|
||||||
|
DE: RPS: Saarland
|
||||||
|
DE: SAC: Saxony
|
||||||
|
DE: SAA: Saxony-Anhalt
|
||||||
|
DE: SHH: Schleswig-Holstein
|
||||||
|
DE: SHH: Hamburg
|
||||||
|
DE: THU: Thuringia" | dmenu -r -i -l 50 -p "Select a radar to use as default:" | tr "[:lower:]" "[:upper:]")"
|
||||||
|
|
||||||
# Set continent code and radar code.
|
# Set continent code and radar code.
|
||||||
continentcode=$(echo "$chosen" | sed "s/:.*//")
|
continentcode=$(echo "$chosen" | sed "s/:.*//")
|
||||||
radarcode=$(echo "$chosen" | sed "s/..: // ; s/:.*//")
|
radarcode=$(echo "$chosen" | sed "s/..: // ; s/:.*//")
|
||||||
|
|
||||||
# Sanity check of selection and ensure user did not escape.
|
# Sanity check of selection and ensure user did not escape.
|
||||||
echo "$radarcode" | grep -q "^[A-Z]\+$" && printf "%s,%s\\n" "$continentcode" "$radarcode" > "$radarloc"
|
echo "$radarcode" | grep -q "^[A-Z]\+$" && printf "%s,%s\\n" "$continentcode" "$radarcode" > "$radarloc" ;}
|
||||||
|
|
||||||
# Prompts for choosing region if in Germany.
|
getdoppler() {
|
||||||
case $(cut -c 4- "$radarloc") in
|
cont="$(sed "s/,.*//" "$radarloc")"
|
||||||
DE) pickger ;;
|
|
||||||
*) ;;
|
|
||||||
esac ;}
|
|
||||||
|
|
||||||
getdoppler() { cont="$(sed "s/,.*//" "$radarloc")"
|
|
||||||
loc="$(cut -c 4- "$radarloc")"
|
loc="$(cut -c 4- "$radarloc")"
|
||||||
notify-send "🌦️ Doppler RADAR" "Pulling most recent Doppler RADAR for $loc"
|
notify-send "🌦️ Doppler RADAR" "Pulling most recent Doppler RADAR for $loc."
|
||||||
case $cont in
|
if [ "$cont" = "US" ] ; then
|
||||||
US) curl -sL "https://radar.weather.gov/ridge/lite/${loc}_loop.gif" > "$doppler" ;;
|
curl -sL "https://radar.weather.gov/ridge/lite/${loc}_loop.gif" > "$doppler" ;
|
||||||
EU) case $loc in
|
elif [ "$cont" = "EU" ] ; then
|
||||||
DE) [ ! -f "$radarger" ] && pickger
|
curl -sL "https://api.sat24.com/animated/${loc}/rainTMC/2/" > "$doppler" ;
|
||||||
ger="$(cat "$radarger")"
|
elif [ "$cont" = "AF" ] ; then
|
||||||
curl -sL "https://www.dwd.de/DWD/wetter/radar/radfilm_${ger}_akt.gif" > "$doppler" ;;
|
curl -sL "https://api.sat24.com/animated/${loc}/rain/2/" > "$doppler" ;
|
||||||
*) curl -sL "https://api.sat24.com/animated/${loc}/rainTMC/2/" > "$doppler" ;;
|
elif [ "$cont" = "DE" ] ; then
|
||||||
esac ;;
|
loc="$(echo "$loc" | tr "[:upper:]" "[:lower:]")"
|
||||||
AF) curl -sL "https://api.sat24.com/animated/${loc}/rain/2/" > "$doppler" ;;
|
curl -sL "https://www.dwd.de/DWD/wetter/radar/radfilm_${loc}_akt.gif" > "$doppler" ;
|
||||||
esac ;}
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
showdoppler() { setsid -f mpv --no-osc --loop=inf --no-terminal "$doppler" ;}
|
showdoppler() { setsid -f mpv --no-osc --loop=inf --no-terminal "$doppler" ;}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue