Allow multiple uploads

main.go

@@ -92,7 +92,7 @@ func parseUser(r *http.Request) UserInfo {
 
 type UploadData struct {
 	User    UserInfo
-	Result Result
+	Results []Result
 }
 
 func returnResult(w http.ResponseWriter, templateName string, data interface{}) error {
@@ -129,59 +129,95 @@ func main() {
 		if r.Method == "POST" {
 			user := parseUser(r)
 
-			r.ParseMultipartForm(32 << 20)
-			file, header, err := r.FormFile("file")
+			err := r.ParseMultipartForm(32 << 20)
+			if err != nil {
+				if err = returnResult(w, "upload.html", UploadData{
+					user,
+					[]Result{{
+						Success: false,
+						Errors:  []string{err.Error()},
+					}},
+				}); err != nil {
+					panic(err)
+				}
+			}
+
+			var images []Image
+			var ids []string
+
+			m := r.MultipartForm
+			files := m.File["file"]
+			for _, header := range files {
+				file, err := header.Open()
+				if err != nil {
+					if err = returnResult(w, "upload.html", UploadData{
+						user,
+						[]Result{{
+							Success: false,
+							Errors:  []string{err.Error()},
+						}},
+					}); err != nil {
+						panic(err)
+					}
+					return
+				}
 				image, err := createImage(&config, file, header)
 				if err != nil {
-				returnResult(w, "upload.html", UploadData{
+					if err = returnResult(w, "upload.html", UploadData{
 						user,
-					Result{
-						Id:      "",
+						[]Result{{
 							Success: false,
 							Errors:  []string{err.Error()},
-					},
-				})
+						}},
+					}); err != nil {
+						panic(err)
+					}
 					return
 				}
 
+				images = append(images, image)
+				ids = append(ids, image.Id)
+			}
+
+			pubsub := client.Subscribe(config.ResultChannel)
+
+			for _, image := range images {
 				_, err = db.Exec("INSERT INTO images (id, owner, created_at, original_name, type) VALUES ($1, $2, $3, $4, $5)", image.Id, user.Id, image.CreatedAt, image.OriginalName, image.MimeType)
 				if err != nil {
 					panic(err)
 				}
 
-			fmt.Printf("Created task %s at %d\n", image.Id, time.Now().Unix())
-
-			data, err := json.Marshal(image)
+				data, err := json.Marshal(images)
 				if err != nil {
 					if err = returnResult(w, "upload.html", UploadData{
 						user,
-					Result{
-						Id:      image.Id,
+						[]Result{{
 							Success: false,
 							Errors:  []string{err.Error()},
-					},
+						}},
 					}); err != nil {
 						panic(err)
 					}
 					return
 				}
 
-			pubsub := client.Subscribe(config.ResultChannel)
+				fmt.Printf("Created task %s at %d\n", image.Id, time.Now().Unix())
 				client.RPush(fmt.Sprintf("queue:%s", config.ImageQueue), data)
-
 				fmt.Printf("Submitted task %s at %d\n", image.Id, time.Now().Unix())
+			}
+
+			var results []Result
 
-			waiting := true
-			for waiting {
+			var waiting map[string]bool
+			for len(waiting) != 0 {
 				message, err := pubsub.ReceiveMessage()
 				if err != nil {
 					if err = returnResult(w, "upload.html", UploadData{
 						user,
-						Result{
-							Id:      image.Id,
+						[]Result{{
 							Success: false,
 							Errors:  []string{err.Error()},
-						},
+						}},
 					}); err != nil {
 						panic(err)
 					}
@@ -193,11 +229,10 @@ func main() {
 				if err != nil {
 					if err = returnResult(w, "upload.html", UploadData{
 						user,
-						Result{
-							Id:      image.Id,
+						[]Result{{
 							Success: false,
 							Errors:  []string{err.Error()},
-						},
+						}},
 					}); err != nil {
 						panic(err)
 					}
@@ -206,23 +241,25 @@ func main() {
 
 				fmt.Printf("Returned task %s at %d\n", result.Id, time.Now().Unix())
 
-				if result.Id == image.Id {
-					waiting = false
+				if _, ok := waiting[result.Id]; ok {
+					delete(waiting, result.Id)
+
+					results = append(results, result)
+				}
+			}
 
 			if err = returnResult(w, "upload.html", UploadData{
 				user,
-						result,
+				results,
 			}); err != nil {
 				panic(err)
 			}
 			return
-				}
-			}
 		} else {
 			user := parseUser(r)
 			if err = returnResult(w, "upload.html", UploadData{
 				user,
-				Result{},
+				[]Result{},
 			}); err != nil {
 				panic(err)
 			}

templates/upload.html

@@ -11,15 +11,15 @@
     <a href="/upload">Upload</a>
 </p>
 
-{{ if .Result.Id }}
-    {{ if .Result.Success }}
+{{ range .Results }}
+{{ if .Success }}
 <div class="info success">
-            <h2>Upload of {{ .Result.Id }} finished. <a href="/i/{{ .Result.Id }}">View</a>.</h2>
+    <h2>Upload of {{ .Id }} finished. <a href="/i/{{ .Id }}">View</a>.</h2>
 </div>
 {{ else }}
 <div class="info error">
-            <h2>Upload of {{ .Result.Id }} failed.</h2>
-            {{ range .Result.Errors }}
+    <h2>Upload of {{ .Id }} failed.</h2>
+{{ range .Errors }}
     <pre>{{ . }}</pre>
 {{ end }}
 </div>