X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FCommandLine.hs;h=699de08f0abfff26cbc5b98698e75b417516b518;hp=3fc8eb39098fba581ac5a5c11ae5f13ca4098682;hb=81f6cb2ec955695d8d1a4619dab69e8fa4b3fb27;hpb=86efdb6afac4a7a165babba90a0a25e0e1185e5b

diff --git a/src/CommandLine.hs b/src/CommandLine.hs
index 3fc8eb3..699de08 100644
--- a/src/CommandLine.hs
+++ b/src/CommandLine.hs
@@ -11,6 +11,7 @@ module CommandLine
 
 import Data.Maybe (fromJust, isJust, isNothing)
 import System.Console.GetOpt
+import System.Directory (doesFileExist)
 import System.Environment (getArgs)
 
 import Configuration (Cfg(..))
@@ -20,6 +21,7 @@ data Options = Options { opt_heartbeat :: Maybe Int,
                          opt_help  :: Bool,
                          opt_ignore_replies :: Bool,
                          opt_ignore_retweets :: Bool,
+                         opt_sendmail_path :: FilePath,
                          opt_from :: Maybe String,
                          opt_to :: Maybe String,
                          opt_verbose :: Bool }
@@ -32,6 +34,7 @@ default_options = Options { opt_heartbeat = Just 600,
                             opt_help = False,
                             opt_ignore_replies = False,
                             opt_ignore_retweets = False,
+                            opt_sendmail_path = "/usr/sbin/sendmail",
                             opt_from = Nothing,
                             opt_to = Nothing,
                             opt_verbose = False }
@@ -51,12 +54,12 @@ options =
       ['h']["help"]
       (NoArg set_help)
       "Prints this help message.",
-           
+
     Option
       ['n']["heartbeat"]
       (ReqArg set_heartbeat "heartbeat")
       "How many seconds to wait between polling.",
-    
+
     Option
       ['t']["to"]
       (ReqArg set_to "email_address")
@@ -67,6 +70,11 @@ options =
       (ReqArg set_from "email_address")
       "Send tweets FROM email_address.",
 
+    Option
+      ['s']["sendmail_path"]
+      (ReqArg set_sendmail_path "sendmail_path")
+      "Use sendmail_path to send mail",
+
     Option
       ['i']["ignore-replies"]
       (NoArg set_ignore_replies)
@@ -113,6 +121,10 @@ set_verbose :: Options -> IO Options
 set_verbose opts =
   return opts { opt_verbose = True }
 
+set_sendmail_path :: String -> Options -> IO Options
+set_sendmail_path arg opts = do
+  return opts { opt_sendmail_path = arg }
+
 set_to :: String -> Options -> IO Options
 set_to arg opts = do
   return opts { opt_to = Just arg }
@@ -124,7 +136,7 @@ set_from arg opts = do
 
 -- | The usage header.
 usage :: String
-usage = "Usage: twat [-n heartbeat] [-t to_address] [-f from_address] <username1> [username2, [username3]...]"
+usage = "Usage: twat [-n heartbeat] [-t to_address] [-f from_address] [-s path-to-sendmail] <username1> [username2, [username3]...]"
 
 
 -- | Was the help option passed?
@@ -161,7 +173,7 @@ heartbeat_errors = do
     then return ["\"heartbeat\" does not appear to be an integer."]
     else return []
 
--- |Parse errors relating to the list of usernames.
+-- | Parse errors relating to the list of usernames.
 username_errors :: IO [String]
 username_errors = do
   argv <- getArgs
@@ -172,7 +184,7 @@ username_errors = do
     else return []
 
 
--- |Parse errors relating to the "To" address.
+-- | Parse errors relating to the "To" address.
 to_errors :: IO [String]
 to_errors = do
   toaddr <- parse_to_address
@@ -182,6 +194,16 @@ to_errors = do
     else return []
 
 
+-- | Errors for the sendmail path argument.
+sendmail_path_errors :: IO [String]
+sendmail_path_errors = do
+  sendmail <- parse_sendmail_path
+  exists <- doesFileExist sendmail
+  if (not exists)
+    then return ["sendmail path does not exist"]
+    else return []
+
+
 -- | Parse errors relating to the "From" address.
 from_errors :: IO [String]
 from_errors = do
@@ -206,9 +228,11 @@ parse_errors = do
   errs_username <- username_errors
   errs_to <- to_errors
   errs_from <- from_errors
+  errs_sendmail <- sendmail_path_errors
   return $ map format_error (errors ++
                              errs_heartbeat ++
                              errs_username ++
+                             errs_sendmail ++
                              errs_to ++
                              errs_from)
 
@@ -224,6 +248,12 @@ parse_to_address = do
   opts <- parse_options
   return (opt_to opts)
 
+-- | What sendmail path was given on the command line?
+parse_sendmail_path :: IO FilePath
+parse_sendmail_path = do
+  opts <- parse_options
+  return (opt_sendmail_path opts)
+
 -- | What "From" address was given on the command line?
 parse_from_address :: IO (Maybe String)
 parse_from_address = do
@@ -248,6 +278,7 @@ get_cfg = do
   return Cfg { heartbeat = fromJust $ opt_heartbeat opts,
                ignore_replies = opt_ignore_replies opts,
                ignore_retweets = opt_ignore_retweets opts,
+               sendmail_path = opt_sendmail_path opts,
                from_address = opt_from opts,
                to_address = opt_to opts,
                verbose = opt_verbose opts }