SunRed/myriad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change the CLI to take the languages folder

Browse source
This commit is contained in:
1Computer1 2019-09-05 10:17:08 -04:00
parent d1b94f6dda
commit c31b52ce5e
7 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Myriad/Core.hs
View file

@ -49,6 +49,7 @@ data EvalResult = EvalOk BL.ByteString | EvalTimedOut | EvalErrored
data Env = Env
{ config :: MyriadConfig
, languagesDir :: T.Text
, containers :: MVar (M.Map Language ContainerName)
, containerSems :: MVar (M.Map Language QSem)
, evalSems :: MVar (M.Map Language QSem)
@ -61,7 +62,6 @@ data MyriadConfig = MyriadConfig
, prepareContainers :: Bool
, cleanupInterval :: Natural
, port :: Natural
, languagesDir :: T.Text
} deriving (Show, Generic)
instance Interpret MyriadConfig
@ -112,10 +112,11 @@ type Myriadic m = (MonadReader Env m, MonadLogger m, MonadLoggerIO m, MonadIO m,
readConfig :: T.Text -> IO MyriadConfig
readConfig = input auto
initEnv :: T.Text -> IO Env
initEnv configInput =
initEnv :: T.Text -> T.Text -> IO Env
initEnv configInput languagesDir =
Env
<$> readConfig configInput
<*> pure languagesDir
<*> newMVar M.empty
<*> newMVar M.empty
<*> newMVar M.empty