Merge pull request #9 from esiqveland/redesign

Redesign

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     docker:
       # specify the version
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.13
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -19,4 +19,4 @@ jobs:
       # specify any bash command here prefixed with `run: `
       - run: go get -v -t -d ./...
       - run: cd example; go build -v
-      - run: go test -v ./...
+      - run: go test -v ./...

example/main.go

@@ -3,12 +3,15 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
+	"sync"
 
 	"github.com/esiqveland/notify"
 	"github.com/godbus/dbus/v5"
 )
 
 func main() {
+	wg := &sync.WaitGroup{}
 
 	conn, err := dbus.SessionBus()
 	if err != nil {
@@ -54,8 +57,26 @@ func main() {
 	fmt.Printf("Version: %v\n", info.Version)
 	fmt.Printf("Spec:    %v\n", info.SpecVersion)
 
-	// Notifyer interface with event delivery
-	notifier, err := notify.New(conn)
+	// Listen for actions invoked!
+	onAction := func(action *notify.ActionInvokedSignal) {
+		log.Printf("ActionInvoked: %v Key: %v", action.ID, action.ActionKey)
+		wg.Done()
+	}
+
+	onClosed := func(closer *notify.NotificationClosedSignal) {
+		log.Printf("NotificationClosed: %v Reason: %v", closer.ID, closer.Reason)
+	}
+
+	// Notifier interface with event delivery
+	notifier, err := notify.New(
+		conn,
+		// action event handler
+		notify.WithOnAction(onAction),
+		// closed event handler
+		notify.WithOnClosed(onClosed),
+		// override with custom logger
+		notify.WithLogger(log.New(os.Stdout, "notify: ", log.Flags())),
+	)
 	if err != nil {
 		log.Fatalln(err.Error())
 	}
@@ -67,14 +88,8 @@ func main() {
 	}
 	log.Printf("sent notification id: %v", id)
 
-	// Listen for actions invoked!
-	actions := notifier.ActionInvoked()
-	go func() {
-		action := <-actions
-		log.Printf("ActionInvoked: %v Key: %v", action.ID, action.ActionKey)
-	}()
-
-	closer := <-notifier.NotificationClosed()
-	log.Printf("NotificationClosed: %v Reason: %v", closer.ID, closer.Reason)
+	//outClosed := notifier.NotificationClosed()
 
+	wg.Add(2)
+	wg.Wait()
 }

go.mod

@@ -1,8 +1,5 @@
 module github.com/esiqveland/notify
 
-go 1.12
+go 1.13
 
-require (
-	github.com/godbus/dbus v5.0.1+incompatible
-	github.com/godbus/dbus/v5 v5.0.3
-)
+require github.com/godbus/dbus/v5 v5.0.3

go.sum

@@ -1,5 +1,2 @@
-github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
-github.com/godbus/dbus v5.0.1+incompatible h1:fsDsnr/6MFSIm3kl6JJpq5pH+vO/rA5jUunalLnzSc8=
-github.com/godbus/dbus v5.0.1+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=