use liftA2 to merge parsers

[pdns-pipe-nmc.git] / NmcDom.hs

diff --git a/NmcDom.hs b/NmcDom.hs
index bcbfcd39a3dd2c08463cb273df0e55304432932f..8bfb6f358bde32dbcf037ee59b77f97c978f904e 100644 (file)
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -9,7 +9,7 @@ module NmcDom   ( NmcDom(..)
                 ) where
 
 import Prelude hiding (length)
-import Control.Applicative ((<$>), (<*>), empty, pure)
+import Control.Applicative ((<$>), (<*>), liftA2, empty, pure)
 import Data.Char
 import Data.Text (Text, unpack)
 import Data.List (union)
@@ -17,7 +17,7 @@ import Data.List.Split
 import Data.Vector ((!), length)
 import qualified Data.Vector as V (singleton)
 import Data.Map (Map, unionWith, foldrWithKey)
-import qualified Data.Map as M (singleton, empty)
+import qualified Data.Map as M (singleton, empty, insert, insertWith)
 import qualified Data.HashMap.Strict as H (lookup)
 import Data.Aeson
 import Data.Aeson.Types
@@ -71,10 +71,29 @@ makeMx o =
     Just _ -> empty
 
 makeSubmap :: Object -> Parser (Maybe (Map String NmcDom))
-makeSubmap o = ((.).(.)) merge merge <$> takeTls o <*> takeSrv o <*> takeMap o
+makeSubmap o = takeTls o `fmerge` takeSrv o `fmerge` takeMap o
+  where fmerge = liftA2 merge
 
 takeMap :: Object -> Parser (Maybe (Map String NmcDom))
-takeMap o = o .:? "map" -- FIXME split over dots here
+takeMap o =
+  case H.lookup "map" o of
+    Nothing          -> pure Nothing
+    Just (Object mo) -> do
+      raw <- (parseJSON (Object mo) :: Parser (Maybe (Map String NmcDom)))
+      let result = fmap splitup raw
+      return result
+        where
+          splitup :: Map String NmcDom -> Map String NmcDom
+          splitup x = foldrWithKey stow M.empty x
+          stow fqdn sdom acc = M.insertWith merge fqdn' sdom' acc
+            where
+              (fqdn', sdom') = nest (filter (/= "") (splitOnDots fqdn), sdom)
+              splitOnDots s  = splitOn "." s
+              nest ([], v)   = (fqdn, v) -- preserve "self" map entry
+              nest ([k], v)  = (k, v)
+              nest (k:ks, v) =
+                nest (ks, def { domSubmap = Just (M.singleton k v) })
+    _ -> empty
 
 takeSrv :: Object -> Parser (Maybe (Map String NmcDom))
 takeSrv o =