X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;h=607659ea811ce200577ed1a04a645b86ae2a602b;hp=53635439ac354c76bc1f9d96d074fac6ee89254c;hb=d7c6b5499c0969b6e488d9fc583f93bbb4e3d4c7;hpb=26718edaad5cd7921d957a1f0972fd9f5cd5b645

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 5363543..607659e 100644
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -1,20 +1,37 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
 
--- | The program will parse ~/.twatrc for any available configuration
+-- | The program will parse ~/.halcyonrc for any available configuration
 --   directives, resulting in an OptionalCfg. The command-line
 --   arguments will be used to create another OptionalCfg, and the two
 --   will be merged. Finally, a default_config will be updated from
 --   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 as DC (
+  Worth (Optional),
+  load,
+  lookup )
 
--- 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.
+import Data.Data ( Data )
+import Data.Maybe ( fromMaybe )
+import Data.Monoid ( Monoid(..) )
+import Data.Typeable ( Typeable )
+
+import Usernames ( Usernames(..) )
+
+
+-- | 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 +43,9 @@ data OptionalCfg =
                 sendmail_path :: Maybe String,
                 from_address :: Maybe String,
                 to_address :: Maybe String,
-                verbose :: Maybe Bool }
+                verbose :: Maybe Bool,
+                usernames :: Usernames }
+    deriving (Show, Data, Typeable)
 
 instance Monoid OptionalCfg where
   mempty = OptionalCfg
@@ -41,6 +60,7 @@ instance Monoid OptionalCfg where
              Nothing
              Nothing
              Nothing
+             (Usernames [])
 
   cfg1 `mappend` cfg2 =
     OptionalCfg
@@ -55,6 +75,7 @@ instance Monoid OptionalCfg where
       (merge (from_address cfg1) (from_address cfg2))
       (merge (to_address cfg1) (to_address cfg2))
       (merge (verbose cfg1) (verbose cfg2))
+      all_usernames
     where
       merge :: (Maybe a) -> (Maybe a) -> (Maybe a)
       merge Nothing Nothing   = Nothing
@@ -62,9 +83,15 @@ instance Monoid OptionalCfg where
       merge Nothing (Just x)  = Just x
       merge (Just _) (Just y) = Just y
 
+      -- Use only the latter usernames if there are any.
+      all_usernames =
+        usernames $ if (null (get_usernames (usernames cfg2)))
+                    then cfg1
+                    else cfg2
+
 from_rc :: IO OptionalCfg
 from_rc = do
-  cfg <- DC.load [ DC.Optional "$(HOME)/.twatrc" ]
+  cfg <- DC.load [ DC.Optional "$(HOME)/.halcyonrc" ]
   cfg_consumer_key <- DC.lookup cfg "consumer-key"
   cfg_consumer_secret <- DC.lookup cfg "consumer-secret"
   cfg_access_token <- DC.lookup cfg "access-token"
@@ -76,6 +103,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 +117,4 @@ from_rc = do
              cfg_from_address
              cfg_to_address
              cfg_verbose
-
+             (fromMaybe (Usernames []) cfg_usernames)