X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=src%2Fuploader%2Fmain.go;h=74be1fe75c098b090e780996e964c1957e6e6e19;hb=3034d90441b9874b3b8d4b07753bde0d80e438fb;hp=43794c63f18fed4ae88d1848083ae0a9ac60baf2;hpb=ba3dcfbc5909e36646408b2c396ee7324b6f6fb1;p=uploader.git
diff --git a/src/uploader/main.go b/src/uploader/main.go
index 43794c6..74be1fe 100644
--- a/src/uploader/main.go
+++ b/src/uploader/main.go
@@ -10,7 +10,9 @@ import (
"encoding/hex"
"flag"
"fmt"
+ "html/template"
"io"
+ "log"
"net"
"net/http"
"os"
@@ -21,36 +23,44 @@ import (
)
const (
- WriteBufSize = 1 << 20
+ WriteBufSize = 1 << 20
+ FileFieldName = "fileupload"
)
-func upload(w http.ResponseWriter, r *http.Request) {
- if r.Method == http.MethodGet {
- w.Write([]byte(`
+var (
+ Index = template.Must(template.New("index").Parse(`
Upload
`))
+)
+
+func upload(w http.ResponseWriter, r *http.Request) {
+ log.Println(r.RemoteAddr, "connected")
+ if r.Method == http.MethodGet {
+ if err := Index.Execute(w, FileFieldName); err != nil {
+ log.Println(r.RemoteAddr, err)
+ }
return
}
mr, err := r.MultipartReader()
if err != nil {
- fmt.Println(err)
+ log.Println(r.RemoteAddr, err)
return
}
p, err := mr.NextPart()
if err != nil {
- fmt.Println(err)
+ log.Println(r.RemoteAddr, err)
return
}
- if p.FormName() != "fileupload" {
- fmt.Println("non file form field")
+ if p.FormName() != FileFieldName {
+ log.Println(r.RemoteAddr, "non file form field")
return
}
- now := time.Now()
- fd, err := os.OpenFile(now.Format(time.RFC3339Nano), os.O_WRONLY|os.O_CREATE, 0600)
+ fn := time.Now().Format(time.RFC3339Nano)
+ fd, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE, 0600)
if err != nil {
- fmt.Println(err)
+ log.Println(r.RemoteAddr, fn, p.FileName(), err)
return
}
defer fd.Close()
@@ -62,14 +72,16 @@ func upload(w http.ResponseWriter, r *http.Request) {
mw := io.MultiWriter(fdBuf, h)
n, err := io.Copy(mw, p)
if err != nil {
- fmt.Println(err)
+ log.Println(r.RemoteAddr, fn, p.FileName(), err)
return
}
if err = fdBuf.Flush(); err != nil {
- fmt.Println(err)
+ log.Println(r.RemoteAddr, fn, p.FileName(), err)
return
}
- fmt.Fprintf(w, "bytes: %d\nBLAKE2s: %s\n", n, hex.EncodeToString(h.Sum(nil)))
+ sum := hex.EncodeToString(h.Sum(nil))
+ fmt.Fprintf(w, "bytes: %d\nBLAKE2s: %s\n", n, sum)
+ log.Println(r.RemoteAddr, fn, p.FileName(), n, sum)
}
func main() {
@@ -80,7 +92,7 @@ func main() {
if err != nil {
panic(err)
}
- fmt.Println("listening on", *bind)
+ log.Println("listening", *bind)
ln = netutil.LimitListener(ln, *conns)
s := &http.Server{
ReadHeaderTimeout: 10 * time.Second,