frontend: refactor submission handlers

This commit is contained in:
nemunaire 2017-11-22 01:52:08 +01:00 committed by Pierre-Olivier Mercier
parent 69ffb48a26
commit 0d7d49e033
8 changed files with 187 additions and 190 deletions

View file

@ -9,34 +9,31 @@ import (
"path"
)
func saveTeamFile(dirname string, team string, filename string, w http.ResponseWriter, r *http.Request) bool {
if _, err := os.Stat(path.Join(dirname, team)); os.IsNotExist(err) || len(team) < 1 || team[0] == '_' {
var SubmissionDir string
var TmpSubmissionDir string
func saveTeamFile(p string, w http.ResponseWriter, r *http.Request) bool {
if len(SubmissionDir) < 1 || len(p) < 1 {
http.Error(w, "{\"errmsg\":\"Requête invalide.\"}", http.StatusBadRequest)
return false
} else {
if len(filename) <= 0 {
log.Println("EMPTY $EXERCICE RECEIVED:", filename)
http.Error(w, "{\"errmsg\":\"Internal server error. Please retry in few seconds.\"}", http.StatusInternalServerError)
return false
}
} else if len(p) <= 0 {
log.Println("EMPTY $EXERCICE RECEIVED:", p)
http.Error(w, "{\"errmsg\":\"Internal server error. Please retry in few seconds.\"}", http.StatusInternalServerError)
return false
} else if _, err := os.Stat(path.Join(SubmissionDir, p)); !os.IsNotExist(err) {
// Previous submission not treated
if _, err := os.Stat(path.Join(SubmissionDir, team, filename)); !os.IsNotExist(err) {
http.Error(w, "{\"errmsg\":\"Du calme ! une requête est déjà en cours de traitement.\"}", http.StatusPaymentRequired)
return false
}
if err := saveFile(path.Join(SubmissionDir, team), filename, r); err != nil {
log.Println("Unable to handle submission file:", err)
http.Error(w, "{\"errmsg\":\"Internal server error. Please retry in few seconds.\"}", http.StatusInternalServerError)
return false
}
return true
http.Error(w, "{\"errmsg\":\"Du calme ! une requête est déjà en cours de traitement.\"}", http.StatusPaymentRequired)
return false
} else if err := saveFile(path.Join(SubmissionDir, p), r); err != nil {
log.Println("Unable to handle submission file:", err)
http.Error(w, "{\"errmsg\":\"Internal server error. Please retry in few seconds.\"}", http.StatusInternalServerError)
return false
}
return true
}
func saveFile(dirname string, filename string, r *http.Request) error {
func saveFile(p string, r *http.Request) error {
dirname := path.Dir(p)
if _, err := os.Stat(dirname); os.IsNotExist(err) {
if err := os.MkdirAll(dirname, 0755); err != nil {
return err
@ -57,12 +54,9 @@ func saveFile(dirname string, filename string, r *http.Request) error {
writer.Flush()
tmpfile.Close()
if filename == "" {
filename = path.Base(tmpfile.Name())
}
if err := os.Rename(tmpfile.Name(), path.Join(dirname, filename)); err != nil {
if err := os.Rename(tmpfile.Name(), p); err != nil {
log.Println("[ERROR] Unable to move file: ", err)
return err
}
return nil