remote: add Recursive newtype for addToStore

Author: sorki

hnix-store-remote/src/System/Nix/Store/Remote.hs

@@ -78,7 +78,7 @@ addToStore
    . (NamedAlgo a)
   => StorePathName        -- ^ Name part of the newly created `StorePath`
   -> NarSource MonadStore -- ^ provide nar stream
-  -> Bool                 -- ^ Add target directory recursively
+  -> Recursive            -- ^ Add target directory recursively
   -> RepairFlag           -- ^ Only used by local store backend
   -> MonadStore StorePath
 addToStore name source recursive repair = do
@@ -88,8 +88,8 @@ addToStore name source recursive repair = do
   runOpArgsIO AddToStore $ \yield -> do
     yield $ toStrict $ Data.Binary.Put.runPut $ do
       putText $ System.Nix.StorePath.unStorePathName name
-      putBool $ not $ System.Nix.Hash.algoName @a == "sha256" && recursive
-      putBool recursive
+      putBool $ not $ System.Nix.Hash.algoName @a == "sha256" && (unRecursive recursive)
+      putBool (unRecursive recursive)
       putText $ System.Nix.Hash.algoName @a
     source yield
   sockGetPath

hnix-store-remote/src/System/Nix/Store/Remote/Types.hs

@@ -16,6 +16,10 @@ module System.Nix.Store.Remote.Types
   , doSubstitute
   , dontSubstitute
   , unSubstituteFlag
+  , Recursive
+  , addRecursive
+  , addNonRecursive
+  , unRecursive
   , Logger(..)
   , Field(..)
   , mapStoreDir
@@ -66,6 +70,16 @@ doSubstitute, dontSubstitute :: SubstituteFlag
 doSubstitute = SubstituteFlag True
 dontSubstitute = SubstituteFlag False
 
+-- | Recursive, used by @addToStore@
+newtype Recursive = Recursive { unRecursive :: Bool }
+  deriving (Eq, Ord, Show)
+
+addRecursive, addNonRecursive :: Recursive
+-- | Add target directory recursively
+addRecursive = Recursive True
+-- | Add target directory non-recursively
+addNonRecursive = Recursive False
+
 type MonadStore a
   = ExceptT
       String

hnix-store-remote/tests/NixDaemon.hs

@@ -161,7 +161,7 @@ withPath action = do
 dummy :: MonadStore StorePath
 dummy = do
   let name = Data.Either.fromRight (error "impossible") $ makeStorePathName "dummy"
-  addToStore @SHA256 name (dumpPath "dummy") False dontRepair
+  addToStore @SHA256 name (dumpPath "dummy") addNonRecursive dontRepair
 
 invalidPath :: StorePath
 invalidPath =
@@ -252,7 +252,7 @@ spec_protocol = Hspec.around withNixDaemon $
       itRights "adds file to store" $ do
         fp <- liftIO $ writeSystemTempFile "addition" "lal"
         let name = Data.Either.fromRight (error "impossible") $ makeStorePathName "tmp-addition"
-        res <- addToStore @SHA256 name (dumpPath fp) False dontRepair
+        res <- addToStore @SHA256 name (dumpPath fp) addNonRecursive dontRepair
         liftIO $ print res
 
     context "with dummy" $ do