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

Move settings and started file into SETTINGS directory

Browse source
This commit is contained in:
nemunaire 2017-11-22 02:00:40 +01:00 • committed by Pierre-Olivier Mercier
parent 31d98285a4
commit f17541e252
7 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/api/settings.go
View file

@ -12,7 +12,7 @@ import (
"github.com/julienschmidt/httprouter"
)
var TeamsDir string
var SettingsDir string
func init() {
router.GET("/api/settings.json", apiHandler(getSettings))
@ -22,8 +22,8 @@ func init() {
}
func getSettings(_ httprouter.Params, body []byte) (interface{}, error) {
if settings.ExistsSettings(path.Join(TeamsDir, settings.SettingsFile)) {
return settings.ReadSettings(path.Join(TeamsDir, settings.SettingsFile))
if settings.ExistsSettings(path.Join(SettingsDir, settings.SettingsFile)) {
return settings.ReadSettings(path.Join(SettingsDir, settings.SettingsFile))
} else {
return settings.FICSettings{"Challenge FIC", "Laboratoire SRS, ÉPITA", time.Unix(0,0), time.Unix(0,0), time.Unix(0,0), fic.FirstBlood, fic.SubmissionCostBase, false, false, false, true, true}, nil
}
@ -35,7 +35,7 @@ func saveSettings(_ httprouter.Params, body []byte) (interface{}, error) {
return nil, err
}
if err := settings.SaveSettings(path.Join(TeamsDir, settings.SettingsFile), config); err != nil {
if err := settings.SaveSettings(path.Join(SettingsDir, settings.SettingsFile), config); err != nil {
return nil, err
} else {
return config, err