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

sync: Expose GetFile and GetFileContent functions

Browse source
This commit is contained in:
nemunaire 2022-05-24 21:52:58 +02:00
commit 560110ba5e
6 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/sync/exercices.go
View file

@ -107,7 +107,7 @@ func BuildExercice(i Importer, theme *fic.Theme, epath string, dmap *map[int64]*
}
// Overwrite title if title.txt exists
if myTitle, err := getFileContent(i, path.Join(epath, "title.txt")); err == nil {
if myTitle, err := GetFileContent(i, path.Join(epath, "title.txt")); err == nil {
myTitle = strings.TrimSpace(myTitle)
if strings.Contains(myTitle, "\n") {
errs = append(errs, fmt.Sprintf("%q: title.txt: Title can't contain new lines", edir))
@ -121,9 +121,9 @@ func BuildExercice(i Importer, theme *fic.Theme, epath string, dmap *map[int64]*
// Texts to format using Markdown
if i.exists(path.Join(epath, "overview.txt")) {
e.Overview, err = getFileContent(i, 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"))
e.Overview, err = GetFileContent(i, path.Join(epath, "overview.md"))
} else {
err = fmt.Errorf("Unable to find overview.txt nor overview.md")
}
@ -146,9 +146,9 @@ func BuildExercice(i Importer, theme *fic.Theme, epath string, dmap *map[int64]*
}
if i.exists(path.Join(epath, "statement.txt")) {
e.Statement, err = getFileContent(i, 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"))
e.Statement, err = GetFileContent(i, path.Join(epath, "statement.md"))
} else {
err = fmt.Errorf("Unable to find statement.txt nor statement.md")
}
@ -161,7 +161,7 @@ func BuildExercice(i Importer, theme *fic.Theme, epath string, dmap *map[int64]*
}
if i.exists(path.Join(epath, "finished.txt")) {
e.Finished, err = getFileContent(i, path.Join(epath, "finished.txt"))
e.Finished, err = GetFileContent(i, path.Join(epath, "finished.txt"))
if err != nil {
errs = append(errs, fmt.Sprintf("%q: finished.txt: %s", edir, err))
} else {
@ -250,7 +250,7 @@ func BuildExercice(i Importer, theme *fic.Theme, epath string, dmap *map[int64]*
errs = append(errs, fmt.Sprintf("%q: resolution.md: %s", edir, err.Error()))
} else if size == 0 {
errs = append(errs, fmt.Sprintf("%q: resolution.md: The file is empty!", edir))
} else if e.Resolution, err = getFileContent(i, writeup); err != nil {
} else if e.Resolution, err = GetFileContent(i, writeup); err != nil {
errs = append(errs, fmt.Sprintf("%q: resolution.md: %s", edir, err.Error()))
} else if e.Resolution, err = ProcessMarkdown(i, e.Resolution, epath); err != nil {
errs = append(errs, fmt.Sprintf("%q: resolution.md: error during markdown processing: %s", edir, err.Error()))