neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get extra field working, fix a few error messages

This commit is contained in:
Neale Pickett 2024-01-03 15:56:20 -07:00
parent 58f60e4598
commit ce0862372c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/transpile/puzzle.go
View File

@ -101,14 +101,15 @@ type StaticPuzzle struct {
Attachments []StaticAttachment Attachments []StaticAttachment
Scripts []StaticAttachment Scripts []StaticAttachment
AnswerPattern string AnswerPattern string
Answers []string
Debug PuzzleDebug
Extra map[string]any
Objective string Objective string
Success struct { Success struct {
Acceptable string Acceptable string
Mastery string Mastery string
} }
KSAs []string KSAs []string
Debug PuzzleDebug
Answers []string
} }
// StaticAttachment carries information about an attached file. // StaticAttachment carries information about an attached file.
@ -209,6 +210,7 @@ func (fp FsPuzzle) Puzzle() (Puzzle, error) {
puzzle.Debug = static.Debug puzzle.Debug = static.Debug
puzzle.Answers = static.Answers puzzle.Answers = static.Answers
puzzle.Authors = static.Authors puzzle.Authors = static.Authors
puzzle.Extra = static.Extra
puzzle.Objective = static.Objective puzzle.Objective = static.Objective
puzzle.KSAs = static.KSAs puzzle.KSAs = static.KSAs
puzzle.Success = static.Success puzzle.Success = static.Success
@ -246,7 +248,7 @@ func (fp FsPuzzle) Open(name string) (ReadSeekCloser, error) {
} }
} }
if fsPath == "" { if fsPath == "" {
return empty, fmt.Errorf("Not listed in attachments or scripts: %s", name) return empty, fmt.Errorf("not listed in attachments or scripts: %s", name)
} }
return fp.fs.Open(fsPath) return fp.fs.Open(fsPath)
@ -332,7 +334,7 @@ func rfc822HeaderParser(r io.Reader) (StaticPuzzle, error) {
p := StaticPuzzle{} p := StaticPuzzle{}
m, err := mail.ReadMessage(r) m, err := mail.ReadMessage(r)
if err != nil { if err != nil {
return p, fmt.Errorf("Parsing RFC822 headers: %v", err) return p, fmt.Errorf("parsing RFC822 headers: %v", err)
} }
for key, val := range m.Header { for key, val := range m.Header {
@ -363,7 +365,7 @@ func rfc822HeaderParser(r io.Reader) (StaticPuzzle, error) {
case "success.mastery": case "success.mastery":
p.Success.Mastery = val[0] p.Success.Mastery = val[0]
default: default:
return p, fmt.Errorf("Unknown header field: %s", key) return p, fmt.Errorf("unknown header field: %s", key)
} }
} }