refactor: Remove extra sort in favor of sorted insert

Signed-off-by: Vincent Boutour <[email protected]>

pkg/provider/share.go

@@ -71,12 +71,3 @@ func (s Share) CheckPassword(authorizationHeader string) error {
 func (s Share) IsExpired(now time.Time) bool {
 	return s.Duration != 0 && s.Creation.Add(s.Duration).Before(now)
 }
-
-// ShareByID sort Share by ID
-type ShareByID []Share
-
-func (a ShareByID) Len() int      { return len(a) }
-func (a ShareByID) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ShareByID) Less(i, j int) bool {
-	return a[i].ID < a[j].ID
-}

pkg/provider/webhook.go

@@ -110,11 +110,3 @@ func (w Webhook) matchItem(item absto.Item) bool {
 
 	return itemDir == w.Pathname
 }
-
-type WebhookByID []Webhook
-
-func (a WebhookByID) Len() int      { return len(a) }
-func (a WebhookByID) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a WebhookByID) Less(i, j int) bool {
-	return a[i].ID < a[j].ID
-}

pkg/share/crud.go

@@ -27,21 +27,23 @@ func (a *App) generateID() (string, error) {
 }
 
 // List shares
-func (a *App) List() (shares []provider.Share) {
+func (a *App) List() (output []provider.Share) {
 	a.RLock()
 	defer a.RUnlock()
 
-	var i int64
-	shares = make([]provider.Share, len(a.shares))
+	output = make([]provider.Share, 0, len(a.shares))
 
 	for _, value := range a.shares {
-		shares[i] = value
-		i++
-	}
+		index := sort.Search(len(output), func(i int) bool {
+			return output[i].ID > value.ID
+		})
 
-	sort.Sort(provider.ShareByID(shares))
+		output = append(output, value)
+		copy(output[index+1:], output[index:])
+		output[index] = value
+	}
 
-	return shares
+	return output
 }
 
 // Create a share

pkg/webhook/crud.go

@@ -24,21 +24,23 @@ func (a *App) generateID() (string, error) {
 	}
 }
 
-func (a *App) List() (webhooks []provider.Webhook) {
+func (a *App) List() (output []provider.Webhook) {
 	a.RLock()
 	defer a.RUnlock()
 
-	var i int64
-	webhooks = make([]provider.Webhook, len(a.webhooks))
+	output = make([]provider.Webhook, len(a.webhooks))
 
 	for _, value := range a.webhooks {
-		webhooks[i] = value
-		i++
-	}
+		index := sort.Search(len(output), func(i int) bool {
+			return output[i].ID > value.ID
+		})
 
-	sort.Sort(provider.WebhookByID(webhooks))
+		output = append(output, value)
+		copy(output[index+1:], output[index:])
+		output[index] = value
+	}
 
-	return webhooks
+	return output
 }
 
 func (a *App) Create(ctx context.Context, pathname string, recursive bool, kind provider.WebhookKind, url string, types []provider.EventType) (string, error) {