Compare commits

...

2 Commits

Author SHA1 Message Date
bakonpancakz 2f78a9d80b feat: natural sorting
so like numbers are in order and stuff idk black magic
2026-07-18 04:22:03 -07:00
bakonpancakz 75140f716d bug: trailing slash issue
manually writing a dir caused path traversal issues in the html so we force a trailing slash to prevent this
2026-07-18 04:03:57 -07:00
+60 -2
View File
@@ -2,6 +2,7 @@ package main
import (
"bytes"
"cmp"
"embed"
"fmt"
"io"
@@ -16,6 +17,8 @@ import (
"strings"
"text/template"
"time"
"unicode"
"unicode/utf8"
)
var (
@@ -114,6 +117,54 @@ func getEntryIcon(name string, isDir bool) string {
}
}
func parseNumber(s string) (num int, chars int) {
for chars < len(s) && s[chars] >= '0' && s[chars] <= '9' {
num = num*10 + int(s[chars]-'0')
chars++
}
return
}
func naturalCompare(a, b string) int {
for len(a) > 0 && len(b) > 0 {
if unicode.IsDigit(rune(a[0])) && unicode.IsDigit(rune(b[0])) {
aValue, aSize := parseNumber(a)
bValue, bSize := parseNumber(b)
if aValue != bValue {
if aValue < bValue {
return -1
}
return 1
}
a = a[aSize:]
b = b[bSize:]
continue
}
aRune, aSize := utf8.DecodeRuneInString(a)
bRune, bSize := utf8.DecodeRuneInString(b)
aRuneLower := unicode.ToLower(aRune)
bRuneLower := unicode.ToLower(bRune)
if aRuneLower != bRuneLower {
if aRuneLower < bRuneLower {
return -1
}
return 1
}
a = a[aSize:]
b = b[bSize:]
}
return cmp.Compare(len(a), len(b))
}
func init() {
if serveAddress == "" {
serveAddress = "127.0.0.1:8080"
@@ -152,6 +203,13 @@ func main() {
return
}
// Append trailing slash to directories so rendered HTML has proper paths
if filestat.IsDir() && !strings.HasSuffix(r.URL.Path, "/") {
r.URL.Path += "/"
http.Redirect(w, r, r.URL.String(), http.StatusMovedPermanently)
return
}
// Use Browser Cache (if possible)
modtime := filestat.ModTime().UTC()
modhash := fmt.Sprint(modtime.Unix())
@@ -233,14 +291,14 @@ func main() {
// Use
if sortOrder == "modified" {
if a.ModTime.Equal(b.ModTime) {
return strings.Compare(a.Name, b.Name)
return naturalCompare(a.Name, b.Name)
}
if a.ModTime.After(b.ModTime) {
return -1
}
return 1
}
return strings.Compare(a.Name, b.Name)
return naturalCompare(a.Name, b.Name)
})
// Directory Listing