From d99fb7b6585837a02f43d1c3f37ed172baa1bf5d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 11 Mar 2025 19:35:48 +0100
Subject: fix: panic when source order > number of sources

Fixes: https://todo.sr.ht/~alanpearce/searchix/13
---
 internal/server/mux.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/internal/server/mux.go b/internal/server/mux.go
index 6abf84f..37435d4 100644
--- a/internal/server/mux.go
+++ b/internal/server/mux.go
@@ -1,14 +1,18 @@
 package server
 
 import (
+	"cmp"
 	"context"
 	"encoding/xml"
 	"fmt"
+	"maps"
 	"math"
 	"net/http"
 	"net/url"
 	"path"
+	"slices"
 	"strconv"
+	"strings"
 	"time"
 
 	"go.alanpearce.eu/searchix/frontend"
@@ -47,10 +51,13 @@ func applyDevModeOverrides(cfg *config.Config) {
 }
 
 func sortSources(ss map[string]*config.Source) {
-	sources = make([]*config.Source, len(ss))
-	for _, v := range ss {
-		sources[v.Order] = v
-	}
+	sources = slices.SortedFunc(maps.Values(ss), func(a, b *config.Source) int {
+		return cmp.Or(
+			cmp.Compare(a.Order, b.Order),
+			strings.Compare(a.Key, b.Key),
+			strings.Compare(a.Name, b.Name),
+		)
+	})
 }
 
 func NewMux(
-- 
cgit 1.4.1