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

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

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 53635439ac354c76bc1f9d96d074fac6ee89254c..11add85de7ae6081755d1821cf750a0c845b4af4 100644 (file)
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 -- | The program will parse ~/.twatrc for any available configuration
@@ -7,14 +9,24 @@
 --   the merged OptionalCfgs.
 --
 
-module OptionalConfiguration
+module OptionalConfiguration (
+  OptionalCfg(..),
+  from_rc
+  )
 where
 
-import Data.Monoid (Monoid(..))
 import qualified Data.Configurator as DC
+import qualified Data.Configurator.Types as DCT
+import Data.Data (Data)
+import Data.Maybe (fromMaybe)
+import Data.Monoid (Monoid(..))
+import Data.Typeable (Typeable)
 
--- The same as Cfg, except everything is optional. It's easy to merge
--- two of these by simply dropping the Nothings in favor of the Justs.
+-- | The same as Cfg, except everything is optional. It's easy to
+--   merge two of these by simply dropping the Nothings in favor of
+--   the Justs. The 'usernames' are left un-maybed so that cmdargs
+--   can parse more than one of them.
+--
 data OptionalCfg =
   OptionalCfg { consumer_key :: Maybe String,
                 consumer_secret :: Maybe String,
@@ -26,7 +38,9 @@ data OptionalCfg =
                 sendmail_path :: Maybe String,
                 from_address :: Maybe String,
                 to_address :: Maybe String,
-                verbose :: Maybe Bool }
+                verbose :: Maybe Bool,
+                usernames :: [String] }
+    deriving (Show, Data, Typeable)
 
 instance Monoid OptionalCfg where
   mempty = OptionalCfg
@@ -41,6 +55,7 @@ instance Monoid OptionalCfg where
              Nothing
              Nothing
              Nothing
+             []
 
   cfg1 `mappend` cfg2 =
     OptionalCfg
@@ -55,6 +70,7 @@ instance Monoid OptionalCfg where
       (merge (from_address cfg1) (from_address cfg2))
       (merge (to_address cfg1) (to_address cfg2))
       (merge (verbose cfg1) (verbose cfg2))
+      (usernames cfg2) -- Use only the usernames from cfg2
     where
       merge :: (Maybe a) -> (Maybe a) -> (Maybe a)
       merge Nothing Nothing   = Nothing
@@ -62,6 +78,16 @@ instance Monoid OptionalCfg where
       merge Nothing (Just x)  = Just x
       merge (Just _) (Just y) = Just y
 
+
+instance DCT.Configured [String] where
+  convert (DCT.List xs) =
+    mapM convert_string xs
+    where
+      convert_string :: DCT.Value -> Maybe String
+      convert_string = DCT.convert
+
+  convert _ = Nothing
+
 from_rc :: IO OptionalCfg
 from_rc = do
   cfg <- DC.load [ DC.Optional "$(HOME)/.twatrc" ]
@@ -76,6 +102,8 @@ from_rc = do
   cfg_from_address <- DC.lookup cfg "from"
   cfg_to_address <- DC.lookup cfg "to"
   cfg_verbose <- DC.lookup cfg "verbose"
+  cfg_usernames <- DC.lookup cfg "usernames"
+
   return $ OptionalCfg
              cfg_consumer_key
              cfg_consumer_secret
@@ -88,4 +116,4 @@ from_rc = do
              cfg_from_address
              cfg_to_address
              cfg_verbose
-
+             (fromMaybe [] cfg_usernames)