Allow uploading multiple files at once

from sgreben#11

Author: noobcode73

README.md

@@ -131,7 +131,7 @@ You can set Basic authorization for a single route using the format `user:passwd
 $ ./http-file-server admin:1234@/home=/tmp/home
 ```
 
-Nore: The `--user` and `--passwd` arguments will be ignored.
+Note: The `--user` and `--passwd` arguments will be ignored.
 
 For example:
 ```sh

main.go

@@ -101,14 +101,16 @@ func main() {
 
 func server(addr string, routes routes) error {
 	// check exist folder templates
-	if stat, err := os.Stat(customTemplateFlag); os.IsNotExist(err) || stat.IsDir() == false {
-		log.Printf("Wrong path to folder with custom templates: %s\n", customTemplateFlag)
-		customTemplateFlag = ""
-	} else {
-		if string(customTemplateFlag[len(customTemplateFlag)-1]) == osPathSeparator {
-			customTemplateFlag = strings.TrimSuffix(customTemplateFlag, osPathSeparator)
+	if customTemplateFlag != "" {
+		if stat, err := os.Stat(customTemplateFlag); os.IsNotExist(err) || stat.IsDir() == false {
+			log.Printf("Wrong path to folder with custom templates: %s\n", customTemplateFlag)
+			customTemplateFlag = ""
+		} else {
+			if string(customTemplateFlag[len(customTemplateFlag)-1]) == osPathSeparator {
+				customTemplateFlag = strings.TrimSuffix(customTemplateFlag, osPathSeparator)
+			}
+			log.Printf("Added custom templates: %s", customTemplateFlag)
 		}
-		log.Printf("Added custom templates: %s", customTemplateFlag)
 	}
 
 	mux := http.DefaultServeMux

server.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"github.com/dastoori/higgs"
+	"io"
 	"path/filepath"
 	"strconv"
 )
 
 import (
 	"fmt"
 	"html/template"
-	"io"
 	"log"
 	"math"
 	"net/http"
@@ -75,7 +75,7 @@ const directoryListingTemplateText = `
 	</tr>
 	{{- end }}
 	{{- if .AllowUpload }}
-	<tr><td colspan=4><form method="post" enctype="multipart/form-data"><input required name="file" type="file"/><input value="Upload" type="submit"/></form></td></tr>
+	<tr><td colspan=4><form method="post" enctype="multipart/form-data"><input required name="file" type="file multiple"/><input value="Upload" type="submit"/></form></td></tr>
 	{{- end }}
 	</tbody>
 </table>
@@ -311,26 +311,27 @@ func (f *fileHandler) serveDir(w http.ResponseWriter, r *http.Request, osPath st
 }
 
 func (f *fileHandler) serveUploadTo(w http.ResponseWriter, r *http.Request, osPath string) error {
-	if err := r.ParseForm(); err != nil {
-		return err
-	}
-	in, h, err := r.FormFile("file")
-	if err == http.ErrMissingFile {
-		w.Header().Set("Location", r.URL.String())
-		w.WriteHeader(303)
-	}
-	if err != nil {
-		return err
-	}
-	outPath := filepath.Join(osPath, filepath.Base(h.Filename))
-	out, err := os.OpenFile(outPath, os.O_CREATE|os.O_WRONLY, 0600)
+	mr, err := r.MultipartReader()
 	if err != nil {
 		return err
 	}
-	defer out.Close()
-
-	if _, err := io.Copy(out, in); err != nil {
-		return err
+	for {
+		part, err := mr.NextPart()
+		if err == io.EOF {
+			break
+		} else if err != nil {
+			return err
+		} else if part.FormName() == "file" {
+			outPath := filepath.Join(osPath, filepath.Base(part.FileName()))
+			out, err := os.OpenFile(outPath, os.O_CREATE|os.O_WRONLY, 0600)
+			if err != nil {
+				return err
+			}
+			defer out.Close()
+			if _, err := io.Copy(out, part); err != nil {
+				return err
+			}
+		}
 	}
 	w.Header().Set("Location", r.URL.String())
 	w.WriteHeader(303)

templates/base.html

@@ -106,7 +106,7 @@
                     <form class="row m-0" method="post" enctype="multipart/form-data">
                         <div class="input-group mb-3">
                             <input class="form-control form-control" id="formFileSm" required name="file" type="file"
-                                   aria-describedby="button-upload">
+                                   multiple aria-describedby="button-upload">
                             <button type="submit" class="btn btn-outline-success" value="Upload" id="button-upload">
                                 <i class="bi bi-cloud-plus" data-toggle="tooltip" title="Upload"></i>
                             </button>