X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FConfiguration.hs;h=b4b29f3687bb7e9429ab0959368841e208fc9ea1;hp=5e84368b6853a4d85c1a293f0fd44b484ff4f4a3;hb=26718edaad5cd7921d957a1f0972fd9f5cd5b645;hpb=d721869c5e7395c021cc79f40720bdb275d613d2

diff --git a/src/Configuration.hs b/src/Configuration.hs
index 5e84368..b4b29f3 100644
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -1,19 +1,66 @@
 -- | This module defines the 'Cfg' type, which is just a wrapper
 --   around all of the configuration options we accept on the command
 --   line. We thread this throughout the rest of the program.
+--
+
 module Configuration (
   Cfg(..)
 )
 where
 
-data Cfg = Cfg { consumer_key :: String,
-                 consumer_secret :: String,
-                 access_token :: String,
-                 access_secret :: String,
-                 heartbeat :: Int,
-                 ignore_replies :: Bool,
-                 ignore_retweets :: Bool,
-                 sendmail_path :: String,
-                 from_address :: Maybe String,
-                 to_address :: Maybe String,
-                 verbose :: Bool }
+import qualified OptionalConfiguration as OC
+
+data Cfg =
+  Cfg { consumer_key :: String,
+        consumer_secret :: String,
+        access_token :: String,
+        access_secret :: String,
+        heartbeat :: Int,
+        ignore_replies :: Bool,
+        ignore_retweets :: Bool,
+        sendmail_path :: String,
+        from_address :: Maybe String,
+        to_address :: Maybe String,
+        verbose :: Bool }
+
+
+
+default_config :: Cfg
+default_config =
+  Cfg { consumer_key = "",
+        consumer_secret = "",
+        access_token = "",
+        access_secret = "",
+        heartbeat = 600,
+        ignore_replies = False,
+        ignore_retweets = False,
+        sendmail_path = "/usr/sbin/sendmail",
+        from_address = Nothing,
+        to_address = Nothing,
+        verbose = False }
+
+merge_optional :: Cfg -> OC.OptionalCfg -> Cfg
+merge_optional cfg opt_cfg =
+  Cfg
+    (merge (consumer_key cfg) (OC.consumer_key opt_cfg))
+    (merge (consumer_secret cfg) (OC.consumer_secret opt_cfg))
+    (merge (access_token cfg) (OC.access_token opt_cfg))
+    (merge (access_secret cfg) (OC.access_secret opt_cfg))
+    (merge (heartbeat cfg) (OC.heartbeat opt_cfg))
+    (merge (ignore_replies cfg) (OC.ignore_replies opt_cfg))
+    (merge (ignore_retweets cfg) (OC.ignore_retweets opt_cfg))
+    (merge (sendmail_path cfg) (OC.sendmail_path opt_cfg))
+    (merge' (from_address cfg) (OC.from_address opt_cfg))
+    (merge' (to_address cfg) (OC.to_address opt_cfg))
+    (merge (verbose cfg) (OC.verbose opt_cfg))
+  where
+    merge :: a -> Maybe a -> a
+    merge x Nothing  = x
+    merge _ (Just y) = y
+
+    -- Used for the to/from address
+    merge' :: Maybe a -> Maybe a -> Maybe a
+    merge' Nothing Nothing = Nothing
+    merge' (Just x) Nothing  = Just x
+    merge' Nothing (Just x)  = Just x
+    merge' (Just _) (Just y) = Just y