X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;h=fca9e58eca283abfa8d45912a71dfee3baa03b39;hp=8fd9f6c68319d204a94efc4e3a9d17f052124758;hb=15fd6f764f88f79424d7caaba564e57df564b532;hpb=dad4547feb83fcc2035df684936cedba6272a86f

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 8fd9f6c..fca9e58 100644
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -38,18 +38,22 @@ import Usernames ( Usernames(..) )
 --   can parse more than one of them.
 --
 data OptionalCfg =
-  OptionalCfg { consumer_key :: Maybe String,
-                consumer_secret :: Maybe String,
+  OptionalCfg { access_secret :: Maybe String,
                 access_token :: Maybe String,
-                access_secret :: Maybe String,
+                consumer_key :: Maybe String,
+                consumer_secret :: Maybe String,
+                daemonize :: Maybe Bool,
+                from_address :: Maybe String,
                 heartbeat :: Maybe Int,
                 ignore_replies :: Maybe Bool,
                 ignore_retweets :: Maybe Bool,
+                pidfile :: Maybe FilePath,
+                run_as_group :: Maybe String,
+                run_as_user :: Maybe String,
                 sendmail_path :: Maybe String,
-                from_address :: Maybe String,
                 to_address :: Maybe String,
-                verbose :: Maybe Bool,
-                usernames :: Usernames }
+                usernames :: Usernames,
+                verbose :: Maybe Bool }
     deriving (Show, Data, Typeable)
 
 instance Monoid OptionalCfg where
@@ -65,22 +69,30 @@ instance Monoid OptionalCfg where
              Nothing
              Nothing
              Nothing
-             (Usernames [])
+             Nothing
+             Nothing
+             Nothing
+             mempty
+             Nothing
 
   cfg1 `mappend` cfg2 =
     OptionalCfg
+      (merge (access_secret cfg1) (access_secret cfg2))
+      (merge (access_token cfg1) (access_token cfg2))
       (merge (consumer_key cfg1) (consumer_key cfg2))
       (merge (consumer_secret cfg1) (consumer_secret cfg2))
-      (merge (access_token cfg1) (access_token cfg2))
-      (merge (access_secret cfg1) (access_secret cfg2))
+      (merge (daemonize cfg1) (daemonize cfg2))
+      (merge (from_address cfg1) (from_address cfg2))
       (merge (heartbeat cfg1) (heartbeat cfg2))
       (merge (ignore_replies cfg1) (ignore_replies cfg2))
       (merge (ignore_retweets cfg1) (ignore_retweets cfg2))
+      (merge (pidfile cfg1) (pidfile cfg2))
+      (merge (run_as_group cfg1) (run_as_group cfg2))
+      (merge (run_as_user cfg1) (run_as_user cfg2))
       (merge (sendmail_path cfg1) (sendmail_path cfg2))
-      (merge (from_address cfg1) (from_address cfg2))
       (merge (to_address cfg1) (to_address cfg2))
+      ((usernames cfg1) `mappend` (usernames cfg2))
       (merge (verbose cfg1) (verbose cfg2))
-      all_usernames
     where
       merge :: (Maybe a) -> (Maybe a) -> (Maybe a)
       merge Nothing Nothing   = Nothing
@@ -88,11 +100,6 @@ 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
 
 
 -- | Obtain an 'OptionalCfg' from halcyonrc in either the global
@@ -117,29 +124,37 @@ from_rc = do
   cfg <- DC.load [ DC.Optional global_config_path,
                    DC.Optional user_config_path ]
 
+  cfg_access_secret <- DC.lookup cfg "access-secret"
+  cfg_access_token <- DC.lookup cfg "access-token"
   cfg_consumer_key <- DC.lookup cfg "consumer-key"
   cfg_consumer_secret <- DC.lookup cfg "consumer-secret"
-  cfg_access_token <- DC.lookup cfg "access-token"
-  cfg_access_secret <- DC.lookup cfg "access-secret"
+  cfg_daemonize <- DC.lookup cfg "daemonize"
+  cfg_from_address <- DC.lookup cfg "from"
   cfg_heartbeat <- DC.lookup cfg "heartbeat"
   cfg_ignore_replies <- DC.lookup cfg "ignore-replies"
   cfg_ignore_retweets <- DC.lookup cfg "ignore-retweets"
+  cfg_pidfile <- DC.lookup cfg "pidfile"
+  cfg_run_as_group <- DC.lookup cfg "run_as_group"
+  cfg_run_as_user <- DC.lookup cfg "run_as_user"
   cfg_sendmail_path <- DC.lookup cfg "sendmail-path"
-  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"
+  cfg_verbose <- DC.lookup cfg "verbose"
 
   return $ OptionalCfg
+             cfg_access_secret
+             cfg_access_token
              cfg_consumer_key
              cfg_consumer_secret
-             cfg_access_token
-             cfg_access_secret
+             cfg_daemonize
+             cfg_from_address
              cfg_heartbeat
              cfg_ignore_replies
              cfg_ignore_retweets
+             cfg_pidfile
+             cfg_run_as_group
+             cfg_run_as_user
              cfg_sendmail_path
-             cfg_from_address
              cfg_to_address
+             (fromMaybe mempty cfg_usernames)
              cfg_verbose
-             (fromMaybe (Usernames []) cfg_usernames)