Skip to content

Commit 4461245

Browse files
aklinkertaklinkert
committed
Fix linter issues
1 parent 3e9b437 commit 4461245

File tree

11 files changed

+48
-34
lines changed

11 files changed

+48
-34
lines changed

‎cmd/audio/dump_input.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package audio
55

66
import (
77
"fmt"
8+
"log"
89
"os"
910

1011
"os/signal"
@@ -29,16 +30,24 @@ var DumpInputCmd = &cobra.Command{
2930
if err != nil {
3031
panic(err)
3132
}
32-
defer s.Close()
33+
defer func() {
34+
if err := s.Close(); err != nil {
35+
log.Fatal(err)
36+
}
37+
}()
3338

3439
if err := s.Start(); err != nil {
3540
panic(err)
3641
}
37-
defer s.Stop()
42+
defer func() {
43+
if err := s.Stop(); err != nil {
44+
log.Fatal(err)
45+
}
46+
}()
3847

3948
var frame int64
4049
c := make(chan os.Signal, 1)
41-
signal.Notify(c, os.Interrupt, os.Kill)
50+
signal.Notify(c, os.Interrupt, os.Interrupt)
4251

4352
fmt.Println("Started listener, dumping input.")
4453

‎cmd/audio/sine.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package audio
55

66
import (
7+
"log"
78
"math"
89
"time"
910

@@ -23,12 +24,20 @@ var SineCmd = &cobra.Command{
2324
Long: ``,
2425
Run: func(cmd *cobra.Command, args []string) {
2526
s := newStereoSine(float64(frequency), sampleRate)
26-
defer s.Close()
27+
defer func() {
28+
if err := s.Close(); err != nil {
29+
log.Fatal(err)
30+
}
31+
}()
2732

2833
if err := s.Start(); err != nil {
2934
panic(err)
3035
}
31-
defer s.Stop()
36+
defer func() {
37+
if err := s.Stop(); err != nil {
38+
log.Fatal(err)
39+
}
40+
}()
3241

3342
time.Sleep(time.Duration(length) * time.Millisecond)
3443
},

‎cmd/midi/devices.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package midi
55

66
import (
77
"fmt"
8+
"log"
89
"os"
910

1011
"github.com/rakyll/portmidi"
@@ -21,7 +22,11 @@ var MidiDeviceCmd = &cobra.Command{
2122
fmt.Println(err)
2223
os.Exit(1)
2324
}
24-
defer portmidi.Terminate()
25+
defer func() {
26+
if err := portmidi.Terminate(); err != nil {
27+
log.Fatal(err)
28+
}
29+
}()
2530

2631
num := portmidi.CountDevices()
2732
fmt.Printf("Found %d devices. \n", num)

‎cmd/midi/dump.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package midi
55

66
import (
77
"fmt"
8+
"log"
89
"os"
910
"strconv"
1011

@@ -26,7 +27,11 @@ var MidiDumpCmd = &cobra.Command{
2627
fmt.Println(err)
2728
os.Exit(1)
2829
}
29-
defer portmidi.Terminate()
30+
defer func() {
31+
if err := portmidi.Terminate(); err != nil {
32+
log.Fatal(err)
33+
}
34+
}()
3035

3136
var d portmidi.DeviceID
3237
if deviceID == "" {

‎cmd/playback.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,13 @@ var playbackCmd = &cobra.Command{
6969

7070
case transport.TypeStream:
7171
writers = append(writers, transport.NewStream(logger.WithField(cntl.LoggerFieldTransport, transport.TypeStream), os.Stdout))
72-
break
7372

7473
case transport.TypeBarLogger:
7574
writers = append(writers, transport.NewBarLogger(logger.WithField(cntl.LoggerFieldTransport, transport.TypeBarLogger)))
76-
break
7775

7876
case transport.TypeVisualizer:
7977
w := visualizer.NewServer(logger.WithField(cntl.LoggerFieldTransport, transport.TypeVisualizer))
8078
writers = append(writers, w)
81-
break
8279

8380
case transport.TypeArtNet:
8481
controller, err := artnet.NewController(logger.WithField(cntl.LoggerFieldTransport, transport.TypeArtNet))
@@ -92,7 +89,6 @@ var playbackCmd = &cobra.Command{
9289
}
9390

9491
writers = append(writers, w)
95-
break
9692

9793
case transport.TypeMidi:
9894
w, err := transport.NewMIDI(logger.WithField(cntl.LoggerFieldTransport, transport.TypeMidi), midiDeviceID)
@@ -101,7 +97,6 @@ var playbackCmd = &cobra.Command{
10197
}
10298

10399
writers = append(writers, w)
104-
break
105100

106101
default:
107102
logger.Fatalf("Transport %q is not supported", transportType)
@@ -114,12 +109,9 @@ var playbackCmd = &cobra.Command{
114109
case waiter.TypeNone:
115110
waiters = append(waiters, waiter.NewNone(logger.WithField(cntl.LoggerFieldWaiter, waiter.TypeNone)))
116111

117-
break
118-
119112
case waiter.TypeAudio:
120113
waiters = append(waiters, waiter.NewAudio(logger.WithField(cntl.LoggerFieldWaiter, waiter.TypeAudio), audioWaiterThreshold))
121114

122-
break
123115
}
124116
}
125117

@@ -133,7 +125,6 @@ var playbackCmd = &cobra.Command{
133125
logger.Fatal(err)
134126
}
135127

136-
break
137128
case playbackTypeSetList:
138129
setListID := args[1]
139130
if err = player.PlaySetList(ctx, setListID); err != nil {

‎pkg/api/playback/playback.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ func (c *Controller) Start(r *http.Request, req *playback.Params, res *Status) e
5757

5858
// Stop a playback
5959
func (c *Controller) Stop(r *http.Request, req *api.IDBody, res *Status) error {
60-
p, s, err := c.pm.GetProcess(playback.ProcessName)
60+
p, _, err := c.pm.GetProcess(playback.ProcessName)
6161
if err != nil {
6262
return fmt.Errorf("failed to get playback status: %v", err)
6363
}
6464

65-
s, err = c.pm.Stop(playback.ProcessName)
65+
s, err := c.pm.Stop(playback.ProcessName)
6666
if err != nil {
6767
return fmt.Errorf("failed to stop playback: %v", err)
6868
}

‎pkg/api/playground/dmx_playground_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (c *DMXPlaygroundController) PlayScene(r *http.Request, req *PlayOnceReques
9494
c.defaultBarParams(&req.BarParams)
9595
commands := playback.ToPlayable(req.BarParams, dmxCommands)
9696
if err := playback.Play(context.Background(), c.logger, []playback.TransportWriter{c.controller}, commands); err != nil {
97-
97+
return fmt.Errorf("failed to start playback: %v", err)
9898
}
9999

100100
return nil
@@ -120,7 +120,7 @@ func (c *DMXPlaygroundController) PlayPreset(r *http.Request, req *PlayOnceReque
120120
c.defaultBarParams(&req.BarParams)
121121
commands := playback.ToPlayable(req.BarParams, dmxCommands)
122122
if err := playback.Play(context.Background(), c.logger, []playback.TransportWriter{c.controller}, commands); err != nil {
123-
123+
return fmt.Errorf("failed to start playback: %v", err)
124124
}
125125

126126
return nil

‎pkg/cntl/playback/player.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ func (p *Player) wait(ctx context.Context) error {
7979
}()
8080

8181
for _, w := range p.waiters {
82-
go func() {
82+
go func(w Waiter) {
8383
if err := w.Wait(done, cancel); err != nil {
8484
p.logger.Error(err)
8585
}
86-
}()
86+
}(w)
8787
}
8888

8989
select {
@@ -148,11 +148,11 @@ func Play(ctx context.Context, logger logging.Logger, writers []TransportWriter,
148148
}
149149

150150
for _, w := range writers {
151-
go func() {
151+
go func(w TransportWriter) {
152152
if err := w.Write(cmd); err != nil {
153153
logger.Error(err)
154154
}
155-
}()
155+
}(w)
156156
}
157157

158158
i++

‎pkg/cntl/playback/process.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,12 @@ func (p *Process) parseConfig(config *Config) (*parsedConfig, error) {
9090
writers: []TransportWriter{},
9191
}
9292

93-
writers := 0
9493
if config.TransportWriters.ArtNet.Enabled {
9594
aw, err := transport.NewArtNet(p.controller)
9695
if err != nil {
9796
return nil, fmt.Errorf("failed to create artnet transport writer: %v", err)
9897
}
9998

100-
writers++
10199
cfg.writers = append(cfg.writers, aw)
102100
}
103101

@@ -107,12 +105,10 @@ func (p *Process) parseConfig(config *Config) (*parsedConfig, error) {
107105
return nil, fmt.Errorf("failed to create midi transport writer: %v", err)
108106
}
109107

110-
writers++
111108
cfg.writers = append(cfg.writers, mw)
112109
}
113110

114111
if config.TransportWriters.Visualizer.Enabled {
115-
writers++
116112
cfg.writers = append(cfg.writers, p.visualizer)
117113
}
118114

‎pkg/cntl/types_equals.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (v1 DMXParams) Equals(v2 DMXParams) bool {
128128

129129
// Equals returns whether the two given objects are equal
130130
func (v1 DMXAnimation) Equals(v2 DMXAnimation) bool {
131-
return v2.ID == v2.ID &&
131+
return v1.ID == v2.ID &&
132132
dmxAnimationFrameList(v1.Frames).Equals(dmxAnimationFrameList(v2.Frames))
133133
}
134134

@@ -139,10 +139,10 @@ func (v1 DMXAnimationFrame) Equals(v2 DMXAnimationFrame) bool {
139139
}
140140

141141
// Equals returns whether the two given objects are equal
142-
func (d DMXPreset) Equals(v2 DMXPreset) bool {
143-
return v2.ID == v2.ID &&
144-
d.Name == v2.Name &&
145-
dmxDeviceParamsList(d.DeviceParams).Equals(dmxDeviceParamsList(v2.DeviceParams))
142+
func (v1 DMXPreset) Equals(v2 DMXPreset) bool {
143+
return v1.ID == v2.ID &&
144+
v1.Name == v2.Name &&
145+
dmxDeviceParamsList(v1.DeviceParams).Equals(dmxDeviceParamsList(v2.DeviceParams))
146146
}
147147

148148
// Contains returns whether given DMXCommand is in the called collection

0 commit comments

Comments
 (0)