Do not store empty files

[uploader.git] / src / uploader / main.go
diff --git a/src/uploader/main.go b/src/uploader/main.go

index c3f4e23f44044b5f9d4792a12837389eda19511b..a1465cd663bfbe5b75807e2d06c1e697d5cdce48 100644 (file)
--- a/src/uploader/main.go
+++ b/src/uploader/main.go
@@ -18,20 +18,24 @@ import (
         "os"
         "time"
  
-       "golang.org/x/crypto/blake2s"
+       "golang.org/x/crypto/blake2b"
         "golang.org/x/net/netutil"
  )
  
  const (
-       WriteBufSize  = 1 << 20
-       FileFieldName = "fileupload"
+       WriteBufSize     = 1 << 20
+       FileFieldName    = "fileupload"
+       CommentFieldName = "comment"
  )
  
  var (
         Index = template.Must(template.New("index").Parse(`<html>
  <head><title>Upload</title></head><body>
  <form enctype="multipart/form-data" action="/upload/" method="post">
-<input type="file" name="{{.}}" /><input type="submit" />
+<input type="file" name="{{.}}" /><br/>
+<label for="comment">Optional comment:</label>
+<textarea name="comment" cols="80" rows="25" name="comment"></textarea><br/>
+<input type="submit" />
  </form></body></html>`))
  )
  
@@ -57,7 +61,7 @@ func upload(w http.ResponseWriter, r *http.Request) {
                 log.Println(r.RemoteAddr, "non file form field")
                 return
         }
-       h, err := blake2s.New256(nil)
+       h, err := blake2b.New256(nil)
         if err != nil {
                 panic(err)
         }
@@ -75,6 +79,13 @@ func upload(w http.ResponseWriter, r *http.Request) {
                 fd.Close()
                 return
         }
+       if n == 0 {
+               log.Println(r.RemoteAddr, fn, p.FileName(), "empty")
+               os.Remove(fn + ".part")
+               fd.Close()
+               fmt.Fprintf(w, "Empty file")
+               return
+       }
         if err = fdBuf.Flush(); err != nil {
                 log.Println(r.RemoteAddr, fn, p.FileName(), err)
                 fd.Close()
@@ -86,8 +97,18 @@ func upload(w http.ResponseWriter, r *http.Request) {
                 log.Println(r.RemoteAddr, fn, p.FileName(), n, sum, err)
                 return
         }
-       fmt.Fprintf(w, "bytes: %d\nBLAKE2s: %s\n", n, sum)
+       fmt.Fprintf(w, "Timestamp: %s\nBytes: %d\nBLAKE2b: %s\n", fn, n, sum)
         log.Println(r.RemoteAddr, fn, p.FileName(), n, sum)
+       p, err = mr.NextPart()
+       if err != nil || p.FormName() != CommentFieldName {
+               return
+       }
+       comment, err := ioutil.ReadAll(p)
+       if err != nil || len(comment) == 0 {
+               return
+       }
+       ioutil.WriteFile(fn+".txt", comment, os.FileMode(0600))
+       go notify(fn, n, string(comment))
  }
  
  func main() {