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

sync: Prefer challenge.toml over challenge.txt
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
nemunaire 2024-05-16 11:10:30 +02:00
parent b5065df4c3
commit 651d428223
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/get-remote-files/main.go
View File

@ -73,7 +73,7 @@ func main() {
func treatDir(p string) { func treatDir(p string) {
var expath string var expath string
for _, f := range []string{"challenge.txt", "challenge.toml"} { for _, f := range []string{"challenge.toml", "challenge.txt"} {
if sync.GlobalImporter.Exists(path.Join(p, f)) { if sync.GlobalImporter.Exists(path.Join(p, f)) {
expath = p expath = p
break break
@ -108,7 +108,7 @@ func treatExercice(expath string) {
paramsFiles, err := sync.GetExerciceFilesParams(sync.GlobalImporter, exercice) paramsFiles, err := sync.GetExerciceFilesParams(sync.GlobalImporter, exercice)
if err != nil { if err != nil {
log.Printf("Unable to read challenge.txt %q: %s", expath, err.Error()) log.Printf("Unable to read challenge.toml %q: %s", expath, err.Error())
return return
} }

8
admin/sync/errors.go
View File

@ -106,9 +106,9 @@ func NewChallengeTxtError(exercice *fic.Exercice, line uint, err error, theme ..
func (e *ChallengeTxtError) Error() string { func (e *ChallengeTxtError) Error() string {
if e.ChallengeTxtLine != 0 { if e.ChallengeTxtLine != 0 {
return fmt.Sprintf("%s:%d: %s", path.Join(e.ExercicePath, "challenge.txt"), e.ChallengeTxtLine, e.ThemeError.error.Error()) return fmt.Sprintf("%s:%d: %s", path.Join(e.ExercicePath, "challenge.toml"), e.ChallengeTxtLine, e.ThemeError.error.Error())
} else { } else {
return fmt.Sprintf("%s: %s", path.Join(e.ExercicePath, "challenge.txt"), e.ThemeError.error.Error()) return fmt.Sprintf("%s: %s", path.Join(e.ExercicePath, "challenge.toml"), e.ThemeError.error.Error())
} }
} }
@ -127,7 +127,7 @@ func NewHintError(exercice *fic.Exercice, hint *fic.EHint, line int, err error,
} }
func (e *HintError) Error() string { func (e *HintError) Error() string {
return fmt.Sprintf("%s: hint#%d (%s): %s", path.Join(e.ExercicePath, "challenge.txt"), e.HintId, e.HintTitle, e.ThemeError.error.Error()) return fmt.Sprintf("%s: hint#%d (%s): %s", path.Join(e.ExercicePath, "challenge.toml"), e.HintId, e.HintTitle, e.ThemeError.error.Error())
} }
type FlagError struct { type FlagError struct {
@ -144,5 +144,5 @@ func NewFlagError(exercice *fic.Exercice, flag *ExerciceFlag, line int, err erro
} }
func (e *FlagError) Error() string { func (e *FlagError) Error() string {
return fmt.Sprintf("%s: flag#%d: %s", path.Join(e.ExercicePath, "challenge.txt"), e.FlagId, e.ThemeError.error.Error()) return fmt.Sprintf("%s: flag#%d: %s", path.Join(e.ExercicePath, "challenge.toml"), e.FlagId, e.ThemeError.error.Error())
} }

8
admin/sync/exceptions_test.go
View File

@ -26,10 +26,10 @@ const sampleFile = `0-exercice-1/overview.md:spelling:Sterik
0-exercice-1/resolution.md:11:typo_guillemets_typographiques_doubles_fermants 0-exercice-1/resolution.md:11:typo_guillemets_typographiques_doubles_fermants
0-exercice-1/resolution.md:spelling:cronjob 0-exercice-1/resolution.md:spelling:cronjob
0-exercice-1/resolution.md:spelling:Level 0-exercice-1/resolution.md:spelling:Level
challenge.txt:spelling:time challenge.toml:spelling:time
challenge.txt:spelling:ago challenge.toml:spelling:ago
0-exercice-1/resolution.md:spelling:SCL 0-exercice-1/resolution.md:spelling:SCL
challenge.txt:spelling:SCL` challenge.toml:spelling:SCL`
func TestLoadExceptions(t *testing.T) { func TestLoadExceptions(t *testing.T) {
exceptions := ParseExceptionString(sampleFile, nil) exceptions := ParseExceptionString(sampleFile, nil)
@ -47,7 +47,7 @@ func TestFilterExceptions(t *testing.T) {
t.Fatalf("Expected 1 exceptions, got %d", len(*filteredExceptions)) t.Fatalf("Expected 1 exceptions, got %d", len(*filteredExceptions))
} }
filteredExceptions = exceptions.GetFileExceptions("challenge.txt") filteredExceptions = exceptions.GetFileExceptions("challenge.toml")
if len(*filteredExceptions) != 3 { if len(*filteredExceptions) != 3 {
t.Fatalf("Expected 3 exceptions, got %d", len(*filteredExceptions)) t.Fatalf("Expected 3 exceptions, got %d", len(*filteredExceptions))
} }

4
admin/sync/exercice_hints.go
View File

@ -121,7 +121,7 @@ func buildExerciceHints(i Importer, exercice *fic.Exercice, exceptions *CheckExc
// CheckExerciceHints checks if all hints are corrects.. // CheckExerciceHints checks if all hints are corrects..
func CheckExerciceHints(i Importer, exercice *fic.Exercice, exceptions *CheckExceptions) ([]importHint, error) { func CheckExerciceHints(i Importer, exercice *fic.Exercice, exceptions *CheckExceptions) ([]importHint, error) {
exceptions = exceptions.GetFileExceptions("challenge.txt", "challenge.toml") exceptions = exceptions.GetFileExceptions("challenge.toml", "challenge.txt")
hints, errs := buildExerciceHints(i, exercice, exceptions) hints, errs := buildExerciceHints(i, exercice, exceptions)
@ -139,7 +139,7 @@ func SyncExerciceHints(i Importer, exercice *fic.Exercice, flagsBindings map[int
if _, err := exercice.WipeHints(); err != nil { if _, err := exercice.WipeHints(); err != nil {
errs = multierr.Append(errs, err) errs = multierr.Append(errs, err)
} else { } else {
exceptions = exceptions.GetFileExceptions("challenge.txt", "challenge.toml") exceptions = exceptions.GetFileExceptions("challenge.toml", "challenge.txt")
hints, berrs := buildExerciceHints(i, exercice, exceptions) hints, berrs := buildExerciceHints(i, exercice, exceptions)
errs = multierr.Append(errs, berrs) errs = multierr.Append(errs, berrs)

4
admin/sync/exercice_keys.go
View File

@ -541,7 +541,7 @@ func buildExerciceFlags(i Importer, exercice *fic.Exercice, exceptions *CheckExc
// CheckExerciceFlags checks if all flags for the given challenge are correct. // CheckExerciceFlags checks if all flags for the given challenge are correct.
func CheckExerciceFlags(i Importer, exercice *fic.Exercice, files []string, exceptions *CheckExceptions) (rf []fic.Flag, errs error) { func CheckExerciceFlags(i Importer, exercice *fic.Exercice, files []string, exceptions *CheckExceptions) (rf []fic.Flag, errs error) {
exceptions = exceptions.GetFileExceptions("challenge.txt", "challenge.toml") exceptions = exceptions.GetFileExceptions("challenge.toml", "challenge.txt")
flags, flagsids, berrs := buildExerciceFlags(i, exercice, exceptions) flags, flagsids, berrs := buildExerciceFlags(i, exercice, exceptions)
errs = multierr.Append(errs, berrs) errs = multierr.Append(errs, berrs)
@ -634,7 +634,7 @@ func SyncExerciceFlags(i Importer, exercice *fic.Exercice, exceptions *CheckExce
} else if _, err := exercice.WipeMCQs(); err != nil { } else if _, err := exercice.WipeMCQs(); err != nil {
errs = multierr.Append(errs, err) errs = multierr.Append(errs, err)
} else { } else {
exceptions = exceptions.GetFileExceptions("challenge.txt", "challenge.toml") exceptions = exceptions.GetFileExceptions("challenge.toml", "challenge.txt")
flags, flagids, berrs := buildExerciceFlags(i, exercice, exceptions) flags, flagids, berrs := buildExerciceFlags(i, exercice, exceptions)
errs = multierr.Append(errs, berrs) errs = multierr.Append(errs, berrs)

2
admin/sync/exercices.go
View File

@ -280,7 +280,7 @@ func BuildExercice(i Importer, theme *fic.Theme, epath string, dmap *map[int64]*
e.WIP = p.WIP e.WIP = p.WIP
if p.WIP && !AllowWIPExercice { if p.WIP && !AllowWIPExercice {
errs = multierr.Append(errs, NewExerciceError(e, fmt.Errorf("exercice declared Work In Progress in challenge.txt"), theme)) errs = multierr.Append(errs, NewExerciceError(e, fmt.Errorf("exercice declared Work In Progress in challenge.toml"), theme))
} }
if p.Gain == 0 { if p.Gain == 0 {

2
repochecker/main.go
View File

@ -248,7 +248,7 @@ func main() {
nberr := 0 nberr := 0
theme, exceptions, errs := sync.BuildTheme(sync.GlobalImporter, p) theme, exceptions, errs := sync.BuildTheme(sync.GlobalImporter, p)
if theme != nil && !sync.GlobalImporter.Exists(path.Join(p, "challenge.txt")) && !sync.GlobalImporter.Exists(path.Join(p, "challenge.toml")) { if theme != nil && !sync.GlobalImporter.Exists(path.Join(p, "challenge.toml")) && !sync.GlobalImporter.Exists(path.Join(p, "challenge.txt")) {
thiserrors := multierr.Errors(errs) thiserrors := multierr.Errors(errs)
nberr += len(thiserrors) nberr += len(thiserrors)
for _, err := range thiserrors { for _, err := range thiserrors {