Fix dictionary reading

main.hs

@@ -1,7 +1,9 @@
 {-# LANGUAGE RecordWildCards #-}
 
 import System.IO
-import Control.Monad (when)
+import System.Console.ArgParser
+import Control.Monad
+import Control.Applicative
 
 import Paths_alea (getDataFileName)
 import Alea.Diceware
@@ -28,18 +30,26 @@ interface =
   (mkApp =<< parser)
 
 main :: IO ()
-main = getProgArgs >>= defaults >>= exec
+main = interface >>= flip runApp (readDict >=> exec)
 
+-- Default path of the dictionary
+path :: IO FilePath
+path = getDataFileName "dict/diceware"
+
+-- Read dictionary file
+readDict :: ProgArgs -> IO ProgArgs
+readDict args@ProgArgs{..} =
+  readFile dictionary >>= \x -> return args {dictionary = x}
 
 -- Main function
 exec :: ProgArgs -> IO ()
 exec args@ProgArgs{..} =
 	if interactive
-		then interact (unlines . map dice . lines)
-		else do
-			randWords dictSize phraseLength >>= putStrLn . unwords . map dice'
-			when (phrases > 1) $ exec args {phrases = phrases - 1}
+	  then interact (unlines . map dice . lines)
+	  else do
+			  randWords dictSize phraseLength >>= putStrLn . unwords . map dice'
+			  when (phrases > 1) $ exec args {phrases = phrases - 1}
 	where
-		(dict, dictSize) = (parseDiceware dictionary, length dict)
-		dice  n = readDiceware  dict (read n :: Int)
-		dice' n = readDiceware' dict n
+	  (dict, dictSize) = (parseDiceware dictionary, length dict)
+	  dice  n = readDiceware  dict (read n :: Int)
+	  dice' n = readDiceware' dict n