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

Take params

Browse Source
This commit is contained in:
Filip Gralinski 2018-11-03 12:30:39 +01:00
parent d3e2c06b15
commit 9d67e39a06
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Handler/ShowChallenge.hs
View File

@ -244,6 +244,7 @@ doCreateSubmission userId challengeId mDescription mTags repoSpec chan = do
extractionOptionsDescription = mDescription, extractionOptionsDescription = mDescription,
extractionOptionsTags = mTags, extractionOptionsTags = mTags,
extractionOptionsGeneralParams = Nothing, extractionOptionsGeneralParams = Nothing,
extractionOptionsUnwantedParams = Nothing,
extractionOptionsParamFiles = Nothing, extractionOptionsParamFiles = Nothing,
extractionOptionsMLRunPath = Nothing }) extractionOptionsMLRunPath = Nothing })
@ -253,7 +254,7 @@ doCreateSubmission userId challengeId mDescription mTags repoSpec chan = do
challengeId challengeId
(gonitoMetadataDescription gonitoMetadata) (gonitoMetadataDescription gonitoMetadata)
chan chan
_ <- getOuts chan submissionId _ <- getOuts chan submissionId (gonitoMetadataGeneralParams gonitoMetadata)
currentTagIds <- runDB $ selectList [SubmissionTagSubmission ==. submissionId] [] currentTagIds <- runDB $ selectList [SubmissionTagSubmission ==. submissionId] []
@ -289,14 +290,14 @@ getSubmission userId repoId commit challengeId description chan = do
submissionIsPublic=False, submissionIsPublic=False,
submissionIsHidden=Just False } submissionIsHidden=Just False }
getOuts :: Channel -> Key Submission -> Handler ([Out]) getOuts :: Channel -> Key Submission -> M.Map Text Text -> Handler ([Out])
getOuts chan submissionId = do getOuts chan submissionId generalParams = do
submission <- runDB $ get404 submissionId submission <- runDB $ get404 submissionId
let challengeId = submissionChallenge submission let challengeId = submissionChallenge submission
repoDir <- getRepoDir $ submissionRepo submission repoDir <- getRepoDir $ submissionRepo submission
activeTests <- runDB $ selectList [TestChallenge ==. challengeId, TestActive ==. True] [] activeTests <- runDB $ selectList [TestChallenge ==. challengeId, TestActive ==. True] []
outs' <- mapM (outsForTest repoDir submissionId) activeTests outs' <- mapM (outsForTest repoDir submissionId generalParams) activeTests
let outs = concat outs' let outs = concat outs'
mapM_ checkOrInsertOut outs mapM_ checkOrInsertOut outs
@ -328,12 +329,12 @@ outForTest repoDir outF variantId (Entity testId test) = do
outTest=testId, outTest=testId,
outChecksum=SHA1 checksum } outChecksum=SHA1 checksum }
outsForTest :: FilePath -> SubmissionId -> Entity Test -> HandlerFor App [Out] outsForTest :: FilePath -> SubmissionId -> M.Map Text Text -> Entity Test -> HandlerFor App [Out]
outsForTest repoDir submissionId testEnt@(Entity _ test) = do outsForTest repoDir submissionId generalParams testEnt@(Entity _ test) = do
outFiles <- liftIO $ outFilesForTest repoDir test outFiles <- liftIO $ outFilesForTest repoDir test
forM outFiles $ \outFile -> do forM outFiles $ \outFile -> do
theVariant <- getVariant submissionId M.empty outFile theVariant <- getVariant submissionId generalParams outFile
outForTest repoDir outFile theVariant testEnt outForTest repoDir outFile theVariant testEnt
-- returns the filename (not file path) -- returns the filename (not file path)