git.iko.soy/streamly
on master help sign in
Replace "String" with FilePath in Streamly.FileSystem.Dir
b2dc236Ranjeet Kumar Ranjan
core/src/Streamly/Internal/FileSystem/Dir.hs+10−10
compare with master
unifiedsplit
@@ -195,7 +195,7 @@ toStreamWithBufferOf chunkSize h = AS.concat $ toChunksWithBufferOf chunkSize h
195-- /Internal/
195-- /Internal/
196--
196--
197{-# INLINE reader #-}
197{-# INLINE reader #-}
198−reader :: MonadIO m => Unfold m String String
198+reader :: MonadIO m => Unfold m FilePath FilePath
199reader =
199reader =
200 -- XXX use proper streaming read of the dir
200 -- XXX use proper streaming read of the dir
201 UF.lmapM (liftIO . Dir.getDirectoryContents) UF.fromList
201 UF.lmapM (liftIO . Dir.getDirectoryContents) UF.fromList
@@ -211,7 +211,7 @@ reader =
211-- /Internal/
211-- /Internal/
212--
212--
213{-# INLINE eitherReader #-}
213{-# INLINE eitherReader #-}
214−eitherReader :: MonadIO m => Unfold m String (Either String String)
214+eitherReader :: MonadIO m => Unfold m FilePath (Either FilePath FilePath)
215eitherReader =
215eitherReader =
216 UF.mapM2 classify
216 UF.mapM2 classify
217 $ UF.filter (\x -> x /= "." && x /= "..")
217 $ UF.filter (\x -> x /= "." && x /= "..")
@@ -228,7 +228,7 @@ eitherReader =
228-- /Internal/
228-- /Internal/
229--
229--
230{-# INLINE fileReader #-}
230{-# INLINE fileReader #-}
231−fileReader :: MonadIO m => Unfold m String String
231+fileReader :: MonadIO m => Unfold m FilePath FilePath
232fileReader = fmap (fromRight undefined) $ UF.filter isRight eitherReader
232fileReader = fmap (fromRight undefined) $ UF.filter isRight eitherReader
233
233
234-- | Read directories only. Filter out "." and ".." entries.
234-- | Read directories only. Filter out "." and ".." entries.
@@ -236,14 +236,14 @@ fileReader = fmap (fromRight undefined) $ UF.filter isRight eitherReader
236-- /Internal/
236-- /Internal/
237--
237--
238{-# INLINE dirReader #-}
238{-# INLINE dirReader #-}
239−dirReader :: MonadIO m => Unfold m String String
239+dirReader :: MonadIO m => Unfold m FilePath FilePath
240dirReader = fmap (fromLeft undefined) $ UF.filter isLeft eitherReader
240dirReader = fmap (fromLeft undefined) $ UF.filter isLeft eitherReader
241
241
242-- | Raw read of a directory.
242-- | Raw read of a directory.
243--
243--
244-- /Pre-release/
244-- /Pre-release/
245{-# INLINE read #-}
245{-# INLINE read #-}
246−read :: MonadIO m => String -> Stream m String
246+read :: MonadIO m => FilePath -> Stream m FilePath
247read = S.unfold reader
247read = S.unfold reader
248
248
249{-# DEPRECATED toStream "Please use 'read' instead" #-}
249{-# DEPRECATED toStream "Please use 'read' instead" #-}
@@ -256,12 +256,12 @@ toStream = read
256--
256--
257-- /Pre-release/
257-- /Pre-release/
258{-# INLINE readEither #-}
258{-# INLINE readEither #-}
259−readEither :: MonadIO m => String -> Stream m (Either String String)
259+readEither :: MonadIO m => FilePath -> Stream m (Either FilePath FilePath)
260readEither = S.unfold eitherReader
260readEither = S.unfold eitherReader
261
261
262{-# DEPRECATED toEither "Please use 'readEither' instead" #-}
262{-# DEPRECATED toEither "Please use 'readEither' instead" #-}
263{-# INLINE toEither #-}
263{-# INLINE toEither #-}
264−toEither :: MonadIO m => String -> Stream m (Either String String)
264+toEither :: MonadIO m => FilePath -> Stream m (Either FilePath FilePath)
265toEither = readEither
265toEither = readEither
266
266
267-- | Read files only.
267-- | Read files only.
@@ -269,12 +269,12 @@ toEither = readEither
269-- /Internal/
269-- /Internal/
270--
270--
271{-# INLINE readFiles #-}
271{-# INLINE readFiles #-}
272−readFiles :: MonadIO m => String -> Stream m String
272+readFiles :: MonadIO m => FilePath -> Stream m FilePath
273readFiles = S.unfold fileReader
273readFiles = S.unfold fileReader
274
274
275{-# DEPRECATED toFiles "Please use 'readFiles' instead" #-}
275{-# DEPRECATED toFiles "Please use 'readFiles' instead" #-}
276{-# INLINE toFiles #-}
276{-# INLINE toFiles #-}
277−toFiles :: MonadIO m => String -> Stream m String
277+toFiles :: MonadIO m => FilePath -> Stream m FilePath
278toFiles = readFiles
278toFiles = readFiles
279
279
280-- | Read directories only.
280-- | Read directories only.
@@ -282,7 +282,7 @@ toFiles = readFiles
282-- /Internal/
282-- /Internal/
283--
283--
284{-# INLINE readDirs #-}
284{-# INLINE readDirs #-}
285−readDirs :: MonadIO m => String -> Stream m String
285+readDirs :: MonadIO m => FilePath -> Stream m FilePath
286readDirs = S.unfold dirReader
286readDirs = S.unfold dirReader
287
287
288{-# DEPRECATED toDirs "Please use 'readDirs' instead" #-}
288{-# DEPRECATED toDirs "Please use 'readDirs' instead" #-}