Merge pull request #203 from serokell/Player205/#198-Another-fix-of-compatibility-with-nix-store

[#198] Another fix of compatibility with nix store

Author: domenkozar

hnix-store-core/src/System/Nix/Internal/Nar/Streamer.hs

@@ -1,6 +1,6 @@
 -- | Stream out a NAR file from a regular file
 
-{-# language ScopedTypeVariables #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module System.Nix.Internal.Nar.Streamer
   ( NarSource
@@ -16,8 +16,10 @@ import qualified Data.ByteString                 as Bytes
 import qualified Data.ByteString.Char8           as Bytes.Char8
 import qualified Data.ByteString.Lazy            as Bytes.Lazy
 import qualified Data.Serialize                  as Serial
+import qualified Data.Text                       as T (pack)
+import qualified Data.Text.Encoding              as TE (encodeUtf8)
 import qualified System.Directory                as Directory
-import           System.FilePath                  ( (</>) )
+import           System.FilePath                 ((</>))
 
 import qualified System.Nix.Internal.Nar.Effects as Nar
 
@@ -61,33 +63,32 @@ streamNarIO effs basePath yield = do
  where
   go :: FilePath -> m ()
   go path = do
-    isDir     <- IO.liftIO $ Nar.narIsDir effs path
     isSymLink <- IO.liftIO $ Nar.narIsSymLink effs path
-    let isRegular = not $ isDir || isSymLink
-
-    when isSymLink $ do
+    if isSymLink then do
       target <- IO.liftIO $ Nar.narReadLink effs path
       yield $
-        strs ["type", "symlink", "target", Bytes.Char8.pack target]
-
-    when isRegular $ do
-      isExec <- IO.liftIO $ isExecutable effs path
-      yield $ strs ["type", "regular"]
-      when (isExec == Executable) $ yield $ strs ["executable", ""]
-      fSize <- IO.liftIO $ Nar.narFileSize effs path
-      yield $ str "contents"
-      yield $ int fSize
-      yieldFile path fSize
-
-    when (isDir && not isSymLink) $ do
-      fs <- IO.liftIO (Nar.narListDir effs path)
-      yield $ strs ["type", "directory"]
-      forM_ (sort fs) $ \f -> do
-        yield $ str "entry"
-        parens $ do
-          let fullName = path </> f
-          yield $ strs ["name", Bytes.Char8.pack f, "node"]
-          parens $ go fullName
+        strs ["type", "symlink", "target", filePathToBS target]
+      else do
+        isDir <- IO.liftIO $ Nar.narIsDir effs path
+        if isDir then do
+          fs <- IO.liftIO (Nar.narListDir effs path)
+          yield $ strs ["type", "directory"]
+          forM_ (sort fs) $ \f -> do
+            yield $ str "entry"
+            parens $ do
+              let fullName = path </> f
+              yield $ strs ["name", filePathToBS f, "node"]
+              parens $ go fullName
+        else do
+          isExec <- IO.liftIO $ isExecutable effs path
+          yield $ strs ["type", "regular"]
+          when (isExec == Executable) $ yield $ strs ["executable", ""]
+          fSize <- IO.liftIO $ Nar.narFileSize effs path
+          yield $ str "contents"
+          yield $ int fSize
+          yieldFile path fSize
+
+  filePathToBS = TE.encodeUtf8 . T.pack
 
   parens act = do
     yield $ str "("