X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;h=4faff205cfd416318a2bbc0fb03fa833fbd34100;hb=1585e5bef7e46666a8f026a00884323c9834565b;hp=d2b6a051a3e8593024c7c9dceffadf41a4fa9e2e;hpb=72482968102ebd7ad0abeef958fed2a02a126dd2;p=mailbox-count.git

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index d2b6a05..4faff20 100644
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -10,7 +10,8 @@
 
 module OptionalConfiguration (
   OptionalConfiguration(..),
-  from_rc )
+  from_rc,
+  merge_maybes )
 where
 
 import qualified Data.Configurator as DC (
@@ -19,7 +20,8 @@ import qualified Data.Configurator as DC (
   lookup )
 import Data.Data ( Data )
 import Data.Typeable ( Typeable )
-import Data.Monoid ( Monoid(..) )
+import Data.Monoid ( Monoid() )
+import Data.Semigroup ( Semigroup() )
 import Paths_mailbox_count ( getSysconfDir )
 import System.Directory ( getHomeDirectory )
 import System.FilePath ( (</>) )
@@ -33,12 +35,13 @@ import System.IO.Error ( catchIOError )
 --
 data OptionalConfiguration =
   OptionalConfiguration {
-    both     :: Maybe Bool,
     database :: Maybe String,
     detail   :: Maybe Bool,
+    detail_query :: Maybe String,
     host     :: Maybe String,
     password :: Maybe String,
     port     :: Maybe Int,
+    summary_query :: Maybe String,
     username :: Maybe String }
   deriving (Show, Data, Typeable)
 
@@ -71,16 +74,19 @@ instance Monoid OptionalConfiguration where
              Nothing
              Nothing
              Nothing
+             Nothing
 
+instance Semigroup OptionalConfiguration where
   -- | Combine @cfg1@ and @cfg2@, giving precedence to @cfg2@.
-  cfg1 `mappend` cfg2 =
+  cfg1 <> cfg2 =
     OptionalConfiguration
-      (merge_maybes (both cfg1) (both cfg2))
       (merge_maybes (database cfg1) (database cfg2))
       (merge_maybes (detail cfg1) (detail cfg2))
+      (merge_maybes (detail_query cfg1) (detail_query cfg2))
       (merge_maybes (host cfg1) (host cfg2))
       (merge_maybes (password cfg1) (password cfg2))
       (merge_maybes (port cfg1) (port cfg2))
+      (merge_maybes (summary_query cfg1) (summary_query cfg2))
       (merge_maybes (username cfg1) (username cfg2))
 
 
@@ -106,19 +112,21 @@ from_rc = do
   let user_config_path = home </> ".mailbox-countrc"
   cfg <- DC.load [ DC.Optional global_config_path,
                    DC.Optional user_config_path ]
-  cfg_both <- DC.lookup cfg "both"
   cfg_database <- DC.lookup cfg "database"
   cfg_detail <- DC.lookup cfg "detail"
+  cfg_detail_query <- DC.lookup cfg "detail_query"
   cfg_host <- DC.lookup cfg "host"
   cfg_password <- DC.lookup cfg "password"
   cfg_port <- DC.lookup cfg "port"
+  cfg_summary_query <- DC.lookup cfg "summary_query"
   cfg_username <- DC.lookup cfg "username"
 
   return $ OptionalConfiguration
-             cfg_both
              cfg_database
              cfg_detail
+             cfg_detail_query
              cfg_host
              cfg_password
              cfg_port
+             cfg_summary_query
              cfg_username