backend: treat file found in directory discovered + handle multiple keys + generate my.json

This commit is contained in:
nemunaire 2016-01-23 12:28:31 +01:00
commit 70b6b30067
3 changed files with 63 additions and 26 deletions

View file

@ -14,6 +14,7 @@ import (
"srs.epita.fr/fic-server/libfic"
)
var TeamsDir string
var SubmissionDir string
var BaseURL string
@ -32,6 +33,8 @@ func watchsubdir(watcher *inotify.Watcher, pathname string) error {
if err := watchsubdir(watcher, p); err != nil {
return err
}
} else if d.Mode().IsRegular() {
go treat(p)
}
}
return nil
@ -42,6 +45,7 @@ func main() {
var dbfile = flag.String("db", "fic.db", "Path to the DB")
flag.StringVar(&BaseURL, "baseurl", "http://fic.srs.epita.fr/", "URL prepended to each URL")
flag.StringVar(&SubmissionDir, "submission", "./submissions", "Base directory where save submissions")
flag.StringVar(&TeamsDir, "teams", "../TEAMS", "Base directory where save teams JSON files")
flag.Parse()
SubmissionDir = path.Clean(SubmissionDir)
@ -84,17 +88,21 @@ func main() {
}
}
} else if ev.Mask&inotify.IN_CLOSE_WRITE == inotify.IN_CLOSE_WRITE {
// Extract
spath := strings.Split(strings.TrimPrefix(ev.Name, SubmissionDir), "/")
if len(spath) > 2 {
go treatSubmission(ev.Name, spath[1], spath[2])
} else {
log.Println("Invalid new file:", ev.Name)
}
go treat(ev.Name)
}
case err := <-watcher.Error:
log.Println("error:", err)
}
}
}
func treat(raw_path string) {
// Extract
spath := strings.Split(strings.TrimPrefix(raw_path, SubmissionDir), "/")
if len(spath) > 2 {
treatSubmission(raw_path, spath[1], spath[2])
} else {
log.Println("Invalid new file:", raw_path)
}
}