refactor: make fork independent, rename PriorityQueue

This commit is contained in:
2025-07-31 15:57:53 -05:00
parent f01f8dd602
commit 1226867b8e
42 changed files with 74 additions and 67 deletions

View File

@@ -11,7 +11,7 @@ Gome-Assistant is a new library, and I'm opening it up early to get some user fe
### Installation
```
go get saml.dev/gome-assistant
go get github.com/Xevion/gome-assistant
```
### Generate Entity Constants
@@ -37,7 +37,7 @@ exclude_domains: ["device_tracker", "person"]
2. Add a `//go:generate` comment in your project:
```go
//go:generate go run saml.dev/gome-assistant/cmd/generate
//go:generate go run github.com/Xevion/gome-assistant/cmd/generate
```
Optionally use the `-config` flag to customize the file path of the config file.
@@ -87,7 +87,7 @@ The general flow is
3. Start app
```go
import ga "saml.dev/gome-assistant"
import ga "github.com/Xevion/gome-assistant"
// replace with IP and port of your Home Assistant installation
app, err := ga.NewApp(ga.NewAppRequest{
@@ -107,7 +107,7 @@ app.RegisterIntervals(...)
app.Start()
```
A full reference is available on [pkg.go.dev](https://pkg.go.dev/saml.dev/gome-assistant), but all you need to know to get started are the four types of automations in gome-assistant.
A full reference is available on [pkg.go.dev](https://pkg.go.dev/github.com/Xevion/gome-assistant), but all you need to know to get started are the four types of automations in gome-assistant.
- [Daily Schedules](#daily-schedule)
- [Entity Listeners](#entity-listener)
@@ -206,7 +206,7 @@ app.RegisterEventListeners(eventListener)
Event listeners have other functions to change the behavior.
| Function | Info |
| --------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
| --------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
| OnlyBetween("03:00", "14:00") | Only run your function between two specified times of day |
| OnlyAfter("03:00") | Only run your function after a specified time of day |
| OnlyBefore("03:00") | Only run your function before a specified time of day |
@@ -215,6 +215,7 @@ Event listeners have other functions to change the behavior.
| ExceptionRange(time.Time, time.Time) | A one time exception between the two date/times. Both date and time are considered. Functions like a "blocklist" |
The callback function receives three parameters:
```go
func myCallback(service *ga.Service, state ga.State, data ga.EventData) {
// You can unmarshal the raw JSON into a type-safe struct

8
app.go
View File

@@ -13,10 +13,10 @@ import (
"github.com/gorilla/websocket"
sunriseLib "github.com/nathan-osman/go-sunrise"
"saml.dev/gome-assistant/internal"
"saml.dev/gome-assistant/internal/http"
pq "saml.dev/gome-assistant/internal/priorityqueue"
ws "saml.dev/gome-assistant/internal/websocket"
"github.com/Xevion/gome-assistant/internal"
"github.com/Xevion/gome-assistant/internal/http"
pq "github.com/Xevion/gome-assistant/internal/priority_queue"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
var ErrInvalidArgs = errors.New("invalid arguments provided")

View File

@@ -3,8 +3,8 @@ package gomeassistant
import (
"time"
"github.com/Xevion/gome-assistant/internal"
"github.com/golang-module/carbon"
"saml.dev/gome-assistant/internal"
)
type conditionCheck struct {

View File

@@ -4,8 +4,8 @@ import (
"errors"
"testing"
"github.com/Xevion/gome-assistant/internal"
"github.com/stretchr/testify/assert"
"saml.dev/gome-assistant/internal"
)
type MockState struct {

View File

@@ -9,8 +9,8 @@ import (
"strings"
"text/template"
ga "github.com/Xevion/gome-assistant"
"gopkg.in/yaml.v3"
ga "saml.dev/gome-assistant"
)
type Config struct {

View File

@@ -7,7 +7,7 @@ import (
"github.com/golang-module/carbon"
"saml.dev/gome-assistant/internal"
"github.com/Xevion/gome-assistant/internal"
)
type EntityListener struct {

View File

@@ -7,8 +7,8 @@ import (
"github.com/golang-module/carbon"
"saml.dev/gome-assistant/internal"
ws "saml.dev/gome-assistant/internal/websocket"
"github.com/Xevion/gome-assistant/internal"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
type EventListener struct {

View File

@@ -8,10 +8,10 @@ import (
// "example/entities" // Optional import generated entities
ga "saml.dev/gome-assistant"
ga "github.com/Xevion/gome-assistant"
)
//go:generate go run saml.dev/gome-assistant/cmd/generate
//go:generate go run github.com/Xevion/gome-assistant/cmd/generate
func main() {
app, err := ga.NewApp(ga.NewAppRequest{
@@ -24,7 +24,13 @@ func main() {
os.Exit(1)
}
defer app.Cleanup()
defer func() {
slog.Info("Shutting down application...")
if err := app.Close(); err != nil {
slog.Error("Error during shutdown", "error", err)
}
slog.Info("Application shutdown complete")
}()
pantryDoor := ga.
NewEntityListener().

View File

@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/suite"
"gopkg.in/yaml.v3"
ga "saml.dev/gome-assistant"
ga "github.com/Xevion/gome-assistant"
)
type (

View File

@@ -6,7 +6,7 @@ require (
github.com/golang-cz/devslog v0.0.8
github.com/stretchr/testify v1.8.4
gopkg.in/yaml.v3 v3.0.1
saml.dev/gome-assistant v0.2.0
github.com/Xevion/gome-assistant v0.2.0
)
require (

View File

@@ -96,5 +96,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
saml.dev/gome-assistant v0.2.0 h1:Clo5DrziTdsYydVUTQfroeBVmToMnNHoObr+k6HhbMY=
saml.dev/gome-assistant v0.2.0/go.mod h1:jsZUtnxANCP0zB2B7iyy4j7sZohMGop8g+5EB2MER3o=
github.com/Xevion/gome-assistant v0.2.0 h1:Clo5DrziTdsYydVUTQfroeBVmToMnNHoObr+k6HhbMY=
github.com/Xevion/gome-assistant v0.2.0/go.mod h1:jsZUtnxANCP0zB2B7iyy4j7sZohMGop8g+5EB2MER3o=

2
go.mod
View File

@@ -1,4 +1,4 @@
module saml.dev/gome-assistant
module github.com/Xevion/gome-assistant
go 1.21

View File

@@ -1,4 +1,4 @@
package priorityqueue
package priority_queue
import (
"container/heap"

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,8 +1,8 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
"saml.dev/gome-assistant/types"
ws "github.com/Xevion/gome-assistant/internal/websocket"
"github.com/Xevion/gome-assistant/types"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,8 +1,8 @@
package services
import (
"saml.dev/gome-assistant/internal"
ws "saml.dev/gome-assistant/internal/websocket"
"github.com/Xevion/gome-assistant/internal"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
type Event struct {

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
type HomeAssistant struct {

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -4,7 +4,7 @@ import (
"fmt"
"time"
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,8 +1,8 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
"saml.dev/gome-assistant/types"
ws "github.com/Xevion/gome-assistant/internal/websocket"
"github.com/Xevion/gome-assistant/types"
)
type Notify struct {

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
type Number struct {

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,8 +1,8 @@
package services
import (
"saml.dev/gome-assistant/internal"
ws "saml.dev/gome-assistant/internal/websocket"
"github.com/Xevion/gome-assistant/internal"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
func BuildService[

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -1,7 +1,7 @@
package services
import (
ws "saml.dev/gome-assistant/internal/websocket"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
/* Structs */

View File

@@ -16,7 +16,7 @@ import (
"github.com/gorilla/websocket"
i "saml.dev/gome-assistant/internal"
i "github.com/Xevion/gome-assistant/internal"
)
var ErrInvalidToken = errors.New("invalid authentication token")

View File

@@ -5,7 +5,7 @@ import (
"log/slog"
"time"
"saml.dev/gome-assistant/internal"
"github.com/Xevion/gome-assistant/internal"
)
type IntervalCallback func(*Service, State)

View File

@@ -5,8 +5,8 @@ import (
"log/slog"
"time"
"github.com/Xevion/gome-assistant/internal"
"github.com/golang-module/carbon"
"saml.dev/gome-assistant/internal"
)
type ScheduleCallback func(*Service, State)

View File

@@ -1,8 +1,8 @@
package gomeassistant
import (
"saml.dev/gome-assistant/internal/services"
ws "saml.dev/gome-assistant/internal/websocket"
"github.com/Xevion/gome-assistant/internal/services"
ws "github.com/Xevion/gome-assistant/internal/websocket"
)
type Service struct {

View File

@@ -8,7 +8,7 @@ import (
"github.com/golang-module/carbon"
"saml.dev/gome-assistant/internal/http"
"github.com/Xevion/gome-assistant/internal/http"
)
type State interface {