1 files changed, 67 insertions, 44 deletions

diff --git a/Presence/ConfigFiles.hs b/Presence/ConfigFiles.hs
index 808e6dd8..b745094f 100644
--- a/Presence/ConfigFiles.hs
+++ b/Presence/ConfigFiles.hs
@@ -18,32 +18,42 @@ import Data.List (partition)
 import Data.Maybe (catMaybes,isJust)
 
 type User = ByteString
+type Profile = String
 
-configDir = ".presence"
-buddyFile = "buddies"
+configDir, buddyFile, subscriberFile,
+  otherFile, pendingFile, solicitedFile,
+  secretsFile :: FilePath
+
+configDir      = ".presence"
+buddyFile      = "buddies"
 subscriberFile = "subscribers"
-otherFile = "others"
-pendingFile = "pending"
-solicitedFile = "solicited"
+otherFile      = "others"
+pendingFile    = "pending"
+solicitedFile  = "solicited"
+secretsFile    = "secrets"
 
 
-configPath :: User -> String -> IO String
-configPath user filename = do
+configPath :: User -> Profile -> String -> IO String
+configPath user "." filename = do
     ue <- getUserEntryForName (unpack user)
     return $ (++("/"++configDir++"/"++filename)) $ homeDirectory ue
+configPath user profile filename = do
+    ue <- getUserEntryForName (unpack user)
+    return $ (++("/"++configDir++"/"++profile++"/"++filename)) $ homeDirectory ue
 
-
+createConfigFile :: ByteString -> FilePath -> IO ()
 createConfigFile tag path = do
     let dir = dropFileName path
     doesDirectoryExist dir >>= flip unless (do
-            createDirectory dir 
+            createDirectory dir
         )
     withFile path WriteMode $ \h -> do
         L.hPutStrLn h tag
 
+addItem :: ByteString -> ByteString -> FilePath -> IO ()
 addItem item tag path =
     let doit = do
-         handle (\e -> when (isDoesNotExistError e) 
+         handle (\e -> when (isDoesNotExistError e)
                        (createConfigFile tag path >> doit))
            $ do exists <- fileExist path
                 if exists
@@ -55,16 +65,27 @@ addItem item tag path =
     in doit
 
 
+-- | Modify a presence configuration file.  This function will iterate over all
+-- items in the file and invoke a test function.  If the function returns
+-- Nothing, that item is removed from the file.  Otherwise, the function may
+-- rename the item by returning the new name.
+--
+-- If the last argument is populated, it is a new item to append to the end of
+-- the file.
+--
+-- Note that the entire file is read in, processed, and then rewritten from
+-- scratch.
 modifyFile ::
   (ByteString,FilePath)
-  -> ByteString
-  -> (ByteString -> IO (Maybe ByteString))
-  -> Maybe ByteString
+  -> User
+  -> Profile
+  -> (ByteString -> IO (Maybe ByteString)) -- Returns Just for each item you want to keep.
+  -> Maybe ByteString -- Optionally append this item.
   -> IO Bool -- Returns True if test function ever returned Nothing
-modifyFile (tag,file) user test appending = configPath user file >>= doit
+modifyFile (tag,file) user profile test appending = configPath user profile file >>= doit
     where
         doit path = do
-         handle (\e -> if (isDoesNotExistError e) 
+         handle (\e -> if (isDoesNotExistError e)
                         then (createConfigFile tag path >> doit path)
                         else return False)
            $ do exists <- fileExist path
@@ -85,46 +106,48 @@ modifyFile (tag,file) user test appending = configPath user file >>= doit
                     withFile path WriteMode $ \h -> do
                         L.hPutStrLn h tag
                         withJust appending (L.hPutStrLn h)
-                    return False 
-
+                    return False
 
-modifySolicited  = modifyFile ("<? solicited ?>" , solicitedFile)
-modifyBuddies    = modifyFile ("<? buddies ?>"   , buddyFile)
-modifyOthers     = modifyFile ("<? others ?>"    , otherFile)
-modifyPending    = modifyFile ("<? pending ?>"   , pendingFile)
-modifySubscribers = modifyFile ("<? subscribers ?>", subscriberFile)
+modifySolicited, modifyBuddies, modifyOthers, modifyPending, modifySubscribers
+  :: User -> Profile -> (ByteString -> IO (Maybe ByteString)) -> Maybe ByteString -> IO Bool
 
-addBuddy :: User -> ByteString -> IO ()
-addBuddy user buddy =
-    configPath user buddyFile >>= addItem buddy "<? buddies ?>"
+modifySolicited   = modifyFile ("<? solicited ?>"   , solicitedFile)
+modifyBuddies     = modifyFile ("<? buddies ?>"     , buddyFile)
+modifyOthers      = modifyFile ("<? others ?>"      , otherFile)
+modifyPending     = modifyFile ("<? pending ?>"     , pendingFile)
+modifySubscribers = modifyFile ("<? subscribers ?>" , subscriberFile)
 
-addSubscriber :: User -> ByteString -> IO ()
-addSubscriber user subscriber =
-    configPath user subscriberFile >>= addItem subscriber "<? subscribers ?>"
+addBuddy :: User -> Profile -> ByteString -> IO ()
+addBuddy user profile buddy =
+    configPath user profile buddyFile >>= addItem buddy "<? buddies ?>"
 
-addSolicited :: User -> ByteString -> IO ()
-addSolicited user solicited =
-    configPath user solicitedFile >>= addItem solicited "<? solicited ?>"
+addSubscriber :: User -> Profile -> ByteString -> IO ()
+addSubscriber user profile subscriber =
+    configPath user profile subscriberFile >>= addItem subscriber "<? subscribers ?>"
 
+addSolicited :: User -> Profile -> ByteString -> IO ()
+addSolicited user profile solicited =
+    configPath user profile solicitedFile >>= addItem solicited "<? solicited ?>"
 
-getConfigList path = 
+getConfigList :: FilePath -> IO [ByteString]
+getConfigList path =
   handle (\e -> if isDoesNotExistError e then (return []) else throw e)
     $ withFile path ReadMode $
-        L.hGetContents 
-        >=> return . Prelude.tail . L.lines 
+        L.hGetContents
+        >=> return . Prelude.tail . L.lines
         >=> (\a -> seq (rnf a) (return a))
 
-getBuddies :: User -> IO [ByteString]
-getBuddies user = configPath user buddyFile >>= getConfigList
+getBuddies :: User -> Profile -> IO [ByteString]
+getBuddies user profile = configPath user profile buddyFile >>= getConfigList
 
-getSubscribers :: User -> IO [ByteString]
-getSubscribers user = configPath user subscriberFile >>= getConfigList
+getSubscribers :: User -> Profile -> IO [ByteString]
+getSubscribers user profile = configPath user profile subscriberFile >>= getConfigList
 
-getOthers :: User -> IO [ByteString]
-getOthers user = configPath user otherFile >>= getConfigList
+getOthers :: User -> Profile -> IO [ByteString]
+getOthers user profile = configPath user profile otherFile >>= getConfigList
 
-getPending :: User -> IO [ByteString]
-getPending user = configPath user pendingFile >>= getConfigList
+getPending :: User -> Profile -> IO [ByteString]
+getPending user profile = configPath user profile pendingFile >>= getConfigList
 
-getSolicited :: User -> IO [ByteString]
-getSolicited user = configPath user solicitedFile >>= getConfigList
+getSolicited :: User -> Profile -> IO [ByteString]
+getSolicited user profile = configPath user profile solicitedFile >>= getConfigList