Rewrite CommandLine to use cmdargs and integrate the command-line and RC file options.

[dead/halcyon.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 14539c11a737defc430d35e8aed0491c9d3cb397..40703d7ea9170c10110efe3787ce070c47786256 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,17 +2,25 @@ module Main
 where
 
 import Control.Concurrent (forkIO, threadDelay)
-import Control.Monad (forever, unless, when)
+import Control.Monad (forever, when)
 import Data.Aeson (decode)
 import Data.List ((\\))
+import Data.Monoid ((<>))
 import Data.Time.LocalTime (TimeZone, getCurrentTimeZone)
-import System.Exit (ExitCode(..), exitSuccess, exitWith)
+import System.Exit (ExitCode(..), exitWith)
 import System.IO (hPutStrLn, stderr)
 
 import CommandLine
-import Configuration (Cfg(..))
-import ExitCodes
-import Mail
+import Configuration (Cfg(..), default_config, merge_optional)
+import ExitCodes (exit_no_usernames)
+import qualified OptionalConfiguration as OC
+import Mail (
+  Message(..),
+  default_headers,
+  print_sendmail_result,
+  rfc822_now,
+  sendmail
+  )
 import Twitter.Http
 import Twitter.Status
 import Twitter.User
@@ -185,27 +193,22 @@ construct_message cfg = do
 -- forking, main loops forever.
 main :: IO ()
 main = do
-  errors <- parse_errors
-
-  -- If there  were errors parsing the command-line options,
-  -- print them and exit.
-  unless (null errors) $ do
-      hPutStrLn stderr (concat errors)
-      putStrLn help_text
-      exitWith (ExitFailure exit_args_parse_failed)
+  -- And a Cfg object.
+  rc_cfg  <- OC.from_rc
+  cmd_cfg <- apply_args
 
-  -- Next, check to see if the 'help' option was passed to the
-  -- program. If it was, display the help, and exit successfully.
-  help <- help_set
-  when (help) $ do
-    putStrLn help_text
-    exitSuccess
+  -- Merge the config file options with the command-line ones,
+  -- prefering the command-line ones.
+  let opt_config = rc_cfg <> cmd_cfg
 
-  -- Get the list of usernames.
-  usernames <- parse_usernames
+  -- Finally, update a default config with any options that have been
+  -- set in either the config file or on the command-line.
+  let cfg = merge_optional default_config opt_config
 
-  -- And a Cfg object.
-  cfg <- get_cfg
+  when (null $ usernames cfg) $ do
+    hPutStrLn stderr "ERROR: no usernames supplied."
+    _ <- show_help
+    exitWith (ExitFailure exit_no_usernames)
 
   -- If we have both a "To" and "From" address, we'll create a
   -- message object to be passed to all of our threads.
@@ -213,7 +216,7 @@ main = do
 
   -- Execute run_twat on each username in a new thread.
   let run_twat_curried = run_twat cfg message
-  _ <- mapM (forkIO . run_twat_curried) usernames
+  _ <- mapM (forkIO . run_twat_curried) (usernames cfg)
 
   _ <- forever $
     -- This thread (the one executing main) doesn't do anything,