Merge pull request #6 from getninjaN/master

Format sunrise and sunset
eoin-barr · Dec 7, 2022 · 7973b36 · 7973b36
2 parents 602eb9b + bac4ee9
commit 7973b36
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -13,6 +13,7 @@ import (
 	"strconv"
 	"strings"
 	"math"
+	"time"
 
 	"github.com/eoin-barr/weatherme/types"
 	// "github.com/joho/godotenv"
@@ -67,6 +68,10 @@ func formatAll(result types.WeatherRes, city string) string {
 	tempMax := result.Main.Temp_max - 273.15
 
 	dewPoint := calculateDewPoint(temp, float64(result.Main.Humidity))
+
+	timeOffset := time.Duration(result.Timezone * int(time.Second))
+	sunriseTime := time.UnixMilli(int64(result.Sys.Sunrise) * 1000).Add(timeOffset).UTC()
+	sunsetTime := time.UnixMilli(int64(result.Sys.Sunset) * 1000).Add(timeOffset).UTC()
 
 	return "\n🌆  City:\t\t" + city + "\n" +
 		"🌍  Country:\t\t" + result.Sys.Country + "\n" +
@@ -88,8 +93,8 @@ func formatAll(result types.WeatherRes, city string) string {
 		"🧭  Wind Direction:\t" + strconv.Itoa(result.Wind.Deg) + " °" + "\n" +
 		"🌁  Visibility:\t\t" + strconv.Itoa(result.Visibility) + "\n\n" +
 
-		"🌅  Sunrise:\t\t" + strconv.Itoa(result.Sys.Sunrise) + "\n" +
-		"🌇  Sunset:\t\t" + strconv.Itoa(result.Sys.Sunset) + "\n"
+		"🌅  Sunrise:\t\t" + sunriseTime.Format("15:04") + " (" + sunriseTime.Format(time.Kitchen) + ") UTC\n" +
+		"🌇  Sunset:\t\t" + sunsetTime.Format("15:04") + " (" + sunsetTime.Format(time.Kitchen) + ") UTC\n"
 }
 
 func getWeather(args []string, view string) {