Garmelon/chards
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make prompts more similar to original script

Browse source
This commit is contained in:
Joscha 2018-01-06 00:36:21 +00:00
parent 304a1dd6fe
commit ba5535e8a7
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/Main.hs
View file

@ -43,7 +43,7 @@ promptYesNo question = do
-- Wait until user pressed Enter -- Wait until user pressed Enter
promptContinue :: String -> MaybeT Input () promptContinue :: String -> MaybeT Input ()
promptContinue question = void $ MaybeT $ getInputLine $ question ++ "[Enter] " promptContinue question = void $ MaybeT $ getInputLine $ question ++ " [Enter] "
-- Just span, but with monads. -- Just span, but with monads.
spanM :: (Monad m) => (a -> m Bool) -> [a] -> m ([a], [a]) spanM :: (Monad m) => (a -> m Bool) -> [a] -> m ([a], [a])
@ -96,7 +96,7 @@ askCountdown time l@((key, card):xs) = do
askCardWithInfo :: UTCTime -> Card -> Int -> MaybeT Input Card askCardWithInfo :: UTCTime -> Card -> Int -> MaybeT Input Card
askCardWithInfo time card left = do askCardWithInfo time card left = do
let t = rjust ' ' 9 $ tierName $ tier card let t = rjust ' ' 9 $ tierName $ tier card
l = rjust ' ' 3 $ show left l = rjust ' ' 5 $ show left
lift $ outputStrLn "" lift $ outputStrLn ""
lift $ outputStrLn $ "-----< tier: " ++ t ++ ", left: " ++ l ++ " >-----" lift $ outputStrLn $ "-----< tier: " ++ t ++ ", left: " ++ l ++ " >-----"
askCard time card askCard time card
@ -114,12 +114,12 @@ askCard time card = do
askSide :: String -> MaybeT (InputT IO) Bool askSide :: String -> MaybeT (InputT IO) Bool
askSide side = do askSide side = do
lift $ displaySide side lift $ displaySide side
promptYesNo "Did you know that side?" promptYesNo "--> Did you know that side?"
showSide :: String -> MaybeT (InputT IO) () showSide :: String -> MaybeT (InputT IO) ()
showSide side = do showSide side = do
lift $ displaySide side lift $ displaySide side
promptContinue "Continue" promptContinue "--> Continue"
displaySide :: String -> InputT IO () displaySide :: String -> InputT IO ()
displaySide side = lift (putStrLn side) displaySide side = lift (putStrLn side)
@ -209,7 +209,7 @@ fromFile filepath = do
toFile :: FilePath -> Elements -> Input () toFile :: FilePath -> Elements -> Input ()
toFile filepath elms = void $ runMaybeT $ do toFile filepath elms = void $ runMaybeT $ do
result <- promptYesNo "Do you want to save the cards?" result <- promptYesNo "Save the cards?"
when result $ do when result $ do
lift $ lift $ writeFile filepath $ elementsToString elms lift $ lift $ writeFile filepath $ elementsToString elms