fic/server
2
0
Fork 0
Code Issues Pull Requests 3 Releases Wiki Activity

sync: Allow \r at EOL in DIGESTS

Browse Source
This commit is contained in:
nemunaire 2018-12-08 00:53:13 +01:00
parent 910ec94fd8
commit d89cd2f0ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/sync/exercice_files.go
View File

@ -28,14 +28,14 @@ func SyncExerciceFiles(i Importer, exercice fic.Exercice) (errs []string) {
// Parse DIGESTS.txt
digests := map[string][]byte{}
for nline, d := range strings.Split(digs, "\n") {
if dsplt := strings.SplitN(d, " ", 2); len(dsplt) != 2 {
if dsplt := strings.SplitN(d, " ", 2); len(dsplt) < 2 {
errs = append(errs, fmt.Sprintf("%q: unable to parse DIGESTS.txt line %d: invalid format", path.Base(exercice.Path), nline + 1))
continue
} else if hash, err := hex.DecodeString(dsplt[0]); err != nil {
errs = append(errs, fmt.Sprintf("%q: unable to parse DIGESTS.txt line %d: %s", path.Base(exercice.Path), nline + 1, err))
continue
} else {
digests[strings.TrimLeftFunc(dsplt[1], unicode.IsSpace)] = hash
digests[strings.TrimFunc(dsplt[1], unicode.IsSpace)] = hash
}
}