Merge pull request #40 from piqoni/sunrise

Display Sunrise and Sunset times for configurable sunrise_sunset (bool)

README.md

@@ -60,6 +60,7 @@ opml_file_path:
 markdown_file_prefix:
 markdown_file_suffix:
 reading_time: false
+sunrise_sunset: false
 openai_api_key:
 openai_base_url:
 openai_model:

config.go

@@ -31,6 +31,7 @@ opml_file_path:
 markdown_file_prefix:
 markdown_file_suffix:
 reading_time: false
+sunrise_sunset: false
 openai_api_key:
 openai_base_url:
 openai_model:
@@ -175,6 +176,7 @@ func bootstrapConfig() {
 	instapaper = viper.GetBool("instapaper")
 	reading_time = viper.GetBool("reading_time")
 	show_images = viper.GetBool("show_images")
+	sunrise_sunset = viper.GetBool("sunrise_sunset")
 
 	// Overwrite terminal_mode from config file only if its not set through -t flag
 	if !terminalMode {

feeds_writer.go

@@ -25,6 +25,7 @@ var openaiBaseURL string
 var openaiModel string
 var reading_time bool
 var show_images bool
+var sunrise_sunset bool
 var myFeeds []RSS
 var db *sql.DB
 

go.mod

@@ -4,6 +4,7 @@ go 1.18
 
 require (
 	github.com/mmcdole/gofeed v1.1.3
+	github.com/nathan-osman/go-sunrise v1.1.0
 	github.com/sashabaranov/go-openai v1.14.2
 	github.com/spf13/viper v1.16.0
 	modernc.org/sqlite v1.20.0
@@ -16,7 +17,7 @@ require (
 )
 
 require (
-	github.com/PuerkitoBio/goquery v1.5.1 // indirect
+	github.com/PuerkitoBio/goquery v1.5.1
 	github.com/andybalholm/cascadia v1.2.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-shiori/go-readability v0.0.0-20220215145315-dd6828d2f09b
@@ -31,7 +32,6 @@ require (
 	github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/savioxavier/termlink v1.2.1
@@ -46,9 +46,7 @@ require (
 	golang.org/x/term v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/tools v0.6.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect

main.go

@@ -11,6 +11,7 @@ func main() {
 	fp := gofeed.NewParser()
 	writer := getWriter()
 	displayWeather(writer)
+	displaySunriseSunset(writer)
 
 	for _, feed := range myFeeds {
 		parsedFeed := parseFeed(fp, feed.url, feed.limit)

weather.go

@@ -7,6 +7,8 @@ import (
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/nathan-osman/go-sunrise"
 )
 
 type UserAgentTransport struct {
@@ -25,6 +27,16 @@ func displayWeather(w Writer) {
 	}
 }
 
+func displaySunriseSunset(w Writer) {
+	if sunrise_sunset && lat != 0 && lon != 0 {
+		rise, set := sunrise.SunriseSunset(
+			lat, lon,
+			time.Now().Year(), time.Now().Month(), time.Now().Day(),
+		)
+		w.write(fmt.Sprintf("🌅 %s 🌇 %s", rise.Local().Format("15:04"), set.Local().Format("15:04")))
+	}
+}
+
 func getWeather(lat, lon float64) string {
 	client := &http.Client{
 		Transport: &UserAgentTransport{http.DefaultTransport},
@@ -46,7 +58,7 @@ func getWeather(lat, lon float64) string {
 	var temperature float64 = res.Properties.Timeseries[0].Data.Instant.Details.AirTemperature
 	var next_12_hours string = res.Properties.Timeseries[0].Data.Next12Hours.Summary.SymbolCode
 	var weatherEmoji string = determineWeatherEmoji(next_12_hours)
-	return fmt.Sprintf("# %d°C %s ️\n", int(temperature+0.5), weatherEmoji)
+	return fmt.Sprintf("# %d°C %s ️", int(temperature+0.5), weatherEmoji)
 
 }