fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

libfic: Type key is now Label

Browse source
This commit is contained in:
nemunaire 2017-12-12 05:06:34 +01:00 • committed by Pierre-Olivier Mercier
parent a1c6eadbe5
commit 9a9d5fcda4
5 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

51
admin/api/exercice.go
View file

@ -113,23 +113,6 @@ func createExercice(theme fic.Theme, body []byte) (interface{}, error) {
return theme.AddExercice(ue.Title, ue.Path, ue.Statement, depend, ue.Gain, ue.VideoURI)
}
type uploadedKey struct {
Type string
Key string
}
func createExerciceKey(exercice fic.Exercice, body []byte) (interface{}, error) {
var uk uploadedKey
if err := json.Unmarshal(body, &uk); err != nil {
return nil, err
}
if len(uk.Key) == 0 {
return nil, errors.New("Key not filled")
}
return exercice.AddRawKey(uk.Type, uk.Key)
}
type uploadedHint struct {
Title string
@ -185,28 +168,46 @@ func deleteExerciceHint(hint fic.EHint, _ []byte) (interface{}, error) {
}
type uploadedKey struct {
Label string
Key string
Hash []byte
}
func createExerciceKey(exercice fic.Exercice, body []byte) (interface{}, error) {
var uk uploadedKey
if err := json.Unmarshal(body, &uk); err != nil {
return nil, err
}
if len(uk.Key) == 0 {
return nil, errors.New("Key not filled")
}
return exercice.AddRawKey(uk.Label, uk.Key)
}
func showExerciceKey(key fic.Key, _ fic.Exercice, body []byte) (interface{}, error) {
return key, nil
}
func updateExerciceKey(key fic.Key, exercice fic.Exercice, body []byte) (interface{}, error) {
var uk fic.Key
var uk uploadedKey
if err := json.Unmarshal(body, &uk); err != nil {
return nil, err
}
uk.Id = key.Id
uk.IdExercice = exercice.Id
if len(uk.Type) == 0 {
uk.Type = "Flag"
if len(uk.Label) == 0 {
key.Label = "Flag"
} else {
key.Label = uk.Label
}
if _, err := uk.Update(); err != nil {
if _, err := key.Update(); err != nil {
return nil, err
}
return uk, nil
return key, nil
}
func deleteExerciceKey(key fic.Key, _ fic.Exercice, _ []byte) (interface{}, error) {

4
admin/static/views/exercice.html
View file

@ -84,9 +84,9 @@
<div class="list-group">
<form ng-submit="saveKey()" class="list-group-item form-horizontal" ng-repeat="key in keys">
<div class="form-group" id="key-{{key.id}}">
<label for="ktype{{key.id}}" class="col-xs-2 control-label">Intitulé</label>
<label for="klabel{{key.id}}" class="col-xs-2 control-label">Intitulé</label>
<div class="col-xs-8">
<input type="text" id="ktype{{key.id}}" ng-model="key.type" class="form-control">
<input type="text" id="klabel{{key.id}}" ng-model="key.type" class="form-control">
</div>
<div class="col-xs-1" ng-show="key.id">
<a ng-click="deleteKey()" class="btn btn-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a>

2
libfic/exercice.go
View file

@ -214,7 +214,7 @@ func (e Exercice) CheckResponse(resps map[string]string, t Team) (bool, error) {
valid := true
for _, key := range keys {
if res, ok := resps[key.Type]; !ok {
if res, ok := resps[key.Label]; !ok {
valid = false
} else if !key.Check(res) {
if !PartialValidation || t.HasPartiallySolved(key) == nil {

6
libfic/key.go
View file

@ -9,7 +9,7 @@ import (
type Key struct {
Id int64 `json:"id"`
IdExercice int64 `json:"idExercice"`
Type string `json:"type"`
Label string `json:"type"`
Checksum []byte `json:"value"`
}
@ -24,7 +24,7 @@ func (e Exercice) GetKeys() ([]Key, error) {
var k Key
k.IdExercice = e.Id
if err := rows.Scan(&k.Id, &k.IdExercice, &k.Type, &k.Checksum); err != nil {
if err := rows.Scan(&k.Id, &k.IdExercice, &k.Label, &k.Checksum); err != nil {
return nil, err
}
keys = append(keys, k)
@ -58,7 +58,7 @@ func (e Exercice) AddKey(name string, checksum []byte) (Key, error) {
}
func (k Key) Update() (int64, error) {
if res, err := DBExec("UPDATE exercice_keys SET id_exercice = ?, type = ?, cksum = ? WHERE id_key = ?", k.IdExercice, k.Type, k.Checksum, k.Id); err != nil {
if res, err := DBExec("UPDATE exercice_keys SET id_exercice = ?, type = ?, cksum = ? WHERE id_key = ?", k.IdExercice, k.Label, k.Checksum, k.Id); err != nil {
return 0, err
} else if nb, err := res.RowsAffected(); err != nil {
return 0, err

4
libfic/team_my.go
View file

@ -130,9 +130,9 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
} else {
for _, k := range keys {
if t == nil {
exercice.Keys = append(exercice.Keys, fmt.Sprintf("%x", k.Checksum)+k.Type)
exercice.Keys = append(exercice.Keys, fmt.Sprintf("%x", k.Checksum)+k.Label)
} else {
exercice.Keys = append(exercice.Keys, k.Type)
exercice.Keys = append(exercice.Keys, k.Label)
if PartialValidation {
exercice.SolvedMat = append(exercice.SolvedMat, t.HasPartiallySolved(k) != nil)
}