find-conduit 0.4.3 → 0.4.4
raw patch · 3 files changed
+11/−19 lines, 3 filesdep −system-filepathPVP ok
version bump matches the API change (PVP)
Dependencies removed: system-filepath
API changes (from Hackage documentation)
Files
- Data/Conduit/Find.hs +5/−9
- find-conduit.cabal +1/−4
- test/find-hs.hs +5/−6
Data/Conduit/Find.hs view
@@ -94,9 +94,6 @@ import Data.Text (Text, unpack, pack) import Data.Time import Data.Time.Clock.POSIX-import Filesystem.Path.CurrentOS (FilePath,- encodeString, decodeString)-import Prelude hiding (FilePath) import qualified System.FilePath as FP import System.PosixCompat.Files import System.PosixCompat.Types@@ -489,8 +486,8 @@ sourceFindFiles findOptions startPath predicate = do startDc <- newDirCounter walk startDc- (newFileEntry (encodeString startPath) 0 findOptions)- (encodeString startPath)+ (newFileEntry startPath 0 findOptions)+ startPath predicate where walk :: MonadResource m@@ -589,8 +586,7 @@ -> CondT FileEntry m a -> Producer m FilePath findFilePaths opts path predicate =- mapOutput decodeString $- sourceFindFiles opts path predicate =$= mapC (entryPath . fst)+ sourceFindFiles opts path predicate =$= mapC (entryPath . fst) -- | Calls 'findFilePaths' with the default set of finding options. -- Equivalent to @findFilePaths defaultFindOptions@.@@ -602,13 +598,13 @@ -- 'findFiles'. test :: MonadIO m => CondT FileEntry m () -> FilePath -> m Bool test matcher path =- Cond.test (newFileEntry (encodeString path) 0 defaultFindOptions) matcher+ Cond.test (newFileEntry path 0 defaultFindOptions) matcher -- | Test a file path using the same type of predicate that is accepted by -- 'findFiles', but do not follow symlinks. ltest :: MonadIO m => CondT FileEntry m () -> FilePath -> m Bool ltest matcher path = Cond.test- (newFileEntry (encodeString path) 0 defaultFindOptions+ (newFileEntry path 0 defaultFindOptions { findFollowSymlinks = False }) matcher
find-conduit.cabal view
@@ -1,5 +1,5 @@ Name: find-conduit-Version: 0.4.3+Version: 0.4.4 Synopsis: A file-finding conduit that allows user control over traversals. License-file: LICENSE License: MIT@@ -31,7 +31,6 @@ , conduit-extra , conduit-combinators , attoparsec- , system-filepath , unix-compat >= 0.4.1.1 , text >= 0.11.3.1 , regex-posix@@ -61,7 +60,6 @@ , conduit , conduit-combinators , attoparsec- , system-filepath , unix-compat >= 0.4.1.1 , text >= 0.11.3.1 , regex-posix@@ -102,7 +100,6 @@ , conduit-extra , conduit-combinators , attoparsec- , system-filepath , unix >= 0.4.1.1 , text >= 0.11.3.1 , regex-posix
test/find-hs.hs view
@@ -5,7 +5,6 @@ import Control.Monad.Reader.Class import Data.Conduit.Find import Data.List-import Filesystem.Path.CurrentOS import System.Environment import System.Posix.Process @@ -16,14 +15,14 @@ "conduit" -> do putStrLn "Running sourceDirectoryDeep from conduit-extra" runResourceT $- sourceDirectoryDeep False (decodeString dir)- =$ filterC ((".hs" `isSuffixOf`) . encodeString)- $$ mapM_C (liftIO . putStrLn . encodeString)+ sourceDirectoryDeep False dir+ =$ filterC (".hs" `isSuffixOf`)+ $$ mapM_C (liftIO . putStrLn) "find-conduit" -> do putStrLn "Running findFiles from find-conduit" findFiles defaultFindOptions { findFollowSymlinks = False }- (decodeString dir) $ do+ dir $ do path <- asks entryPath guard (".hs" `isSuffixOf` path) norecurse@@ -33,7 +32,7 @@ putStrLn "Running findFiles from find-conduit" runResourceT $ sourceFindFiles defaultFindOptions { findFollowSymlinks = False }- (decodeString dir) (return ())+ dir (return ()) =$ filterC ((".hs" `isSuffixOf`) . entryPath . fst) $$ mapM_C (liftIO . putStrLn . entryPath . fst)