feat(aa): rule interface: replace less & equal by the compare method.

- set a new alphabet order to sort AARE based string.
- unify compare function for all rules
- handle some special sort order, eg: base include
This commit is contained in:
Alexandre Pujol 2024-06-19 18:34:58 +01:00
parent 747292e954
commit 4cbacc186c
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
22 changed files with 250 additions and 399 deletions

View file

@ -6,7 +6,6 @@ package aa
import (
"fmt"
"maps"
"slices"
"strings"
)
@ -96,19 +95,12 @@ func (r *Profile) Validate() error {
return r.Rules.Validate()
}
func (p *Profile) Less(other any) bool {
func (r *Profile) Compare(other Rule) int {
o, _ := other.(*Profile)
if p.Name != o.Name {
return p.Name < o.Name
if res := compare(r.Name, o.Name); res != 0 {
return res
}
return len(p.Attachments) < len(o.Attachments)
}
func (p *Profile) Equals(other any) bool {
o, _ := other.(*Profile)
return p.Name == o.Name && slices.Equal(p.Attachments, o.Attachments) &&
maps.Equal(p.Attributes, o.Attributes) &&
slices.Equal(p.Flags, o.Flags)
return compare(r.Attachments, o.Attachments)
}
func (p *Profile) String() string {