browse: sort listing by dir first (#1527)

* Default Browse sort by Dir, File * Ignore temp template files * Add folder to test * unneeded chagne

browse: sort listing by dir first (#1527)
* Default Browse sort by Dir, File * Ignore temp template files * Add folder to test * unneeded chagne
4e1229e7 · Toby Allen · Matt Holt · 5341c85a · 4e1229e7 · 4e1229e7
Commit 4e1229e7 authored Mar 25, 2017 by Toby Allen Committed by Matt Holt Mar 24, 2017
4 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ Caddyfile

 og_static/

-.vscode/
\ No newline at end of file
+.vscode/
+
+caddyhttp/browse/temp*
\ No newline at end of file
--- a/caddyhttp/browse/browse.go
+++ b/caddyhttp/browse/browse.go
@@ -137,7 +137,14 @@ func (l byName) Swap(i, j int) { l.Items[i], l.Items[j] = l.Items[j], l.Items[i]

 // Treat upper and lower case equally
 func (l byName) Less(i, j int) bool {
-	return strings.ToLower(l.Items[i].Name) < strings.ToLower(l.Items[j].Name)
+
+	// if both are dir or file sort normally
+	if l.Items[i].IsDir == l.Items[j].IsDir {
+		return strings.ToLower(l.Items[i].Name) < strings.ToLower(l.Items[j].Name)
+	} else {
+		// always sort dir ahead of file
+		return l.Items[i].IsDir
+	}
 }

 // By Size

--- a/caddyhttp/browse/browse_test.go
+++ b/caddyhttp/browse/browse_test.go
@@ -181,6 +181,8 @@ func TestBrowseTemplate(t *testing.T) {

 <h1>/photos/</h1>

+<a href="./test1/">test1</a><br>
+
 <a href="./test.html">test.html</a><br>

 <a href="./test2.html">test2.html</a><br>
@@ -192,7 +194,7 @@ func TestBrowseTemplate(t *testing.T) {
 `

 	if respBody != expectedBody {
-		t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
+		t.Fatalf("Expected body: '%v' got: '%v'", expectedBody, respBody)
 	}

 }

--- a/caddyhttp/browse/testdata/photos/test1/test.html
+++ b/caddyhttp/browse/testdata/photos/test1/test.html
+<!DOCTYPE html>
+<html>
+<head>
+<title>Test</title>
+</head>
+<body>
+</body>
+</html>