Use streamly-posix for dircontents wrt #34

Also add getDirsFilesStream.

hpath-directory/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for hpath-directory
 
+## 0.13.4 -- 2020-05-08
+
+* Add getDirsFilesStream and use streamly-posix for dircontents (#34)
+
 ## 0.13.3 -- 2020-04-14
 
 * Fix tests on mac

hpath-directory/hpath-directory.cabal

@@ -1,7 +1,7 @@
 cabal-version:       >=1.10
 
 name:                hpath-directory
-version:             0.13.3
+version:             0.13.4
 synopsis:            Alternative to 'directory' package with ByteString based filepaths
 description:         This provides a safer alternative to the 'directory'
                      package. FilePaths are ByteString based, so this
@@ -44,6 +44,7 @@ library
                        , safe-exceptions     >= 0.1
                        , streamly            >= 0.7
                        , streamly-bytestring >= 0.1.2
+                       , streamly-posix      >= 0.1.0.0
                        , time                >= 1.8
                        , unix                >= 2.5
                        , unix-bytestring     >= 0.3

hpath-directory/src/System/Posix/RawFilePath/Directory.hs

@@ -28,6 +28,7 @@
 -- > import System.Posix.RawFilePath.Directory
 
 {-# LANGUAGE CPP              #-}
+{-# LANGUAGE FlexibleContexts #-} -- streamly
 
 module System.Posix.RawFilePath.Directory
   (
@@ -82,6 +83,7 @@ module System.Posix.RawFilePath.Directory
   -- * Directory reading
   , getDirsFiles
   , getDirsFiles'
+  , getDirsFilesStream
   -- * Filetype operations
   , getFileType
   -- * Others
@@ -93,8 +95,11 @@ where
 
 import           Control.Applicative            ( (<$>) )
 import           Control.Exception.Safe         ( IOException
+                                                , MonadCatch
+                                                , MonadMask
                                                 , bracket
                                                 , bracketOnError
+                                                , onException
                                                 , throwIO
                                                 , finally
                                                 )
@@ -105,6 +110,7 @@ import           Control.Monad                  ( unless
 import           Control.Monad.Catch            ( MonadThrow(..) )
 import           Control.Monad.Fail             ( MonadFail )
 import           Control.Monad.IfElse           ( unlessM )
+import           Control.Monad.IO.Class         ( liftIO )
 import qualified Data.ByteString               as BS
 import           Data.ByteString                ( ByteString )
 import           Data.Traversable               ( for )
@@ -155,6 +161,8 @@ import           Streamly
 import           Streamly.External.ByteString
 import qualified Streamly.External.ByteString.Lazy
                                                as SL
+import qualified Streamly.External.Posix.DirStream
+                                               as SD
 import qualified Streamly.Data.Fold            as FL
 import           Streamly.Memory.Array
 import qualified Streamly.FileSystem.Handle    as FH
@@ -1147,11 +1155,17 @@ getDirsFiles p = do
 -- of prepending the base path.
 getDirsFiles' :: RawFilePath        -- ^ dir to read
               -> IO [RawFilePath]
-getDirsFiles' fp = do
+getDirsFiles' fp = getDirsFilesStream fp >>= S.toList
+
+
+-- | Like 'getDirsFiles'', except returning a Stream.
+getDirsFilesStream :: (MonadCatch m, MonadAsync m, MonadMask m)
+                   => RawFilePath
+                   -> IO (SerialT m RawFilePath)
+getDirsFilesStream fp = do
   fd <- openFd fp SPI.ReadOnly [SPDF.oNofollow] Nothing
-  rawContents <- getDirectoryContents' fd
+  ds <- SPDT.fdOpendir fd `onException` SPI.closeFd fd
-  fmap catMaybes $ for rawContents $ \(_, f) ->
+  pure $ fmap snd $ SD.dirContentsStream ds
-    if FP.isSpecialDirectoryEntry f then pure Nothing else pure $ Just f
 
 
 

hpath-io/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for hpath-io
 
+## 0.13.2 -- 2020-05-08
+
+* Add getDirsFilesStream and use streamly-posix for dircontents (#34)
+
 ## 0.13.0 -- 2020-01-26
 
 * switch to using 'hpath-bytestring' for the implementation (this is now just a wrapper module, mostly)

hpath-io/hpath-io.cabal

@@ -1,5 +1,5 @@
 name:                hpath-io
-version:             0.13.1
+version:             0.13.2
 synopsis:            High-level IO operations on files/directories
 description:         High-level IO operations on files/directories, utilizing type-safe Paths
 -- bug-reports:

hpath-io/src/HPath/IO.hs

@@ -27,6 +27,7 @@
 -- For other functions (like `copyFile`), the behavior on these file types is
 -- unreliable/unsafe. Check the documentation of those functions for details.
 
+{-# LANGUAGE FlexibleContexts #-} -- streamly
 {-# LANGUAGE PackageImports   #-}
 
 module HPath.IO
@@ -82,6 +83,7 @@ module HPath.IO
   -- * Directory reading
   , getDirsFiles
   , getDirsFiles'
+  , getDirsFilesStream
   -- * Filetype operations
   , getFileType
   -- * Others
@@ -94,7 +96,9 @@ module HPath.IO
 where
 
 
-import           Control.Exception.Safe         ( bracketOnError
+import           Control.Exception.Safe         ( MonadMask
+                                                , MonadCatch
+                                                , bracketOnError
                                                 , finally
                                                 )
 import           Control.Monad.Catch            ( MonadThrow(..) )
@@ -761,6 +765,15 @@ getDirsFiles' (Path fp) = do
   for rawContents $ \r -> parseRel r
 
 
+-- | Like 'getDirsFiles'', except returning a Stream.
+getDirsFilesStream :: (MonadCatch m, MonadAsync m, MonadMask m)
+                   => Path b
+                   -> IO (SerialT m (Path Rel))
+getDirsFilesStream (Path fp) = do
+  s <- RD.getDirsFilesStream fp
+  pure (s >>= parseRel)
+
+
 
 
     ---------------------------