solderpunk
/
molly-brown
7
29
Fork 10
Code Issues 9 Pull Requests Releases Wiki Activity

Tidy up DirectorySubdirsFirst sorting code by doing two consecutive sorts. Closes #30.

This commit is contained in:
Solderpunk 2023-02-05 15:04:49 +01:00
parent 8446885f56
commit d9e0fed193
1 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dirlist.go
View File

@ -36,62 +36,31 @@ func generateDirectoryListing(URL *url.URL, path string, config Config) (string,
up := filepath.Dir(URL.Path)
listing += fmt.Sprintf("=> %s %s\n", up, "..")
}
// Sort files
// Sort files by criteria first
sort.SliceStable(files, func(i, j int) bool {
if config.DirectoryReverse {
i, j = j, i
}
if config.DirectorySort == "Name" {
if config.DirectorySubdirsFirst {
if files[i].IsDir() {
if files[j].IsDir() {
return files[i].Name() < files[j].Name()
}
return true
}
if files[j].IsDir() {
if files[i].IsDir() {
return files[i].Name() < files[j].Name()
}
return false
}
}
return files[i].Name() < files[j].Name()
} else if config.DirectorySort == "Size" {
if config.DirectorySubdirsFirst {
if files[i].IsDir() {
if files[j].IsDir() {
return files[i].Size() < files[j].Size()
}
return true
}
if files[j].IsDir() {
if files[i].IsDir() {
return files[i].Size() < files[j].Size()
}
return false
}
}
return files[i].Size() < files[j].Size()
} else if config.DirectorySort == "Time" {
if config.DirectorySubdirsFirst {
if files[i].IsDir() {
if files[j].IsDir() {
return files[i].ModTime().Before(files[j].ModTime())
}
return true
}
if files[j].IsDir() {
if files[i].IsDir() {
return files[i].ModTime().Before(files[j].ModTime())
}
return false
}
}
return files[i].ModTime().Before(files[j].ModTime())
}
return false // Should not happen
})
// Sort directories before file
if(config.DirectorySubdirsFirst) {
sort.SliceStable(files, func(i, j int) bool {
// If i is a dir and j is a file, i < j
if files[i].IsDir() && !files[j].IsDir() {
return true
} else {
return false
}
})
}
// Format lines
for _, file := range files {
// Skip dotfiles