internal/ui: clean up some iterator stuff (#153)

* internal/ui: significantly better iterator usage for advertised routes

* internal/ui: more iterator cleanup

* internal/ui: clean up iterator usage for peer routes

* internal/ui: even more iterator cleanup

* internal/ui: remove an unnecessary iterator usage

Author: DeedleFake

internal/ui/app.go

@@ -2,7 +2,6 @@ package ui
 
 import (
 	"context"
-	"iter"
 	"log/slog"
 	"os"
 	"slices"
@@ -11,7 +10,6 @@ import (
 	"deedles.dev/mk"
 	"deedles.dev/trayscale/internal/tray"
 	"deedles.dev/trayscale/internal/tsutil"
-	"deedles.dev/xiter"
 	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
 	"github.com/diamondburned/gotk4/pkg/gdk/v4"
 	"github.com/diamondburned/gotk4/pkg/gio/v2"
@@ -129,11 +127,14 @@ func (a *App) updatePeers(status tsutil.Status) {
 	}
 
 	peerMap := status.Status.Peer
-	peers := slices.SortedFunc(iter.Seq[key.NodePublic](xiter.Filter(xiter.MapKeys(status.Status.Peer),
-		func(peer key.NodePublic) bool {
-			return !tsutil.IsMullvad(peerMap[peer])
-		})),
-		key.NodePublic.Compare)
+	peers := make([]key.NodePublic, 0, len(status.Status.Peer))
+	for k, p := range peerMap {
+		if tsutil.IsMullvad(p) {
+			continue
+		}
+		peers = append(peers, k)
+	}
+	slices.SortFunc(peers, key.NodePublic.Compare)
 
 	for key, page := range a.peerPages {
 		if _, ok := peerMap[key]; !ok {

internal/ui/peerpage.go

@@ -4,7 +4,6 @@ import (
 	"cmp"
 	"context"
 	_ "embed"
-	"iter"
 	"log/slog"
 	"net/netip"
 	"slices"
@@ -225,23 +224,46 @@ func (page *PeerPage) Update(a *App, peer *ipnstate.PeerStatus, status tsutil.St
 	slices.SortFunc(peer.TailscaleIPs, netip.Addr.Compare)
 	page.addrRows.Update(peer.TailscaleIPs)
 
-	if peer.PrimaryRoutes != nil {
-		page.routes = peer.PrimaryRoutes.AsSlice()
+	routes := func(yield func(netip.Prefix) bool) {
+		if peer.PrimaryRoutes == nil {
+			return
+		}
+		for i := 0; i < peer.PrimaryRoutes.Len(); i++ {
+			r := peer.PrimaryRoutes.At(i)
+			if r.Bits() == 0 {
+				continue
+			}
+			if !yield(r) {
+				return
+			}
+		}
 	}
-	page.routes = slices.SortedFunc(iter.Seq[netip.Prefix](xiter.Filter(xiter.OfSlice(page.routes),
-		func(p netip.Prefix) bool { return p.Bits() != 0 })),
+	routes = xiter.Or(
+		routes,
+		xiter.Of(netip.Prefix{}),
+	)
+
+	clear(page.routes)
+	page.routes = page.routes[:0]
+	page.routes = slices.AppendSeq(page.routes, routes)
+	slices.SortFunc(
+		page.routes,
 		func(p1, p2 netip.Prefix) int {
-			return cmp.Or(p1.Addr().Compare(p2.Addr()), p1.Bits()-p2.Bits())
-		})
-	if len(page.routes) == 0 {
-		page.routes = append(page.routes, netip.Prefix{})
-	}
-	eroutes := make([]enum[netip.Prefix], 0, len(page.routes))
-	for i, r := range page.routes {
-		i = -1
-		eroutes = append(eroutes, enumerate(i, r))
+			return cmp.Or(
+				p1.Addr().Compare(p2.Addr()),
+				cmp.Compare(p1.Bits(), p2.Bits()),
+			)
+		},
+	)
+
+	eroutes := func(yield func(enum[netip.Prefix]) bool) {
+		for _, r := range page.routes {
+			if !yield(enumerate(-1, r)) {
+				return
+			}
+		}
 	}
-	page.routeRows.Update(eroutes)
+	page.routeRows.UpdateFromSeq(eroutes, len(page.routes))
 
 	page.ExitNodeRow.SetVisible(peer.ExitNodeOption)
 	page.ExitNodeRow.ActivatableWidget().(*gtk.Switch).SetState(peer.ExitNode)

internal/ui/rowmanager.go

@@ -1,8 +1,10 @@
 package ui
 
 import (
+	"iter"
 	"slices"
 
+	"deedles.dev/xiter"
 	"github.com/diamondburned/gotk4/pkg/gtk/v4"
 )
 
@@ -31,9 +33,14 @@ func (m *rowManager[Data]) resize(size int) {
 }
 
 func (m *rowManager[Data]) Update(data []Data) {
-	m.resize(len(data))
+	m.UpdateFromSeq(slices.Values(data), len(data))
+}
+
+func (m *rowManager[Data]) UpdateFromSeq(data iter.Seq[Data], size int) {
+	m.resize(size)
 
-	for i, d := range data {
+	edata := xiter.Enumerate(xiter.Seq[Data](data))
+	for i, d := range edata {
 		if i < len(m.rows) {
 			m.rows[i].Update(d)
 			continue

internal/ui/selfpage.go

@@ -4,7 +4,6 @@ import (
 	"cmp"
 	"context"
 	_ "embed"
-	"iter"
 	"log/slog"
 	"net/netip"
 	"slices"
@@ -354,12 +353,16 @@ func (page *SelfPage) init(a *App, peer *ipnstate.PeerStatus, status tsutil.Stat
 		page.PreferredDERP.SetText(dm.Regions[r.PreferredDERP].RegionName)
 
 		page.DERPLatencies.SetVisible(true)
-		namedLats := slices.SortedFunc(iter.Seq[xiter.Pair[string, time.Duration]](xiter.Map(xiter.ToPair(xiter.OfMap(r.RegionLatency)),
-			func(p xiter.Pair[int, time.Duration]) xiter.Pair[string, time.Duration] {
-				return xiter.P(dm.Regions[p.V1].RegionName, p.V2)
-			})),
-			func(p1, p2 xiter.Pair[string, time.Duration]) int { return cmp.Compare(p1.V2, p2.V2) })
-		latencyRows.Update(namedLats)
+		namedLats := func(yield func(latencyEntry) bool) {
+			for id, latency := range r.RegionLatency {
+				named := xiter.P(dm.Regions[id].RegionName, latency)
+				if !yield(named) {
+					return
+				}
+			}
+		}
+		sortedLats := slices.SortedFunc(namedLats, func(p1, p2 latencyEntry) int { return cmp.Compare(p1.V2, p2.V2) })
+		latencyRows.Update(sortedLats)
 	})
 }
 
@@ -383,19 +386,39 @@ func (page *SelfPage) Update(a *App, peer *ipnstate.PeerStatus, status tsutil.St
 	page.fileRows.Update(status.Files)
 	page.FilesGroup.SetVisible(len(status.Files) > 0)
 
-	page.routes = slices.SortedFunc(iter.Seq[netip.Prefix](xiter.Filter(xiter.OfSlice(status.Prefs.AdvertiseRoutes),
-		func(p netip.Prefix) bool { return p.Bits() != 0 })), // Filter
-		func(p1, p2 netip.Prefix) int { // SortedFunc
-			return cmp.Or(p1.Addr().Compare(p2.Addr()), p1.Bits()-p2.Bits())
-		})
-	if len(page.routes) == 0 {
-		page.routes = append(page.routes, netip.Prefix{})
+	routes := func(yield func(netip.Prefix) bool) {
+		for _, r := range status.Prefs.AdvertiseRoutes {
+			if r.Bits() == 0 {
+				continue
+			}
+			if !yield(r) {
+				return
+			}
+		}
 	}
-	eroutes := make([]enum[netip.Prefix], 0, len(page.routes))
-	for i, r := range page.routes {
-		eroutes = append(eroutes, enumerate(i, r))
+	routes = xiter.Or(
+		routes,
+		xiter.Of(netip.Prefix{}),
+	)
+
+	clear(page.routes)
+	page.routes = page.routes[:0]
+	page.routes = slices.AppendSeq(page.routes, routes)
+	slices.SortFunc(page.routes, func(p1, p2 netip.Prefix) int {
+		return cmp.Or(
+			p1.Addr().Compare(p2.Addr()),
+			cmp.Compare(p1.Bits(), p2.Bits()),
+		)
+	})
+
+	eroutes := func(yield func(enum[netip.Prefix]) bool) {
+		for i, r := range page.routes {
+			if !yield(enumerate(i, r)) {
+				return
+			}
+		}
 	}
-	page.routeRows.Update(eroutes)
+	page.routeRows.UpdateFromSeq(eroutes, len(page.routes))
 }
 
 type addrRow struct {