xevion/go-ha
1
0
Fork 0
mirror of https://github.com/Xevion/go-ha.git synced 2025-12-05 23:15:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: update carbon pkg to v2 latest, bump version

Browse Source
This commit is contained in:
Xevion
2025-08-01 21:01:51 -05:00
parent d281d70d8c
commit e13fd6ab5b
12 changed files with 31 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app.go
View File

@@ -9,7 +9,7 @@ import (
"strings"
"time"
"github.com/golang-module/carbon"
"github.com/dromara/carbon/v2"
"github.com/gorilla/websocket"
sunriseLib "github.com/nathan-osman/go-sunrise"
@@ -178,7 +178,7 @@ func (app *App) RegisterSchedules(schedules ...DailySchedule) {
for _, s := range schedules {
// realStartTime already set for sunset/sunrise
if s.isSunrise || s.isSunset {
s.nextRunTime = getNextSunRiseOrSet(app, s.isSunrise, s.sunOffset).Carbon2Time()
s.nextRunTime = getNextSunRiseOrSet(app, s.isSunrise, s.sunOffset).StdTime()
app.schedules.Put()
continue
}
@@ -191,10 +191,10 @@ func (app *App) RegisterSchedules(schedules ...DailySchedule) {
startTime = startTime.AddDay()
}
s.nextRunTime = startTime.Carbon2Time()
s.nextRunTime = startTime.StdTime()
app.schedules.Put(Item{
Value: s,
Priority: float64(startTime.Carbon2Time().Unix()),
Priority: float64(startTime.StdTime().Unix()),
})
}
}
@@ -206,7 +206,7 @@ func (app *App) RegisterIntervals(intervals ...Interval) {
panic(ErrInvalidArgs)
}
i.nextRunTime = internal.ParseTime(string(i.startTime)).Carbon2Time()
i.nextRunTime = internal.ParseTime(string(i.startTime)).StdTime()
now := time.Now()
for i.nextRunTime.Before(now) {
i.nextRunTime = i.nextRunTime.Add(i.frequency)
@@ -250,8 +250,8 @@ func (app *App) RegisterEventListeners(evls ...EventListener) {
}
}
func getSunriseSunset(s *StateImpl, sunrise bool, dateToUse carbon.Carbon, offset ...types.DurationString) carbon.Carbon {
date := dateToUse.Carbon2Time()
func getSunriseSunset(s *StateImpl, sunrise bool, dateToUse *carbon.Carbon, offset ...types.DurationString) *carbon.Carbon {
date := dateToUse.StdTime()
rise, set := sunriseLib.SunriseSunset(s.latitude, s.longitude, date.Year(), date.Month(), date.Day())
rise, set = rise.Local(), set.Local()
@@ -283,7 +283,7 @@ func getSunriseSunset(s *StateImpl, sunrise bool, dateToUse carbon.Carbon, offse
return setOrRiseToday
}
func getNextSunRiseOrSet(a *App, sunrise bool, offset ...types.DurationString) carbon.Carbon {
func getNextSunRiseOrSet(a *App, sunrise bool, offset ...types.DurationString) *carbon.Carbon {
sunriseOrSunset := getSunriseSunset(a.state, sunrise, carbon.Now(), offset...)
if sunriseOrSunset.Lt(carbon.Now()) {
// if we're past today's sunset or sunrise (accounting for offset) then get tomorrows