From 96567fe28870758e1fcdf627aa290b39f6d4274f Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Thu, 19 May 2022 16:39:24 +0200 Subject: [PATCH] sync: Handle overview.md and statement.md --- admin/sync/exercices.go | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/admin/sync/exercices.go b/admin/sync/exercices.go index b9c34373..de14d943 100644 --- a/admin/sync/exercices.go +++ b/admin/sync/exercices.go @@ -119,30 +119,42 @@ func BuildExercice(i Importer, theme *fic.Theme, epath string, dmap *map[int64]* e.Title = fixnbsp(e.Title) // Texts to format using Markdown - e.Overview, err = getFileContent(i, path.Join(epath, "overview.txt")) + if i.exists(path.Join(epath, "overview.txt")) { + e.Overview, err = getFileContent(i, path.Join(epath, "overview.txt")) + } else if i.exists(path.Join(epath, "overview.md")) { + e.Overview, err = getFileContent(i, path.Join(epath, "overview.md")) + } else { + err = fmt.Errorf("Unable to find overview.txt nor overview.md") + } if err != nil { errs = append(errs, fmt.Sprintf("%q: overview.txt: %s", edir, err)) } else { e.Overview = fixnbsp(e.Overview) if e.Overview, err = ProcessMarkdown(i, e.Overview, epath); err != nil { - errs = append(errs, fmt.Sprintf("%q: overview.txt: an error occurs during markdown formating: %s", edir, err)) + errs = append(errs, fmt.Sprintf("%q: overview.md: an error occurs during markdown formating: %s", edir, err)) } var buf bytes.Buffer err := goldmark.Convert([]byte(strings.Split(e.Overview, "\n")[0]), &buf) if err != nil { - errs = append(errs, fmt.Sprintf("%q: overview.txt: an error occurs during markdown formating of the headline: %s", edir, err)) + errs = append(errs, fmt.Sprintf("%q: overview.md: an error occurs during markdown formating of the headline: %s", edir, err)) } else { e.Headline = string(buf.Bytes()) } } - e.Statement, err = getFileContent(i, path.Join(epath, "statement.txt")) + if i.exists(path.Join(epath, "statement.txt")) { + e.Statement, err = getFileContent(i, path.Join(epath, "statement.txt")) + } else if i.exists(path.Join(epath, "statement.md")) { + e.Statement, err = getFileContent(i, path.Join(epath, "statement.md")) + } else { + err = fmt.Errorf("Unable to find statement.txt nor statement.md") + } if err != nil { - errs = append(errs, fmt.Sprintf("%q: statement.txt: %s", edir, err)) + errs = append(errs, fmt.Sprintf("%q: statement.md: %s", edir, err)) } else { if e.Statement, err = ProcessMarkdown(i, fixnbsp(e.Statement), epath); err != nil { - errs = append(errs, fmt.Sprintf("%q: statement.txt: an error occurs during markdown formating: %s", edir, err)) + errs = append(errs, fmt.Sprintf("%q: statement.md: an error occurs during markdown formating: %s", edir, err)) } }