This commit is contained in:
Mats Tornberg
2025-11-22 17:42:05 +01:00
parent 87660c7d1d
commit 57ba34b929
8 changed files with 25 additions and 17 deletions

View File

@@ -1,6 +1,6 @@
.PHONY: build run run-bash .PHONY: build run run-bash
IMAGE_NAME := go-telldus-matter IMAGE_NAME := matst80/go-telldus
build: build:
docker build -t $(IMAGE_NAME) . docker build -t $(IMAGE_NAME) .
@@ -9,4 +9,7 @@ run:
docker run --rm --privileged -p 8081:8080 -v /dev/bus/usb:/dev/bus/usb -v $(PWD)/tellstick.conf:/etc/tellstick.conf -v $(PWD)/db:/go/src/app/db -e MQTT_URL=10.10.3.12:1883 -e MQTT_USER=telldus-dev -e MQTT_PASSWORD= $(IMAGE_NAME) docker run --rm --privileged -p 8081:8080 -v /dev/bus/usb:/dev/bus/usb -v $(PWD)/tellstick.conf:/etc/tellstick.conf -v $(PWD)/db:/go/src/app/db -e MQTT_URL=10.10.3.12:1883 -e MQTT_USER=telldus-dev -e MQTT_PASSWORD= $(IMAGE_NAME)
run-bash: run-bash:
docker run --rm -it --privileged -p 8081:8080 -v /dev/bus/usb:/dev/bus/usb -v $(PWD)/tellstick.conf:/etc/tellstick.conf -v $(PWD)/db:/go/src/app/db --entrypoint /bin/bash $(IMAGE_NAME) docker run --rm -it --privileged -p 8081:8080 -v /dev/bus/usb:/dev/bus/usb -v $(PWD)/tellstick.conf:/etc/tellstick.conf -v $(PWD)/db:/go/src/app/db --entrypoint /bin/bash $(IMAGE_NAME)
push: build
docker push $(IMAGE_NAME)

Binary file not shown.

11
main.go
View File

@@ -1,17 +1,18 @@
package main package main
import ( import (
"app/pkg/datastore"
"app/pkg/devices"
"app/pkg/mqtt"
"app/pkg/telldus"
daemon "app/pkg/telldus-daemon"
"encoding/json" "encoding/json"
"log" "log"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
"strconv" "strconv"
"git.k7n.net/mats/go-telldus/pkg/datastore"
"git.k7n.net/mats/go-telldus/pkg/devices"
"git.k7n.net/mats/go-telldus/pkg/mqtt"
"git.k7n.net/mats/go-telldus/pkg/telldus"
daemon "git.k7n.net/mats/go-telldus/pkg/telldus-daemon"
) )
const ( const (

View File

@@ -1,15 +1,16 @@
package devices package devices
import ( import (
"app/pkg/datastore"
"app/pkg/mqtt"
"app/pkg/telldus"
"fmt" "fmt"
"log" "log"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
"git.k7n.net/mats/go-telldus/pkg/datastore"
"git.k7n.net/mats/go-telldus/pkg/mqtt"
"git.k7n.net/mats/go-telldus/pkg/telldus"
) )
// EventManager handles telldus events and callbacks // EventManager handles telldus events and callbacks

View File

@@ -1,10 +1,11 @@
package devices package devices
import ( import (
"app/pkg/datastore"
"app/pkg/telldus"
"fmt" "fmt"
"log" "log"
"git.k7n.net/mats/go-telldus/pkg/datastore"
"git.k7n.net/mats/go-telldus/pkg/telldus"
) )
// Syncer handles synchronization of devices and sensors to the database // Syncer handles synchronization of devices and sensors to the database

View File

@@ -1,10 +1,11 @@
package mqtt package mqtt
import ( import (
"app/pkg/datastore"
"app/pkg/telldus"
"fmt" "fmt"
"log" "log"
"git.k7n.net/mats/go-telldus/pkg/datastore"
"git.k7n.net/mats/go-telldus/pkg/telldus"
) )
// DeviceDiscovery represents Home Assistant device discovery payload // DeviceDiscovery represents Home Assistant device discovery payload

View File

@@ -1,10 +1,11 @@
package mqtt package mqtt
import ( import (
"app/pkg/datastore"
"app/pkg/telldus"
"fmt" "fmt"
"git.k7n.net/mats/go-telldus/pkg/datastore"
"git.k7n.net/mats/go-telldus/pkg/telldus"
mqtt "github.com/eclipse/paho.mqtt.golang" mqtt "github.com/eclipse/paho.mqtt.golang"
) )

View File

@@ -9,7 +9,7 @@ import (
"syscall" "syscall"
"time" "time"
"app/pkg/telldus" "git.k7n.net/mats/go-telldus/pkg/telldus"
) )
// Manager handles the telldusd daemon lifecycle // Manager handles the telldusd daemon lifecycle