Skip to content

refactor: replace custom sort types with slices.SortFunc #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryans-posthog wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: replace custom sort types with slices.SortFunc #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c05f8f7
refactor: replace custom sort types with slices.SortFunc
Apr 16, 2026
c85b7bc
refactor: extract named comparison functions for readability
Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 34 additions & 58 deletions modules/caddyhttp/fileserver/browsetplcontext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
package fileserver

import (
"cmp"
"context"
"io/fs"
"net/url"
"os"
"path"
"path/filepath"
"slices"
"sort"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -221,28 +221,19 @@ func (l *browseTemplateContext) applySortAndLimit(sortParam, orderParam, limitPa
l.Sort = sortParam
l.Order = orderParam

switch l.Sort {
case sortByName:
slices.SortFunc(l.Items, compareByName)
case sortByNameDirFirst:
slices.SortFunc(l.Items, compareByNameDirFirst)
case sortBySize:
slices.SortFunc(l.Items, compareBySize)
case sortByTime:
slices.SortFunc(l.Items, compareByTime)
}
Comment on lines +225 to +233
Copy link
Copy Markdown
Owner Author

@ryans-posthog ryans-posthog Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These new functions are much more unreadable than the previous ones. How many lines were saved if you remove the boilerplate lines of function definitions?


if l.Order == "desc" {
switch l.Sort {
case sortByName:
sort.Sort(sort.Reverse(byName(*l)))
case sortByNameDirFirst:
sort.Sort(sort.Reverse(byNameDirFirst(*l)))
case sortBySize:
sort.Sort(sort.Reverse(bySize(*l)))
case sortByTime:
sort.Sort(sort.Reverse(byTime(*l)))
}
} else {
switch l.Sort {
case sortByName:
sort.Sort(byName(*l))
case sortByNameDirFirst:
sort.Sort(byNameDirFirst(*l))
case sortBySize:
sort.Sort(bySize(*l))
case sortByTime:
sort.Sort(byTime(*l))
}
slices.Reverse(l.Items)
}

if offsetParam != "" {
Expand Down Expand Up @@ -318,59 +309,44 @@ func (fi fileInfo) HumanModTime(format string) string {
return fi.ModTime.Format(format)
}

type (
byName browseTemplateContext
byNameDirFirst browseTemplateContext
bySize browseTemplateContext
byTime browseTemplateContext
)

func (l byName) Len() int { return len(l.Items) }
func (l byName) Swap(i, j int) { l.Items[i], l.Items[j] = l.Items[j], l.Items[i] }

func (l byName) Less(i, j int) bool {
return strings.ToLower(l.Items[i].Name) < strings.ToLower(l.Items[j].Name)
func compareByName(a, b fileInfo) int {
return cmp.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
}

func (l byNameDirFirst) Len() int { return len(l.Items) }
func (l byNameDirFirst) Swap(i, j int) { l.Items[i], l.Items[j] = l.Items[j], l.Items[i] }

func (l byNameDirFirst) Less(i, j int) bool {
// sort by name if both are dir or file
if l.Items[i].IsDir == l.Items[j].IsDir {
return strings.ToLower(l.Items[i].Name) < strings.ToLower(l.Items[j].Name)
func compareByNameDirFirst(a, b fileInfo) int {
if a.IsDir != b.IsDir {
if a.IsDir {
return -1
}
return 1
}
// sort dir ahead of file
return l.Items[i].IsDir
return cmp.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
}

func (l bySize) Len() int { return len(l.Items) }
func (l bySize) Swap(i, j int) { l.Items[i], l.Items[j] = l.Items[j], l.Items[i] }

func (l bySize) Less(i, j int) bool {
func compareBySize(a, b fileInfo) int {
const directoryOffset = -1 << 31 // = -math.MinInt32

iSize, jSize := l.Items[i].Size, l.Items[j].Size
aSize, bSize := a.Size, b.Size

// directory sizes depend on the file system; to
// provide a consistent experience, put them up front
// and sort them by name
if l.Items[i].IsDir {
iSize = directoryOffset
if a.IsDir {
aSize = directoryOffset
}
if l.Items[j].IsDir {
jSize = directoryOffset
if b.IsDir {
bSize = directoryOffset
}
if l.Items[i].IsDir && l.Items[j].IsDir {
return strings.ToLower(l.Items[i].Name) < strings.ToLower(l.Items[j].Name)
if a.IsDir && b.IsDir {
return cmp.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
}

return iSize < jSize
return cmp.Compare(aSize, bSize)
}

func (l byTime) Len() int { return len(l.Items) }
func (l byTime) Swap(i, j int) { l.Items[i], l.Items[j] = l.Items[j], l.Items[i] }
func (l byTime) Less(i, j int) bool { return l.Items[i].ModTime.Before(l.Items[j].ModTime) }
func compareByTime(a, b fileInfo) int {
return a.ModTime.Compare(b.ModTime)
}

const (
sortByName = "name"
Expand Down
Loading