github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 12:16:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1546 from wmark/browse-sort-size

Browse Source 
browse: fix arbitrary ordering of directories with sort=size
This commit is contained in:
Matt Holt 2017-04-07 18:32:02 -06:00 committed by GitHub
commit e26a855d8b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
caddyhttp/browse/browse.go
View File

@ -165,12 +165,21 @@ func (l bySize) Swap(i, j int) { l.Items[i], l.Items[j] = l.Items[j], l.Items[i]
const directoryOffset = -1 << 31 // = math.MinInt32 const directoryOffset = -1 << 31 // = math.MinInt32
func (l bySize) Less(i, j int) bool { func (l bySize) Less(i, j int) bool {
iSize, jSize := l.Items[i].Size, l.Items[j].Size iSize, jSize := l.Items[i].Size, l.Items[j].Size
// Directory sizes depend on the filesystem implementation,
// which is opaque to a visitor, and should indeed does not change if the operator choses to change the fs.
// For a consistent user experience directories are pulled to the front…
if l.Items[i].IsDir { if l.Items[i].IsDir {
iSize = directoryOffset + iSize iSize = directoryOffset
} }
if l.Items[j].IsDir { if l.Items[j].IsDir {
jSize = directoryOffset + jSize jSize = directoryOffset
} }
// … and sorted by name.
if l.Items[i].IsDir && l.Items[j].IsDir {
return strings.ToLower(l.Items[i].Name) < strings.ToLower(l.Items[j].Name)
}
return iSize < jSize return iSize < jSize
} }