Audio notification tone fix

makivlach · Oct 29, 2018 · 07ac284 · 07ac284
1 parent 50c9578
commit 07ac284
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 44 deletions.
diff --git a/assets/notify.mp3 b/assets/notify.mp3
diff --git a/assets/notify.wav b/assets/notify.wav
diff --git a/cmd/jira-notificator-gui/main.go b/cmd/jira-notificator-gui/main.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	notificationSound = "assets/notify.mp3"
+	notificationSound = "assets/notify.wav"
 	icon              = "assets/icon.ico"
 	interval          = 15
 )
@@ -54,6 +54,11 @@ func makeBasicControlsPage() ui.Control {
 
 	button := ui.NewButton("Přihlásit se")
 	button.OnClicked(func(*ui.Button) {
+		if host.Text() == "" || username.Text() == "" || password.Text() == "" {
+			ui.MsgBoxError(mainwin, "Chyba", "Vyplňte všechny údaje")
+			return
+		}
+
 		host.Disable()
 		username.Disable()
 		password.Disable()
@@ -64,6 +69,10 @@ func makeBasicControlsPage() ui.Control {
 			if err != nil {
 				ui.QueueMain(func() {
 					ui.MsgBoxError(window, "Chyba", err.Error())
+					host.Enable()
+					username.Enable()
+					password.Enable()
+					button.Enable()
 				})
 				return
 			}
@@ -72,6 +81,10 @@ func makeBasicControlsPage() ui.Control {
 			if err != nil {
 				ui.QueueMain(func() {
 					ui.MsgBoxError(window, "Chyba", err.Error())
+					host.Enable()
+					username.Enable()
+					password.Enable()
+					button.Enable()
 				})
 				return
 			}
@@ -83,6 +96,10 @@ func makeBasicControlsPage() ui.Control {
 			if err != nil {
 				ui.QueueMain(func() {
 					ui.MsgBoxError(window, "Chyba", err.Error())
+					host.Enable()
+					username.Enable()
+					password.Enable()
+					button.Enable()
 				})
 				return
 			}

diff --git a/pkg/jira/audio.go b/pkg/jira/audio.go
diff --git a/pkg/jira/notification.go b/pkg/jira/notification.go
@@ -2,6 +2,8 @@ package jira
 
 import (
 	"github.com/gen2brain/beeep"
+	"github.com/hajimehoshi/oto"
+	"github.com/pkg/errors"
 	"log"
 	"time"
 )
@@ -33,14 +35,14 @@ func FetchNewNotifications(c Client, data NotificationData) error {
 	channel := make(chan []Notification)
 	finished := make(chan bool)
 
-	player, err := NewPlayer(data.Sound)
+	player, err := oto.NewPlayer(44100, 2, 2, 40000)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "Chyba při inicializaci zvukového zařízení")
 	}
 
 	worker, err := NewWorker(c, channel, finished)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "Chyba navázání připojení na data notifikací")
 	}
 
 	notificator := &notificator{beeep.Alert}
@@ -51,16 +53,17 @@ func FetchNewNotifications(c Client, data NotificationData) error {
 		case notifications := <-channel:
 			log.Println(data.Text)
 
-			if err := player.Play(); err != nil {
-				return err
+			_, err := player.Write(data.Sound)
+			if err != nil {
+				return errors.Wrap(err, "Chyba při přehrávání tónu notifikace")
 			}
 
-			err := notificator.notify(notifications)
+			err = notificator.notify(notifications)
 			if err != nil {
-				return err
+				return errors.Wrap(err, "Chyba při vytváření notifikace")
 			}
 		case <-finished:
-			return worker.e
+			return errors.Wrap(worker.e, "Chyba při provádění aktualizace dat")
 		}
 	}
 }