Apply go fix modernizations

This commit is contained in:
Ian Gulliver
2026-03-05 11:39:12 -08:00
parent 8f14a4f373
commit e12f7a04b8
4 changed files with 34 additions and 63 deletions

View File

@@ -2,20 +2,20 @@ package artnet
import (
"net"
"sort"
"slices"
"sync"
"time"
)
type Node struct {
IP net.IP
Port uint16
MAC net.HardwareAddr
ShortName string
LongName string
Inputs []Universe
Outputs []Universe
LastSeen time.Time
IP net.IP
Port uint16
MAC net.HardwareAddr
ShortName string
LongName string
Inputs []Universe
Outputs []Universe
LastSeen time.Time
}
type Discovery struct {
@@ -180,16 +180,13 @@ func (d *Discovery) sendPollReplies(dst *net.UDPAddr, universes []Universe, isIn
for k := range groups {
keys = append(keys, k)
}
sort.Slice(keys, func(i, j int) bool { return keys[i] < keys[j] })
slices.Sort(keys)
for _, key := range keys {
univs := groups[key]
sort.Slice(univs, func(i, j int) bool { return univs[i] < univs[j] })
slices.Sort(univs)
for i := 0; i < len(univs); i += 4 {
end := i + 4
if end > len(univs) {
end = len(univs)
}
end := min(i+4, len(univs))
chunk := univs[i:end]
pkt := BuildPollReplyPacket(d.localIP, d.localMAC, d.shortName, d.longName, chunk, isInput)
d.receiver.SendTo(pkt, dst)
@@ -204,11 +201,8 @@ func (d *Discovery) GetNodesForUniverse(universe Universe) []*Node {
var result []*Node
for _, node := range d.nodes {
for _, u := range node.Outputs {
if u == universe {
result = append(result, node)
break
}
if slices.Contains(node.Outputs, universe) {
result = append(result, node)
}
}
return result
@@ -226,10 +220,5 @@ func (d *Discovery) GetAllNodes() []*Node {
}
func containsUniverse(slice []Universe, val Universe) bool {
for _, v := range slice {
if v == val {
return true
}
}
return false
return slices.Contains(slice, val)
}