Fix a few hlint suggestions.

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

diff --git a/src/CommandLine.hs b/src/CommandLine.hs
index 699de08f0abfff26cbc5b98698e75b417516b518..db3b12da2039c6de2d046bf04e22782849b32649 100644 (file)
--- a/src/CommandLine.hs
+++ b/src/CommandLine.hs
@@ -17,7 +17,11 @@ import System.Environment (getArgs)
 import Configuration (Cfg(..))
 
 -- | A record containing values for all available options.
-data Options = Options { opt_heartbeat :: Maybe Int,
+data Options = Options { opt_consumer_key :: Maybe String,
+                         opt_consumer_secret :: Maybe String,
+                         opt_access_token :: Maybe String,
+                         opt_access_secret :: Maybe String,
+                         opt_heartbeat :: Maybe Int,
                          opt_help  :: Bool,
                          opt_ignore_replies :: Bool,
                          opt_ignore_retweets :: Bool,
@@ -30,7 +34,11 @@ data Options = Options { opt_heartbeat :: Maybe Int,
 -- | Constructs an instance of Options, with each of its members set
 --   to default values.
 default_options :: Options
-default_options = Options { opt_heartbeat = Just 600,
+default_options = Options { opt_access_token = Nothing,
+                            opt_access_secret = Nothing,
+                            opt_consumer_key = Nothing,
+                            opt_consumer_secret = Nothing,
+                            opt_heartbeat = Just 600,
                             opt_help = False,
                             opt_ignore_replies = False,
                             opt_ignore_retweets = False,
@@ -51,42 +59,62 @@ default_options = Options { opt_heartbeat = Just 600,
 options :: [OptDescr (Options -> IO Options)]
 options =
   [ Option
-      ['h']["help"]
+      "" ["consumer-key"]
+      (ReqArg set_consumer_key "consumer-key")
+      "Your Twitter API consumer key.",
+
+    Option
+      "" ["consumer-secret"]
+      (ReqArg set_consumer_secret "consumer-secret")
+      "Your Twitter API consumer secret.",
+
+    Option
+      "" ["access-token"]
+      (ReqArg set_access_token "access-token")
+      "Your Twitter API access token.",
+
+    Option
+      "" ["access-secret"]
+      (ReqArg set_access_secret "access-secret")
+      "Your Twitter API access secret.",
+
+    Option
+      "h" ["help"]
       (NoArg set_help)
       "Prints this help message.",
 
     Option
-      ['n']["heartbeat"]
+      "n" ["heartbeat"]
       (ReqArg set_heartbeat "heartbeat")
       "How many seconds to wait between polling.",
 
     Option
-      ['t']["to"]
+      "t" ["to"]
       (ReqArg set_to "email_address")
       "Send tweets TO email_address.",
 
     Option
-      ['f']["from"]
+      "f" ["from"]
       (ReqArg set_from "email_address")
       "Send tweets FROM email_address.",
 
     Option
-      ['s']["sendmail_path"]
+      "s" ["sendmail_path"]
       (ReqArg set_sendmail_path "sendmail_path")
       "Use sendmail_path to send mail",
 
     Option
-      ['i']["ignore-replies"]
+      "i" ["ignore-replies"]
       (NoArg set_ignore_replies)
       "Ignore replies.",
 
     Option
-      ['I']["ignore-retweets"]
+      "I" ["ignore-retweets"]
       (NoArg set_ignore_retweets)
       "Ignore retweets.",
 
     Option
-      ['v']["verbose"]
+      "v" ["verbose"]
       (NoArg set_verbose)
       "Be verbose about stuff."
   ]
@@ -100,6 +128,22 @@ parse_int s =
     [(n,_)]   -> Just n
     _         -> Nothing
 
+set_consumer_key :: String -> Options -> IO Options
+set_consumer_key arg opts =
+  return opts { opt_consumer_key = Just arg }
+
+set_consumer_secret :: String -> Options -> IO Options
+set_consumer_secret arg opts =
+  return opts { opt_consumer_secret = Just arg }
+
+set_access_token :: String -> Options -> IO Options
+set_access_token arg opts =
+  return opts { opt_access_token = Just arg }
+
+set_access_secret :: String -> Options -> IO Options
+set_access_secret arg opts =
+  return opts { opt_access_secret = Just arg }
+
 set_heartbeat :: String -> Options -> IO Options
 set_heartbeat arg opts = do
   let new_heartbeat = parse_int arg
@@ -122,21 +166,21 @@ set_verbose opts =
   return opts { opt_verbose = True }
 
 set_sendmail_path :: String -> Options -> IO Options
-set_sendmail_path arg opts = do
+set_sendmail_path arg opts =
   return opts { opt_sendmail_path = arg }
 
 set_to :: String -> Options -> IO Options
-set_to arg opts = do
+set_to arg opts =
   return opts { opt_to = Just arg }
 
 set_from :: String -> Options -> IO Options
-set_from arg opts = do
+set_from arg opts =
   return opts { opt_from = Just arg }
 
 
 -- | The usage header.
 usage :: String
-usage = "Usage: twat [-n heartbeat] [-t to_address] [-f from_address] [-s path-to-sendmail] <username1> [username2, [username3]...]"
+usage = "Usage: twat --consumer-key=<key> --consumer-secret=<secret> --access-token=<key> --access-secret=<secret> [-n heartbeat] [-t to_address] [-f from_address] [-s path-to-sendmail] <username1> [username2, [username3]...]"
 
 
 -- | Was the help option passed?
@@ -160,9 +204,7 @@ parse_options = do
   -- list, one after another, on a default_options record. The end
   -- result should be an Options instance with all of its members set
   -- correctly.
-  opts <- foldl (>>=) (return default_options) actions
-
-  return opts
+  foldl (>>=) (return default_options) actions
 
 
 -- | A list of parse errors relating to the heartbeat.
@@ -275,7 +317,11 @@ parse_usernames = do
 get_cfg :: IO Cfg
 get_cfg = do
   opts <- parse_options
-  return Cfg { heartbeat = fromJust $ opt_heartbeat opts,
+  return Cfg { consumer_key = fromJust $ opt_consumer_key opts,
+               consumer_secret = fromJust $ opt_consumer_secret opts,
+               access_token = fromJust $ opt_access_token opts,
+               access_secret = fromJust $ opt_access_secret opts,
+               heartbeat = fromJust $ opt_heartbeat opts,
                ignore_replies = opt_ignore_replies opts,
                ignore_retweets = opt_ignore_retweets opts,
                sendmail_path = opt_sendmail_path opts,