Clean-up, format listing as table, add sizes

sgreben · sgreben · commit 71dd5506b52c · 2018-11-20T01:57:24.000+01:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.2.2
+VERSION = 1.3.0
 
 APP      := http-file-server
 PACKAGES := $(shell go list -f {{.Dir}} ./...)
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # http-file-server
 
-`http-file-server` is a dependency-free HTTP file server.
+`http-file-server` is a dependency-free HTTP file server. Beyond directory listings and file downloads, it lets you download a whole directory as as `.zip` or `.tar.gz` (generated on-the-fly).
 
 ![screenshot](doc/screenshot.gif)
 
@@ -60,14 +60,14 @@ Or [download a binary](https://github.com/sgreben/http-file-server/releases/late
 
 ```sh
 # Linux
-curl -L https://github.com/sgreben/http-file-server/releases/download/1.2.2/http-file-server_1.2.2_linux_x86_64.tar.gz | tar xz
+curl -L https://github.com/sgreben/http-file-server/releases/download/1.3.0/http-file-server_1.3.0_linux_x86_64.tar.gz | tar xz
 
 # OS X
-curl -L https://github.com/sgreben/http-file-server/releases/download/1.2.2/http-file-server_1.2.2_osx_x86_64.tar.gz | tar xz
+curl -L https://github.com/sgreben/http-file-server/releases/download/1.3.0/http-file-server_1.3.0_osx_x86_64.tar.gz | tar xz
 
 # Windows
-curl -LO https://github.com/sgreben/http-file-server/releases/download/1.2.2/http-file-server_1.2.2_windows_x86_64.zip
-unzip versions_1.2.2_windows_x86_64.zip
+curl -LO https://github.com/sgreben/http-file-server/releases/download/1.3.0/http-file-server_1.3.0_windows_x86_64.zip
+unzip versions_1.3.0_windows_x86_64.zip
 ```
 
 ## Use it
diff --git a/README.template.md b/README.template.md
@@ -1,6 +1,6 @@
 # http-file-server
 
-`http-file-server` is a dependency-free HTTP file server.
+`http-file-server` is a dependency-free HTTP file server. Beyond directory listings and file downloads, it lets you download a whole directory as as `.zip` or `.tar.gz` (generated on-the-fly).
 
 ![screenshot](doc/screenshot.gif)
 
diff --git a/doc/screenshot.gif b/doc/screenshot.gif
diff --git a/server.go b/server.go
@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
+	"html/template"
 	"net/http"
 	"net/url"
 	"os"
-	"path"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -21,17 +21,86 @@ const (
 	zipContentType = "application/zip"
 )
 
+const directoryListingTemplateText = `
+<html>
+<head>
+	<title>{{ .Title }}</title>
+	<style>
+		.number { text-align: right; }
+		.text { text-align: left; }
+	</style>
+</head>
+<body>
+<h1>{{ .Title }}</h1>
+{{ if .Files }}
+<ul>
+	<li><a href="{{ .TarGzURL }}">Entire directory as .tar.gz</a></li>
+	<li><a href="{{ .ZipURL }}">Entire directory as .zip</a></li>
+</ul>
+{{ end }}
+<table>
+	<thead>
+		<th class=text>Name</th>
+		<th class=number>Size</th>
+		<th class=number>Size (bytes)</th>
+	</thead>
+	<tbody>
+	{{ range .Files }}
+	<tr>
+		<td class=text><a href="{{ .URL.String }}">{{ .Name }}</td>
+		<td class=number>{{ if (not .IsDir) }}<pre>{{.Size.String }}</pre>{{ end }}</td>
+		<td class=number>{{ if (not .IsDir) }}<pre>{{ .Size | printf "%d" }}</pre>{{ end }}</td>
+	</tr>
+	{{ end }}
+	</tbody>
+</table>
+</body>
+</html>
+`
+
+type fileSizeBytes int64
+
+func (f fileSizeBytes) String() string {
+	const (
+		KB = 1024
+		MB = 1024 * KB
+		GB = 1024 * MB
+	)
+	switch {
+	case f < KB:
+		return fmt.Sprintf("%d B", f)
+	case f < MB:
+		return fmt.Sprintf("%d KB", f/KB)
+	case f < GB:
+		return fmt.Sprintf("%d MB", f/MB)
+	case f >= GB:
+		fallthrough
+	default:
+		return fmt.Sprintf("%d GB", f/GB)
+	}
+}
+
+type directoryListingFileData struct {
+	Name  string
+	Size  fileSizeBytes
+	IsDir bool
+	URL   *url.URL
+}
+
+type directoryListingData struct {
+	Title    string
+	ZipURL   *url.URL
+	TarGzURL *url.URL
+	Files    []directoryListingFileData
+}
+
 type fileHandler struct {
 	route string
 	path  string
 }
 
-var htmlReplacer = strings.NewReplacer(
-	"&", "&amp;",
-	"<", "&lt;",
-	">", "&gt;",
-	`"`, "&#34;",
-	"'", "&#39;",
+var (
+	directoryListingTemplate = template.Must(template.New("").Parse(directoryListingTemplateText))
 )
 
 func (f *fileHandler) serveStatus(w http.ResponseWriter, r *http.Request, status int) {
@@ -65,37 +134,51 @@ func (f *fileHandler) serveDir(w http.ResponseWriter, r *http.Request, dirPath s
 		return
 	}
 	sort.Slice(files, func(i, j int) bool { return files[i].Name() < files[j].Name() })
-
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	title, _ := filepath.Rel(f.path, dirPath)
-	title = filepath.Join(filepath.Base(f.path), title)
-	fmt.Fprintf(w, "<h1>%s</h1>\n", htmlReplacer.Replace(title))
-	fmt.Fprintf(w, "<ul>\n")
-	for _, d := range files {
-		name := d.Name()
-		if d.IsDir() {
-			name += "/"
-		}
-		url := url.URL{Path: path.Join(r.URL.Path, name)}
-		fmt.Fprintf(w, "<li><a href=\"%s\">%s</a></li>\n", url.String(), htmlReplacer.Replace(name))
-	}
-	fmt.Fprintf(w, "</ul>\n")
-	if len(files) > 0 {
-		url := url.URL{Path: r.URL.Path}
-		q := url.Query()
-		q.Set(tarGzKey, tarGzValue)
-		url.RawQuery = q.Encode()
-		fmt.Fprintf(w, "<p>\n")
-		fmt.Fprintf(w, "<a href=\"%s\">Entire directory as .tar.gz</a>\n", url.String())
-		fmt.Fprintf(w, "</p>\n")
-		url.RawQuery = ""
-		q = url.Query()
-		q.Set(zipKey, zipValue)
-		url.RawQuery = q.Encode()
-		fmt.Fprintf(w, "<p>\n")
-		fmt.Fprintf(w, "<a href=\"%s\">Entire directory as .zip</a>\n", url.String())
-		fmt.Fprintf(w, "</p>\n")
-	}
+	directoryListingTemplate.Execute(w, directoryListingData{
+		Title: func() string {
+			relPath, _ := filepath.Rel(f.path, dirPath)
+			return filepath.Join(filepath.Base(f.path), relPath)
+		}(),
+		TarGzURL: func() *url.URL {
+			url := *r.URL
+			q := url.Query()
+			q.Set(tarGzKey, tarGzValue)
+			url.RawQuery = q.Encode()
+			return &url
+		}(),
+		ZipURL: func() *url.URL {
+			url := *r.URL
+			q := url.Query()
+			q.Set(zipKey, zipValue)
+			url.RawQuery = q.Encode()
+			return &url
+		}(),
+		Files: func() (out []directoryListingFileData) {
+			for _, d := range files {
+				name := d.Name()
+				if d.IsDir() {
+					name += "/"
+				}
+				fileData := directoryListingFileData{
+					Name:  name,
+					IsDir: d.IsDir(),
+					Size:  fileSizeBytes(d.Size()),
+					URL: func() *url.URL {
+						url := *r.URL
+						path := filepath.Join(url.Path, name)
+						if d.IsDir() {
+							path += "/"
+						}
+						url.Path = path
+						return &url
+					}(),
+				}
+				out = append(out, fileData)
+			}
+			return out
+		}(),
+	})
 }
 
 // ServeHTTP is http.Handler.ServeHTTP

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = 1.2.2`
	`1`	`+VERSION = 1.3.0`
`2`	`2`
`3`	`3`	`APP := http-file-server`
`4`	`4`	`PACKAGES := $(shell go list -f {{.Dir}} ./...)`