Whitespace cleanup.

[dead/lwn-epub.git] / src / Configuration.hs

diff --git a/src/Configuration.hs b/src/Configuration.hs
index 5745d095b9e9de204012889e0f55c2bf83180a68..4898c08978e6d71846c85c535c39c64b4642edd9 100644 (file)
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE DoAndIfThenElse #-}
+
 module Configuration (
   Cfg(..),
   get_cfg,
@@ -10,6 +12,7 @@ import Data.ConfigFile
 import Data.Maybe (isJust)
 import Data.Monoid (Monoid(..))
 import System.Directory (
+  doesFileExist,
   getAppUserDataDirectory
   )
 import System.Exit (ExitCode(..), exitWith)
@@ -86,25 +89,30 @@ config_filename = Cmd.program_name ++ ".conf"
 config_path :: IO FilePath
 config_path = do
   cfg_dir <- getAppUserDataDirectory Cmd.program_name
-  return $ joinPath [cfg_dir, config_filename]
+  let cfg_file = joinPath [cfg_dir, config_filename]
+  return $ cfg_file
 
 parse_config :: IO (Either String Cfg)
 parse_config = do
   cfg_file <- config_path
-  parse_result <- readfile emptyCP cfg_file
-
-  return $
-    case parse_result of
-      Left err -> Left (format_cpe err)
-      Right cp ->
-          let cp_username = get cp "DEFAULT" "username"
-              cp_password = get cp "DEFAULT" "password"
-  
-              cfg_username = either_to_maybe cp_username
-              cfg_password = either_to_maybe cp_password
-          in
-              Right $ mempty { username = cfg_username,
-                               password = cfg_password }
+  it_exists <- doesFileExist cfg_file
+  if not it_exists then do
+    return $ Right mempty
+  else do
+    parse_result <- readfile emptyCP cfg_file
+
+    return $
+      case parse_result of
+        Left err -> Left (format_cpe err)
+        Right cp ->
+            let cp_username = get cp "DEFAULT" "username"
+                cp_password = get cp "DEFAULT" "password"
+
+                cfg_username = either_to_maybe cp_username
+                cfg_password = either_to_maybe cp_password
+            in
+                Right $ mempty { username = cfg_username,
+                                 password = cfg_password }