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

refactor: move 'parse' back to internal root

Browse Source
This commit is contained in:
Xevion
2025-08-01 18:18:16 -05:00
parent 26b8892ff6
commit d51f6d5946
7 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
checkers.go
View File

@@ -4,7 +4,6 @@ import (
"time"
"github.com/Xevion/go-ha/internal"
"github.com/Xevion/go-ha/internal/parse"
"github.com/Xevion/go-ha/types"
"github.com/golang-module/carbon"
)
@@ -18,8 +17,8 @@ func CheckWithinTimeRange(startTime, endTime string) ConditionCheck {
// if betweenStart and betweenEnd both set, first account for midnight
// overlap, then check if between those times.
if startTime != "" && endTime != "" {
parsedStart := parse.ParseTime(startTime)
parsedEnd := parse.ParseTime(endTime)
parsedStart := internal.ParseTime(startTime)
parsedEnd := internal.ParseTime(endTime)
// check for midnight overlap
if parsedEnd.Lt(parsedStart) { // example turn on night lights when motion from 23:00 to 07:00
@@ -36,9 +35,9 @@ func CheckWithinTimeRange(startTime, endTime string) ConditionCheck {
}
// otherwise just check individual before/after
} else if startTime != "" && parse.ParseTime(startTime).IsFuture() {
} else if startTime != "" && internal.ParseTime(startTime).IsFuture() {
cc.fail = true
} else if endTime != "" && parse.ParseTime(endTime).IsPast() {
} else if endTime != "" && internal.ParseTime(endTime).IsPast() {
cc.fail = true
}
return cc
@@ -170,7 +169,7 @@ func CheckStartEndTime(s types.TimeString, isStart bool) ConditionCheck {
}
now := time.Now()
parsedTime := parse.ParseTime(string(s)).Carbon2Time()
parsedTime := internal.ParseTime(string(s)).Carbon2Time()
if isStart {
if parsedTime.After(now) {
cc.fail = true