filipg/gonito
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'variants' of ssh://gonito.net/gonito

Browse Source
This commit is contained in:
Filip Gralinski 2018-07-05 07:42:44 +02:00
commit 970e8ecf25
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Handler/ShowChallenge.hs
View File

@ -280,7 +280,9 @@ getOuts chan submissionId = do
repoDir <- getRepoDir $ submissionRepo submission repoDir <- getRepoDir $ submissionRepo submission
activeTests <- runDB $ selectList [TestChallenge ==. challengeId, TestActive ==. True] [] activeTests <- runDB $ selectList [TestChallenge ==. challengeId, TestActive ==. True] []
testsDone <- filterM (liftIO . doesOutExist repoDir) activeTests testsDone <- filterM (liftIO . doesOutExist repoDir) activeTests
outs <- mapM (outForTest repoDir submissionId) testsDone theVariant <- getVariant submissionId "out"
outs' <- mapM (outForTest repoDir submissionId) testsDone
let outs = map (\o -> o { outVariant = Just theVariant}) outs'
mapM_ checkOrInsertOut outs mapM_ checkOrInsertOut outs
mapM_ (checkOrInsertEvaluation repoDir chan) outs mapM_ (checkOrInsertEvaluation repoDir chan) outs
return outs return outs
@ -306,6 +308,13 @@ outForTest repoDir submissionId (Entity testId test) = do
outTest=testId, outTest=testId,
outChecksum=SHA1 checksum } outChecksum=SHA1 checksum }
getVariant :: SubmissionId -> Text -> Handler VariantId
getVariant submissionId name = runDB $ do
maybeVariant <- getBy $ UniqueVariantSubmissionName submissionId name
case maybeVariant of
Just (Entity vid _) -> return vid
Nothing -> insert $ Variant submissionId name
checkOrInsertOut :: Out -> Handler () checkOrInsertOut :: Out -> Handler ()
checkOrInsertOut out = do checkOrInsertOut out = do
maybeOut <- runDB $ getBy $ UniqueOutSubmissionTestChecksum (outSubmission out) (outTest out) (outChecksum out) maybeOut <- runDB $ getBy $ UniqueOutSubmissionTestChecksum (outSubmission out) (outTest out) (outChecksum out)