backend: treat file found in directory discovered + handle multiple keys + generate my.json
This commit is contained in:
parent
a01f463ee9
commit
70b6b30067
3 changed files with 63 additions and 26 deletions
|
|
@ -1,12 +1,16 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/base64"
|
||||
"encoding/binary"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"math/rand"
|
||||
"os"
|
||||
"path"
|
||||
"strconv"
|
||||
|
||||
"srs.epita.fr/fic-server/libfic"
|
||||
|
|
@ -18,6 +22,8 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
|
|||
id := "[" + base64.StdEncoding.EncodeToString(bid) + "]"
|
||||
log.Println(id, "New submission receive", pathname)
|
||||
|
||||
var keys map[string]string
|
||||
|
||||
if tid, err := strconv.Atoi(team_id); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
} else if eid, err := strconv.Atoi(exercice_id); err != nil {
|
||||
|
|
@ -26,30 +32,47 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
|
|||
log.Println(id, "[ERR]", err)
|
||||
} else if exercice, err := fic.GetExercice(eid); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
} else if file, err := os.Open(pathname); err != nil {
|
||||
} else if theme, err := exercice.GetTheme(); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
} else if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
} else if err := json.Unmarshal(cnt_raw, &keys); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
} else {
|
||||
defer file.Close()
|
||||
|
||||
cnt := ""
|
||||
scanner := bufio.NewScanner(file)
|
||||
for scanner.Scan() {
|
||||
cnt += scanner.Text()
|
||||
}
|
||||
|
||||
if solved, err := exercice.CheckResponse(cnt, team); err != nil {
|
||||
if solved, err := exercice.CheckResponse(keys, team); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
} else if solved {
|
||||
exercice.Solved(team)
|
||||
log.Printf("%s Team %d SOLVED exercice %d\n", id, team.Id, exercice.Id)
|
||||
log.Printf("%s Team %d SOLVED exercice %d (%s : %s)\n", id, team.Id, exercice.Id, theme.Name, exercice.Title)
|
||||
if err := os.Remove(pathname); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
}
|
||||
} else {
|
||||
log.Printf("%s Team %d submit an invalid solution for exercice %d\n", id, team.Id, exercice.Id)
|
||||
log.Printf("%s Team %d submit an invalid solution for exercice %d (%s : %s)\n", id, team.Id, exercice.Id, theme.Name, exercice.Title)
|
||||
if err := os.Remove(pathname); err != nil {
|
||||
log.Println(id, "[ERR]", err)
|
||||
}
|
||||
}
|
||||
genTeamMyFile(team)
|
||||
}
|
||||
}
|
||||
|
||||
func genTeamMyFile(team fic.Team) error {
|
||||
dirPath := path.Join(TeamsDir, fmt.Sprintf("%d", team.Id))
|
||||
|
||||
if s, err := os.Stat(dirPath); os.IsNotExist(err) {
|
||||
os.MkdirAll(dirPath, 0777)
|
||||
} else if ! s.IsDir() {
|
||||
return errors.New("dirPath is not a directory")
|
||||
}
|
||||
|
||||
if my, err := fic.MyJSONTeam(&team, true); err != nil {
|
||||
return err
|
||||
} else if j, err := json.Marshal(my); err != nil {
|
||||
return err
|
||||
} else if err := ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue