Russtopia
/
molly-brown
forked from solderpunk/molly-brown
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Sort directory listings with directories before files' (#1) from sort-dirs-first into master 

Reviewed-on: #1
This commit is contained in:
Russtopia 2021-08-21 02:58:46 +00:00
parent e42c366565 a4873da190
commit f8141952f2
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dirlist.go
View File

@ -42,10 +42,46 @@ func generateDirectoryListing(URL *url.URL, path string, config Config) (string,
i, j = j, i i, j = j, i
} }
if config.DirectorySort == "Name" { if config.DirectorySort == "Name" {
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() return files[i].Name() < files[j].Name()
} else if config.DirectorySort == "Size" { } else if config.DirectorySort == "Size" {
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() return files[i].Size() < files[j].Size()
} else if config.DirectorySort == "Time" { } else if config.DirectorySort == "Time" {
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 files[i].ModTime().Before(files[j].ModTime())
} }
return false // Should not happen return false // Should not happen