mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

More micro-optimizations

Browse source
This commit is contained in:
Deluan 2024-06-06 07:09:30 -04:00
parent 939f3eee97
commit 0f7d6b5bc4
3 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
utils/merge/merge_fs.go
View file

@ -1,10 +1,13 @@
package merge
import (
"cmp"
"errors"
"io"
"io/fs"
"sort"
"slices"
"golang.org/x/exp/maps"
)
// FS implements a simple merged fs.FS, that can combine a Base FS with an Overlay FS. The semantics are:
@ -44,33 +47,26 @@ func (m FS) Open(name string) (fs.File, error) {
}
func (m FS) mergeDirs(name string, info fs.FileInfo, baseDir fs.ReadDirFile, overlayDir fs.ReadDirFile) (fs.File, error) {
merged := map[string]fs.DirEntry{}
baseFiles, err := baseDir.ReadDir(-1)
if err != nil {
return nil, err
}
sort.Slice(baseFiles, func(i, j int) bool { return baseFiles[i].Name() < baseFiles[j].Name() })
overlayFiles, err := overlayDir.ReadDir(-1)
if err != nil {
overlayFiles = nil
}
sort.Slice(overlayFiles, func(i, j int) bool { return overlayFiles[i].Name() < overlayFiles[j].Name() })
merged := map[string]fs.DirEntry{}
for _, f := range baseFiles {
merged[f.Name()] = f
}
for _, f := range overlayFiles {
merged[f.Name()] = f
}
entries := maps.Values(merged)
var entries []fs.DirEntry
for _, i := range merged {
entries = append(entries, i)
}
sort.Slice(entries, func(i, j int) bool { return entries[i].Name() < entries[j].Name() })
slices.SortFunc(entries, func(i, j fs.DirEntry) int { return cmp.Compare(i.Name(), j.Name()) })
return &mergedDir{
name: name,
info: info,