Sort by names, then IPs

This commit is contained in:
Ian Gulliver
2026-01-28 21:16:35 -08:00
parent 522b64450b
commit 7f36444003
3 changed files with 18 additions and 3 deletions

View File

@@ -228,7 +228,13 @@ func (t *Tendrils) getNodes() []*Node {
nodes = append(nodes, node)
}
sort.Slice(nodes, func(i, j int) bool {
return sortorder.NaturalLess(nodes[i].DisplayName(), nodes[j].DisplayName())
if nodes[i].DisplayName() != nodes[j].DisplayName() {
return sortorder.NaturalLess(nodes[i].DisplayName(), nodes[j].DisplayName())
}
if nodes[i].FirstIP() != nodes[j].FirstIP() {
return sortorder.NaturalLess(nodes[i].FirstIP(), nodes[j].FirstIP())
}
return sortorder.NaturalLess(nodes[i].FirstMAC(), nodes[j].FirstMAC())
})
return nodes