kdeppe
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed weather script to only update every 30 seconds and persist location data to last seen

Browse Source
nvim
Keegan 2 years ago
parent 1840aea989
commit 2e087b18c0
12 changed files with 82 additions and 120 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

@ -2,4 +2,5 @@ tmux/resurrect
tmux/plugins tmux/plugins
!tmux/plugins/tpm !tmux/plugins/tpm
bin/water/waterintake bin/water/waterintake
bin/weather/.env*
*.swp *.swp

3
.gitmodules vendored
Unescape Escape View File

@ -29,3 +29,6 @@
[submodule "tpm"] [submodule "tpm"]
path = tpm path = tpm
url = https://github.com/tmux-plugins/tpm url = https://github.com/tmux-plugins/tpm
[submodule ".priv"]
path = .priv
url = git@github.com:KeeganForelight/private_info.git

1
.priv

@ -0,0 +1 @@
Subproject commit 66fe519826ba9b6870422179c368ea5d3a97e890

4
bin/weather/.location
Unescape Escape View File

@ -0,0 +1,4 @@
STATE=MA
CITY=Cambridge
LAT=42.3737
LON=-71.1284

66
bin/weather/definitions.go
Unescape Escape View File

@ -1,66 +0,0 @@
package main
var USStates = map[string]string{
"New Jersey": "NJ",
"Ohio": "OH",
"Pennsylvania": "PA",
"Vermont": "VT",
"Georgia": "GA",
"Hawaii": "HI",
"New Hampshire": "NH",
"Utah": "UT",
"Oklahoma": "OK",
"South Carolina": "SC",
"South Dakota": "SD",
"Illinois": "IL",
"New York": "NY",
"Armed Forces Europe": "AE",
"Armed Forces Pacific": "AP",
"Connecticut": "CT",
"Kansas": "KS",
"Wisconsin": "WI",
"Tennessee": "TN",
"Palau": "PW",
"California": "CA",
"Louisiana": "LA",
"Michigan": "MI",
"Rhode Island": "RI",
"Armed Forces Americas": "AA",
"Alabama": "AL",
"Arizona": "AZ",
"North Dakota": "ND",
"Colorado": "CO",
"Guam": "GU",
"Virgin Islands": "VI",
"Alaska": "AK",
"Indiana": "IN",
"Iowa": "IA",
"District of Columbia": "DC",
"Marshall Islands": "MH",
"Puerto Rico": "PR",
"Montana": "MT",
"New Mexico": "NM",
"North Carolina": "NC",
"Arkansas": "AR",
"Maryland": "MD",
"Massachusetts": "MA",
"Delaware": "DE",
"Maine": "ME",
"Northern Mariana Islands": "MP",
"West Virginia": "WV",
"Idaho": "ID",
"Mississippi": "MS",
"Washington": "WA",
"Nevada": "NV",
"Oregon": "OR",
"Virginia": "VA",
"Wyoming": "WY",
"Federated States of Micronesia": "FM",
"Kentucky": "KY",
"Minnesota": "MN",
"Nebraska": "NE",
"American Samoa": "AS",
"Florida": "FL",
"Missouri": "MO",
"Texas": "TX",
}

2
bin/weather/go.mod
Unescape Escape View File

@ -1,3 +1,5 @@
module weather module weather
go 1.18 go 1.18
require github.com/joho/godotenv v1.4.0 // indirect

2
bin/weather/go.sum
Unescape Escape View File

@ -0,0 +1,2 @@
github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=

18
bin/weather/location.sh
Unescape Escape View File

@ -1,9 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# sets enviroment variables on login # creates a hidden file of your location details based on your address, will expand to support addition via zip codes
CURRENT_LOCATION=$(curl --silent http://ip-api.com/csv)
CITY=$(echo "$CURRENT_LOCATION" | cut -d , -f 6) if [[ -z $1 ]] ; then
LAT=$(echo "$CURRENT_LOCATION" | cut -d , -f 8) # called without args
LON=$(echo "$CURRENT_LOCATION" | cut -d , -f 9) CURRENT_LOCATION=$(curl --silent http://ip-api.com/csv)
STATE_CODE=$(echo "$CURRENT_LOCATION" | cut -d, -f 4)
CITY=$(echo "$CURRENT_LOCATION" | cut -d , -f 6)
LAT=$(echo "$CURRENT_LOCATION" | cut -d , -f 8)
LON=$(echo "$CURRENT_LOCATION" | cut -d , -f 9)
printf "STATE=%s\nCITY=%s\nLAT=%s\nLON=%s\n" $STATE_CODE $CITY $LAT $LON > "$HOME/.dotfiles/bin/weather/.env.location"
fi
export LAT LON CITY

81
bin/weather/main.go
Unescape Escape View File

@ -1,20 +1,22 @@
package main package main
import ( import (
"bytes"
"encoding/json"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"strconv"
"strings" "strings"
"github.com/joho/godotenv"
) )
type Weather struct { type Weather struct {
Temp float64 Temp float64
Humidity int Humidity int
Icon rune Icon rune
City string City string
State string State string
LastPinged int64
} }
type weathercode rune type weathercode rune
@ -34,52 +36,47 @@ const (
) )
func (w *Weather) String() string { func (w *Weather) String() string {
return fmt.Sprintf(" %c %.1f%c %d%c in %s, %s", w.Icon, w.Temp, DEGREES_F, w.Humidity, HUMIDITY, w.City, USStates[w.State]) // Output as ICON ##.#*F ##% in City, ST where the rune is a degree sign return fmt.Sprintf(" %c %.1f%c %d%c in %s, %s", w.Icon, w.Temp, DEGREES_F, w.Humidity, HUMIDITY, w.City, w.State) // Output as ICON ##.#*F ##% in City, ST where the rune is a degree sign
} }
func main() { func main() {
city := os.Getenv("CITY") // getting weather
if city == "" { if err := exec.Command(os.ExpandEnv("$HOME/.dotfiles/bin/weather/weather.sh")).Run(); err != nil {
fmt.Print("No location found!")
os.Exit(1)
}
city = strings.Trim(city, " \n")
weathercmd := exec.Command("sh", "-c", "${HOME}/.dotfiles/bin/weather/weather.sh")
var out bytes.Buffer
weathercmd.Stdout = &out
if err := weathercmd.Run(); err != nil {
panic(err) panic(err)
} }
// parsing json time :D // get up to date info
var temp map[string]interface{} loc := os.ExpandEnv(fmt.Sprintf("$HOME/.dotfiles/bin/weather/.env.location"))
if err := json.Unmarshal(out.Bytes(), &temp); err != nil { weath := os.ExpandEnv(fmt.Sprintf("$HOME/.dotfiles/bin/weather/.env.weather"))
if err := godotenv.Load(weath, loc); err != nil {
panic(err) panic(err)
} }
// fmting hell
weather := &Weather{City: city} var humidity int
for k, v := range temp { var temp float64
if k == "main" { var err error
// weather info
for nk, nv := range v.(map[string]interface{}) { city := os.Getenv("CITY")
if nk == "temp" { state := os.Getenv("STATE") // fine as strings
weather.Temp = nv.(float64) icon := getIcon(os.Getenv("ICON"))
} else if nk == "humidity" { h := os.Getenv("HUMIDITY")
weather.Humidity = int(nv.(float64)) // this is as gross as it gets t := os.Getenv("TEMP")
} if h != "" {
} hum, err := strconv.ParseInt(h, 10, 64)
} else if k == "name" { if err != nil {
weather.State = v.(string) panic(err)
} else if k == "weather" { }
m := v.([]interface{}) humidity = int(hum)
for nk, nv := range m[0].(map[string]interface{}) { }
if nk == "icon" { if t != "" {
weather.Icon = getIcon(nv.(string)) temp, err = strconv.ParseFloat(t, 64)
} if err != nil {
} panic(err)
} }
} }
weather := &Weather{City: city, State: state, Icon: icon, Humidity: humidity, Temp: temp}
fmt.Print(weather) fmt.Print(weather)
} }
func tod(day bool, dayrune weathercode, nightrune weathercode) rune { func tod(day bool, dayrune weathercode, nightrune weathercode) rune {
if day { if day {
return rune(dayrune) return rune(dayrune)

BIN
bin/weather/weather
View File

Binary file not shown.

22
bin/weather/weather.sh
Unescape Escape View File

@ -1,7 +1,19 @@
#!/bin/bash #!/bin/bash
source "$HOME/.dotfiles/.priv/key"
# if you get my email banned ill freak out source "$HOME/.dotfiles/bin/weather/.env.location"
API_KEY='60844f78595f66ff8e94df50aed24397' source "$HOME/.dotfiles/bin/weather/.env.weather"
# API_KEY=$(cat "$HOME/.dotfiles/bin/weather/.priv/key")
# getting weather # getting weather
WEATHER=$(curl --silent http://api.openweathermap.org/data/2.5/weather\?lat="$LAT"\&lon="$LON"\&appid="$API_KEY"\&units=imperial) CUR_TIMESTAMP=$(date +%s)
echo $WEATHER # only update weather every 30 seconds
if [[ $CUR_TIMESTAMP -gt $EXPIRATION || -z $EXPIRATION ]] ; then
WEATHER=$(curl --silent http://api.openweathermap.org/data/2.5/weather\?lat="$LAT"\&lon="$LON"\&appid="$API_KEY"\&units=imperial)
TEMP=$(echo $WEATHER | jq -r '.main.temp')
HUMIDITY=$(echo $WEATHER | jq -r '.main.humidity')
ICON=$(echo $WEATHER | jq -r '.weather[0].icon')
EXPIRATION=$(($CUR_TIMESTAMP+30))
printf 'TEMP=%s\nHUMIDITY=%s\nICON=%s\nEXPIRATION=%s\n' "$TEMP" "$HUMIDITY" "$ICON" "$EXPIRATION" >"$HOME/.dotfiles/bin/weather/.env.weather"
fi

2
zshrc
Unescape Escape View File

@ -145,4 +145,4 @@ alias nalgene="$HOME/.dotfiles/bin/water/water.sh 32"
alias water="$HOME/.dotfiles/bin/water/water.sh" alias water="$HOME/.dotfiles/bin/water/water.sh"
# setting up location variables # setting up location variables
source "$HOME/.dotfiles/bin/weather/location.sh" # source "$HOME/.dotfiles/bin/weather/location.sh"

Write Preview
Loading…
Cancel
Save