Skip to content

Commit ec6159c

Browse files
authored
Merge pull request #5 from coquer/main
chore: modify flags input and handle exceptions
2 parents d2b555d + 2c34d12 commit ec6159c

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

cmd/hyprnotify/main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package main
22

33
import (
4+
"flag"
45
"github.com/codelif/hyprnotify/internal"
5-
"os"
66
)
77

88
func main() {
9-
var enable_sound bool = true
9+
var enableSound bool
10+
const message = "Disable sound"
1011

11-
for _, arg := range os.Args[1:] {
12-
if arg == "--no-sound" || arg == "--silent" || arg == "-s" {
13-
enable_sound = false
14-
break
15-
}
16-
}
12+
flag.BoolVar(&enableSound, "no-sound", false, message)
13+
flag.BoolVar(&enableSound, "silent", false, message)
14+
flag.BoolVar(&enableSound, "s", false, message)
1715

18-
internal.InitDBus(enable_sound)
16+
flag.Parse()
17+
18+
internal.InitDBus(enableSound)
1919
}

internal/audio.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package internal
22

33
import (
4+
"embed"
45
"time"
5-
"embed"
66

77
"github.com/gopxl/beep"
88
"github.com/gopxl/beep/speaker"
@@ -21,7 +21,12 @@ func PlayAudio() {
2121
if err != nil {
2222
panic(err)
2323
}
24-
defer streamer.Close()
24+
defer func(streamer beep.StreamSeekCloser) {
25+
err := streamer.Close()
26+
if err != nil {
27+
panic(err)
28+
}
29+
}(streamer)
2530
speaker.Play(streamer)
2631
for streamer.Len() != streamer.Position() {
2732
time.Sleep(time.Second)
@@ -30,6 +35,10 @@ func PlayAudio() {
3035

3136
func InitSpeaker() {
3237
var sr beep.SampleRate = 44100
33-
speaker.Init(sr, sr.N(time.Second/10))
38+
err := speaker.Init(sr, sr.N(time.Second/10))
39+
40+
if err != nil {
41+
return
42+
}
3443

3544
}

0 commit comments

Comments
 (0)