Compare commits
2 commits
Author | SHA1 | Date | |
---|---|---|---|
|
cba38255a5 | ||
|
13ab5b1902 |
2 changed files with 13 additions and 1 deletions
12
tree.go
12
tree.go
|
@ -3,6 +3,7 @@ package zord_tree
|
|||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"cmp"
|
||||
"crypto/md5"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
@ -13,10 +14,10 @@ import (
|
|||
"path"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
abcex "g.arns.lt/zordsdavini/abcex/v4"
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
|
@ -568,7 +569,16 @@ FILE_LOOP:
|
|||
if err != nil {
|
||||
return tree, err
|
||||
}
|
||||
if nextFile.Id == "" {
|
||||
continue
|
||||
}
|
||||
tree.Files = append(tree.Files, nextFile)
|
||||
slices.SortFunc(tree.Files, func(a, b File) int {
|
||||
if len(a.Id) == len(b.Id) {
|
||||
return strings.Compare(a.Id, b.Id)
|
||||
}
|
||||
return cmp.Compare(len(a.Id), len(b.Id))
|
||||
})
|
||||
}
|
||||
|
||||
return tree, nil
|
||||
|
|
|
@ -22,6 +22,7 @@ func prepare(t *testing.T) Config {
|
|||
"__a",
|
||||
make(map[string]func() string),
|
||||
[]string{"exclude_[0-9]+.bin"},
|
||||
map[string]AppCallback{},
|
||||
)
|
||||
|
||||
err = PopulateTree("./testdata/sunny1", []string{}, config)
|
||||
|
@ -38,6 +39,7 @@ func TestFromNotExistingDirectory(t *testing.T) {
|
|||
"__a",
|
||||
make(map[string]func() string),
|
||||
[]string{},
|
||||
map[string]AppCallback{},
|
||||
)
|
||||
|
||||
_, err := BuildTree("./testing/i_dont_exist", []string{}, config)
|
||||
|
|
Loading…
Add table
Reference in a new issue