X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCommandLine.hs;h=878cd686ca12f1a4bdc7b2e676edd07199699bbb;hb=26718edaad5cd7921d957a1f0972fd9f5cd5b645;hp=b5487d423c9350b7d9130a00f87a6f8ec5503f3c;hpb=fdc80f514bfe9005f55768f63b619ad170ad1b56;p=dead%2Fhalcyon.git diff --git a/src/CommandLine.hs b/src/CommandLine.hs index b5487d4..878cd68 100644 --- 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"] - (ReqArg set_sendmail_path "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,13 +128,29 @@ 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 return opts { opt_heartbeat = new_heartbeat } set_help :: Options -> IO Options -set_help opts = do +set_help opts = return opts { opt_help = True } set_ignore_retweets :: Options -> IO Options @@ -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] [username2, [username3]...]" +usage = "Usage: twat --consumer-key= --consumer-secret= --access-token= --access-secret= [-n heartbeat] [-t to_address] [-f from_address] [-s path-to-sendmail] [username2, [username3]...]" -- | Was the help option passed? @@ -160,28 +204,21 @@ 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. heartbeat_errors :: IO [String] heartbeat_errors = do hb <- parse_heartbeat - if (isNothing hb) - then return ["\"heartbeat\" does not appear to be an integer."] - else return [] + return ["\"heartbeat\" does not appear to be an integer." | isNothing hb ] -- | Parse errors relating to the list of usernames. username_errors :: IO [String] username_errors = do argv <- getArgs let (_, usernames, _) = getOpt Permute options argv - - if (null usernames) - then return ["no usernames provided."] - else return [] + return [ "no usernames provided." | null usernames ] -- | Parse errors relating to the "To" address. @@ -189,9 +226,8 @@ to_errors :: IO [String] to_errors = do toaddr <- parse_to_address fromaddr <- parse_from_address - if (isNothing toaddr) && (isJust fromaddr) - then return ["\"from\" address specified without \"to\" address."] - else return [] + return ["\"from\" address specified without \"to\" address." + | (isNothing toaddr) && (isJust fromaddr) ] -- | Errors for the sendmail path argument. @@ -199,9 +235,7 @@ 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 [] + return [ "sendmail path does not exist" | not exists ] -- | Parse errors relating to the "From" address. @@ -209,9 +243,8 @@ from_errors :: IO [String] from_errors = do toaddr <- parse_to_address fromaddr <- parse_from_address - if (isJust toaddr) && (isNothing fromaddr) - then return ["\"to\" address specified without \"from\" address."] - else return [] + return [ "\"to\" address specified without \"from\" address." + | (isJust toaddr) && (isNothing fromaddr) ] -- | Format an error message for printing. @@ -275,7 +308,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,