Merge pull request 'Resync master w/upstream' (#2) from solderpunk/molly-brown:master into master

Reviewed-on: Russtopia/molly-brown#2

dirlist.go

@@ -42,10 +42,46 @@ func generateDirectoryListing(URL *url.URL, path string, config UserConfig) (str
 			i, j = j, i
 		}
 		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()
 		} 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()
 		} 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 false // Should not happen