X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FMain.hs;h=40703d7ea9170c10110efe3787ce070c47786256;hp=bf99fe853fd2e947a5e1508cb8eeb9ddf92d835f;hb=7bb00e04c15781d889f950d00babf3f183047bff;hpb=9b6d95a82745ced2a58d9bc4ded555ee36b36673

diff --git a/src/Main.hs b/src/Main.hs
index bf99fe8..40703d7 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -5,14 +5,22 @@ import Control.Concurrent (forkIO, threadDelay)
 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(..), 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
@@ -85,13 +93,13 @@ filter_statuses cfg ss =
   replies  = filter reply ss
   retweets = filter retweeted ss
 
-  good_statuses' = case (ignore_replies cfg) of
-                         True  -> ss \\ replies
-                         False -> ss
+  good_statuses' = if (ignore_replies cfg)
+                   then ss \\ replies
+                   else ss
 
-  good_statuses = case (ignore_retweets cfg) of
-                    True  -> good_statuses' \\ retweets
-                    False -> good_statuses'
+  good_statuses = if (ignore_retweets cfg)
+                  then good_statuses' \\ retweets
+                  else good_statuses'
 
 
 
@@ -104,7 +112,7 @@ filter_statuses cfg ss =
 recurse :: Cfg -> String -> Integer -> (Maybe Message) -> IO ()
 recurse cfg username latest_status_id maybe_message = do
   thread_sleep (heartbeat cfg)
-  timeline <- get_user_new_statuses username latest_status_id
+  timeline <- get_user_new_statuses cfg username latest_status_id
 
   -- FIXME
   let Just new_statuses = decode timeline :: Maybe Timeline
@@ -137,9 +145,10 @@ recurse cfg username latest_status_id maybe_message = do
 
 -- | Try continually to download username's timeline, and determine the
 --   latest status id to be posted once we have done so.
-get_latest_status_id :: Int -> String -> IO Integer
-get_latest_status_id delay username = do
-  timeline <- get_user_timeline username
+get_latest_status_id :: Cfg -> String -> IO Integer
+get_latest_status_id cfg username = do
+  let delay = heartbeat cfg
+  timeline <- get_user_timeline cfg username
   let Just initial_timeline = decode timeline :: Maybe Timeline
 
   case (length initial_timeline) of
@@ -147,7 +156,7 @@ get_latest_status_id delay username = do
       -- If the HTTP part barfs, try again after a while.
       putStrLn ("Couldn't retrieve " ++ username ++ "'s timeline. Retrying...")
       thread_sleep delay
-      get_latest_status_id delay username
+      get_latest_status_id cfg username
     _ -> return (get_max_status_id initial_timeline)
 
 
@@ -159,7 +168,7 @@ get_latest_status_id delay username = do
 --   should be emailed.
 run_twat :: Cfg -> Maybe Message -> String -> IO ()
 run_twat cfg msg username = do
-  latest_status_id <- get_latest_status_id (heartbeat cfg) username
+  latest_status_id <- get_latest_status_id cfg username
   recurse cfg username latest_status_id msg
   return ()
 
@@ -184,37 +193,32 @@ construct_message cfg = do
 -- forking, main loops forever.
 main :: IO ()
 main = do
-  errors <- parse_errors
+  -- And a Cfg object.
+  rc_cfg  <- OC.from_rc
+  cmd_cfg <- apply_args
 
-  -- If there  were errors parsing the command-line options,
-  -- print them and exit.
-  when (not (null errors)) $ do
-      hPutStrLn stderr (concat errors)
-      putStrLn help_text
-      exitWith (ExitFailure exit_args_parse_failed)
+  -- Merge the config file options with the command-line ones,
+  -- prefering the command-line ones.
+  let opt_config = rc_cfg <> cmd_cfg
 
-  -- 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
-    exitWith ExitSuccess
+  -- 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
 
-  -- Get the list of usernames.
-  usernames <- parse_usernames
+  when (null $ usernames cfg) $ do
+    hPutStrLn stderr "ERROR: no usernames supplied."
+    _ <- show_help
+    exitWith (ExitFailure exit_no_usernames)
 
-  -- And a Cfg object.
-  cfg <- get_cfg
-  
   -- If we have both a "To" and "From" address, we'll create a
   -- message object to be passed to all of our threads.
   let message = construct_message cfg
 
   -- 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 $ do
+  _ <- forever $
     -- This thread (the one executing main) doesn't do anything,
     -- but when it terminates, so do all the threads we forked.
     -- As a result, we need to keep this thread on life support.