begin config file parser

3 files changed, 22 insertions, 5 deletions

diff --git a/fsmgr.cabal b/fsmgr.cabal
index 06a6bdb..b6b9eaa 100644
--- a/fsmgr.cabal
+++ b/fsmgr.cabal
@@ -36,7 +36,7 @@ executable fsmgr
   ghc-options: -threaded -rtsopts -with-rtsopts=-N -W -Wall
   build-depends:
                 base >=4.7 && <5, rebase, optparse-applicative, typed-process,
-                directory, filepath, yaml, lens, lens-aeson, cryptonite, memory, basement, fsmgr
+                directory, filepath, yaml-combinators, lens, lens-aeson, cryptonite, memory, basement, fsmgr
   default-language: Haskell2010
 
 -- test-suite fsmgr-test
diff --git a/fsmgr.hs b/fsmgr.hs
index 3c5e72f..71c38e0 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -1,11 +1,16 @@
+{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE InstanceSigs          #-}
 {-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE PartialTypeSignatures #-}
 module Main where
-import           Rebase.Prelude                hiding (hash)
+import           Rebase.Prelude                hiding (hash, bool)
 
 import           Crypto.Hash
 import           Crypto.Hash.Types.Digest.Read ()
+import           Data.Yaml.Combinators
+import qualified Rebase.Data.Set               as Set
+import qualified Rebase.Data.Vector            as Vector
 
 {-
 
@@ -35,14 +40,25 @@ sha1 :: ByteString -> Digest SHA1
 sha1 = hash
 
 data DiskImageConfig = DiskImageConfig {
-  initialImage  :: Either Integer (Digest SHA1)
+  initialImage  :: Either Int Text -- :: Either Integer (Digest SHA1)
 , unpacked      :: Set Package
 , debconfConfig :: DebconfConfig
-, configured    :: Set Package
-, patched       :: [Patch]
+, configured    :: Bool
+, patched       :: Vector Text -- :: [Patch]
 } deriving (Show, Read)
 
+diskImageConfigParser :: Parser DiskImageConfig
+diskImageConfigParser = object $
+  DiskImageConfig
+  <$> field "initial-image" ((Left <$> integer) <> (Right <$> string))
+  <*> (Set.fromList . toList . fmap f <$> (field "packages" (array string)))
+  <*> pure (DebconfConfig "")
+  <*> defaultField "configure" True bool
+  <*> ((fromMaybe Vector.empty) <$> (optField "patches" (array string)))
 
+  where
+    f :: Text -> Package
+    f = undefined
 
 main :: IO ()
 main = return ()
diff --git a/stack.yaml b/stack.yaml
index c7632a6..916aeaf 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -3,3 +3,4 @@ packages:
 - .
 extra-deps:
 - rebase-1.2.4
+- yaml-combinators-1.1.1.1