feat: add ?download to file in download mode

Author: marjune163

src/serverHandler/content.go

@@ -3,6 +3,7 @@ package serverHandler
 import (
 	"../util"
 	"net/http"
+	"net/url"
 	"os"
 	"strconv"
 	"time"
@@ -16,7 +17,7 @@ func (h *handler) content(w http.ResponseWriter, r *http.Request, data *response
 	header := w.Header()
 	header.Set("X-Content-Type-Options", "nosniff")
 	if data.IsDownload {
-		header.Set("Content-Disposition", "attachment; filename*=UTF-8''"+data.ItemName)
+		header.Set("Content-Disposition", "attachment; filename*=UTF-8''"+url.PathEscape(data.ItemName))
 	}
 
 	item := data.Item

src/serverHandler/page.go

@@ -16,7 +16,6 @@ const TypeFile = template.HTML("file")
 func updateSubItemsHtml(data *responseData) {
 	length := len(data.SubItems)
 	data.SubItemsHtml = make([]*itemHtml, length)
-	dirQueryString := data.Context.QueryString()
 
 	for i, info := range data.SubItems {
 		name := info.Name()
@@ -30,11 +29,11 @@ func updateSubItemsHtml(data *responseData) {
 		if info.IsDir() {
 			displayName = tplutil.FormatFilename(name) + "/"
 			typ = TypeDir
-			url = data.SubItemPrefix + urlEscapedName + "/" + dirQueryString
+			url = data.SubItemPrefix + urlEscapedName + "/" + data.Context.QueryString()
 		} else {
 			displayName = tplutil.FormatFilename(name)
 			typ = TypeFile
-			url = data.SubItemPrefix + urlEscapedName
+			url = data.SubItemPrefix + urlEscapedName + data.Context.FileQueryString()
 			readableSize = tplutil.FormatSize(info.Size())
 		}
 

src/serverHandler/pathContext.go

@@ -12,19 +12,27 @@ func (ctx *pathContext) QueryString() string {
 	buffer[0] = '?'
 
 	if ctx.download {
-		buffer = append(buffer, []byte("download&")...)
+		buffer = append(buffer, []byte("download&")...) // 9 bytes
 	}
 
 	if ctx.sort != nil && *(ctx.sort) != ctx.defaultSort {
-		buffer = append(buffer, []byte("sort=")...)
-		buffer = append(buffer, []byte(*ctx.sort)...)
-		buffer = append(buffer, '&')
+		buffer = append(buffer, []byte("sort=")...)   // 5 bytes
+		buffer = append(buffer, []byte(*ctx.sort)...) // 2 bytes
+		buffer = append(buffer, '&')                  // 1 byte
 	}
 
 	buffer = buffer[:len(buffer)-1]
 	return string(buffer)
 }
 
+func (ctx *pathContext) FileQueryString() string {
+	if ctx.download {
+		return "?download"
+	}
+
+	return ""
+}
+
 func (ctx *pathContext) QueryStringOfSort(sort string) string {
 	copiedCtx := *ctx
 	copiedCtx.sort = &sort