f609af1 · streamly · git.iko.soy

git.iko.soy/streamly

on master help sign in

Move Streamly.FileSystem.Handle to streamly-core

f609af1Ranjeet Kumar Ranjan4 years ago

src/Streamly/FileSystem/Handle.hs → core/src/Streamly/FileSystem/Handle.hsrenamed

compare with master

unifiedsplit

The content is the same.

src/Streamly/Internal/FileSystem/Handle.hs → core/src/Streamly/Internal/FileSystem/Handle.hsrenamed+9−13

@@ -131,10 +131,8 @@ import Streamly.Internal.System.IO (defaultChunkSize)

131import qualified Streamly.Data.Fold as FL

132import qualified Streamly.Data.Array.Unboxed as A

133import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

134− (byteLength, asPtrUnsafe)

135−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MArray

136− (Array(..), newPinnedArrayBytes, asPtrUnsafe)

137import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

134import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

135+import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MArray

138import qualified Streamly.Internal.Data.Refold.Type as Refold

136import qualified Streamly.Internal.Data.Refold.Type as Refold

139import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)

137import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)

140import qualified Streamly.Internal.Data.Stream as S

138import qualified Streamly.Internal.Data.Stream as S

@@ -212,8 +210,7 @@ getChunkOf = undefined

212-- read may be less than or equal to @size@.

210-- read may be less than or equal to @size@.

213-- @since 0.9.0

211-- @since 0.9.0

214{-# INLINE _getChunksWith #-}

212{-# INLINE _getChunksWith #-}

215−_getChunksWith :: (MonadIO m)

216− => Int -> Handle -> Stream m (Array Word8)

213+_getChunksWith :: MonadIO m => Int -> Handle -> Stream m (Array Word8)

217_getChunksWith size h = S.fromStreamK go

214_getChunksWith size h = S.fromStreamK go

218 where

215 where

219 -- XXX use cons/nil instead

216 -- XXX use cons/nil instead

@@ -231,8 +228,7 @@ _getChunksWith size h = S.fromStreamK go

231--

228--

232-- @since 0.9.0

229-- @since 0.9.0

233{-# INLINE_NORMAL getChunksWith #-}

230{-# INLINE_NORMAL getChunksWith #-}

234−getChunksWith :: (MonadIO m) =>

235− Int -> Handle -> Stream m (Array Word8)

231+getChunksWith :: MonadIO m => Int -> Handle -> Stream m (Array Word8)

236getChunksWith size h = S.fromStreamD (D.Stream step ())

232getChunksWith size h = S.fromStreamD (D.Stream step ())

237 where

233 where

238 {-# INLINE_LATE step #-}

234 {-# INLINE_LATE step #-}

@@ -313,7 +309,7 @@ readChunksFromToWith = Unfold step inject

313--

309--

314-- @since 0.9.0

310-- @since 0.9.0

315{-# INLINE getChunks #-}

311{-# INLINE getChunks #-}

316−getChunks :: (MonadIO m) => Handle -> Stream m (Array Word8)

312+getChunks :: MonadIO m => Handle -> Stream m (Array Word8)

317getChunks = getChunksWith defaultChunkSize

313getChunks = getChunksWith defaultChunkSize

318

314

319-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

315-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

@@ -362,7 +358,7 @@ readWithBufferOf = readWith

362--

358--

363-- /Pre-release/

359-- /Pre-release/

364{-# INLINE getBytesWith #-}

360{-# INLINE getBytesWith #-}

365−getBytesWith :: (MonadIO m) => Int -> Handle -> Stream m Word8

361+getBytesWith :: MonadIO m => Int -> Handle -> Stream m Word8

366getBytesWith size h = AS.concat $ getChunksWith size h

362getBytesWith size h = AS.concat $ getChunksWith size h

367

363

368-- TODO

364-- TODO

@@ -386,7 +382,7 @@ read = UF.many A.read readChunks

386--

382--

387-- /Pre-release/

383-- /Pre-release/

388{-# INLINE getBytes #-}

384{-# INLINE getBytes #-}

389−getBytes :: (MonadIO m) => Handle -> Stream m Word8

385+getBytes :: MonadIO m => Handle -> Stream m Word8

390getBytes = AS.concat . getChunks

386getBytes = AS.concat . getChunks

391

387

392-------------------------------------------------------------------------------

388-------------------------------------------------------------------------------

@@ -600,7 +596,7 @@ write = toHandleWith A.defaultChunkSize

600--

596--

601-- @since 0.7.0

597-- @since 0.7.0

602{-# INLINE readUtf8 #-}

598{-# INLINE readUtf8 #-}

603−readUtf8 :: (MonadIO m) => Handle -> Stream m Char

599+readUtf8 :: MonadIO m => Handle -> Stream m Char

604readUtf8 = decodeUtf8 . read

600readUtf8 = decodeUtf8 . read

605

601

606-- |

602-- |

@@ -622,7 +618,7 @@ writeUtf8 h s = write h $ encodeUtf8 s

622--

618--

623-- @since 0.7.0

619-- @since 0.7.0

624{-# INLINE writeUtf8ByLines #-}

620{-# INLINE writeUtf8ByLines #-}

625−writeUtf8ByLines :: (MonadIO m) => Handle -> Stream m Char -> m ()

621+writeUtf8ByLines :: MonadIO m => Handle -> Stream m Char -> m ()

626writeUtf8ByLines = undefined

622writeUtf8ByLines = undefined

627

623

628-- | Read UTF-8 lines from a file handle and apply the specified fold to each

624-- | Read UTF-8 lines from a file handle and apply the specified fold to each

@@ -630,7 +626,7 @@ writeUtf8ByLines = undefined

630--

626--

631-- @since 0.7.0

627-- @since 0.7.0

632{-# INLINE readLines #-}

628{-# INLINE readLines #-}

633−readLines :: (MonadIO m) => Handle -> Fold m Char b -> Stream m b

629+readLines :: MonadIO m => Handle -> Fold m Char b -> Stream m b

634readLines h f = foldLines (readUtf8 h) f

630readLines h f = foldLines (readUtf8 h) f

635

631

636-------------------------------------------------------------------------------

632-------------------------------------------------------------------------------

core/src/Streamly/Internal/Unicode/Array/Char.hs+4−4

@@ -42,7 +42,7 @@ import Prelude hiding (String, lines, words, unlines, unwords)

42-- ["lines","this","string","",""]

43--

44{-# INLINE lines #-}

45−lines :: (MonadIO m) => Stream m Char -> Stream m (Array Char)

45+lines :: MonadIO m => Stream m Char -> Stream m (Array Char)

46lines = S.lines A.write

48-- | Break a string up into a stream of strings, which were delimited

@@ -54,7 +54,7 @@ lines = S.lines A.write

54-- ["A","newline","is","considered","white","space?"]

55--

56{-# INLINE words #-}

57−words :: (MonadIO m) => Stream m Char -> Stream m (Array Char)

57+words :: MonadIO m => Stream m Char -> Stream m (Array Char)

58words = S.words A.write

60-- | Flattens the stream of @Array Char@, after appending a terminating

@@ -71,7 +71,7 @@ words = S.words A.write

71--

72-- > unlines . lines /= id

73{-# INLINE unlines #-}

74−unlines :: (MonadIO m) => Stream m (Array Char) -> Stream m Char

74+unlines :: MonadIO m => Stream m (Array Char) -> Stream m Char

75unlines = S.unlines A.read

77-- | Flattens the stream of @Array Char@, after appending a separating

@@ -88,5 +88,5 @@ unlines = S.unlines A.read

88--

89-- > unwords . words /= id

90{-# INLINE unwords #-}

91−unwords :: (MonadIO m) => Stream m (Array Char) -> Stream m Char

91+unwords :: MonadIO m => Stream m (Array Char) -> Stream m Char

92unwords = S.unwords A.read

core/src/Streamly/Internal/Unicode/Stream.hs+10−9

@@ -830,8 +830,7 @@ decodeUtf8ArraysD = decodeUtf8ArraysWithD TransliterateCodingFailure

830--

831-- /Pre-release/

832{-# INLINE decodeUtf8Arrays #-}

833−decodeUtf8Arrays ::

834− (MonadIO m) => Stream m (Array Word8) -> Stream m Char

833+decodeUtf8Arrays :: MonadIO m => Stream m (Array Word8) -> Stream m Char

835decodeUtf8Arrays =

834decodeUtf8Arrays =

836 fromStreamD . decodeUtf8ArraysD . toStreamD

835 fromStreamD . decodeUtf8ArraysD . toStreamD

837

836

@@ -846,7 +845,7 @@ decodeUtf8ArraysD' = decodeUtf8ArraysWithD ErrorOnCodingFailure

846--

845--

847-- /Pre-release/

846-- /Pre-release/

848{-# INLINE decodeUtf8Arrays' #-}

847{-# INLINE decodeUtf8Arrays' #-}

849−decodeUtf8Arrays' :: (MonadIO m) => Stream m (Array Word8) -> Stream m Char

848+decodeUtf8Arrays' :: MonadIO m => Stream m (Array Word8) -> Stream m Char

850decodeUtf8Arrays' = fromStreamD . decodeUtf8ArraysD' . toStreamD

849decodeUtf8Arrays' = fromStreamD . decodeUtf8ArraysD' . toStreamD

851

850

852{-# INLINE decodeUtf8ArraysD_ #-}

851{-# INLINE decodeUtf8ArraysD_ #-}

@@ -861,7 +860,7 @@ decodeUtf8ArraysD_ = decodeUtf8ArraysWithD DropOnCodingFailure

861-- /Pre-release/

860-- /Pre-release/

862{-# INLINE decodeUtf8Arrays_ #-}

861{-# INLINE decodeUtf8Arrays_ #-}

863decodeUtf8Arrays_ ::

862decodeUtf8Arrays_ ::

864− (MonadIO m) => Stream m (Array Word8) -> Stream m Char

863+ MonadIO m => Stream m (Array Word8) -> Stream m Char

865decodeUtf8Arrays_ =

864decodeUtf8Arrays_ =

866 fromStreamD . decodeUtf8ArraysD_ . toStreamD

865 fromStreamD . decodeUtf8ArraysD_ . toStreamD

867

866

@@ -1025,7 +1024,7 @@ encodeObject encode u = Stream.fold Array.write . encode . Stream.unfold u

1025--

1024--

1026-- /Internal/

1025-- /Internal/

1027{-# INLINE encodeObjects #-}

1026{-# INLINE encodeObjects #-}

1028−encodeObjects :: (MonadIO m) =>

1027+encodeObjects :: MonadIO m =>

1029 (Stream m Char -> Stream m Word8)

1028 (Stream m Char -> Stream m Word8)

1030 -> Unfold m a Char

1029 -> Unfold m a Char

1031 -> Stream m a

1030 -> Stream m a

@@ -1037,8 +1036,10 @@ encodeObjects encode u = Stream.mapM (encodeObject encode u)

1037--

1036--

1038-- @since 0.8.0

1037-- @since 0.8.0

1039{-# INLINE encodeStrings #-}

1038{-# INLINE encodeStrings #-}

1040−encodeStrings :: (MonadIO m) =>

1039+encodeStrings :: MonadIO m =>

1041− (Stream m Char -> Stream m Word8) -> Stream m String -> Stream m (Array Word8)

1040+ (Stream m Char -> Stream m Word8)

1041+ -> Stream m String

1042+ -> Stream m (Array Word8)

1042encodeStrings encode = encodeObjects encode Unfold.fromList

1043encodeStrings encode = encodeObjects encode Unfold.fromList

1043

1044

1044{-

1045{-

@@ -1116,7 +1117,7 @@ words f m = Stream.fromStreamD $ D.wordsBy isSpace f (Stream.toStreamD m)

1116--

1117--

1117-- /Pre-release/

1118-- /Pre-release/

1118{-# INLINE unlines #-}

1119{-# INLINE unlines #-}

1119−unlines :: (MonadIO m) => Unfold m a Char -> Stream m a -> Stream m Char

1120+unlines :: MonadIO m => Unfold m a Char -> Stream m a -> Stream m Char

1120unlines = Stream.interposeSuffix '\n'

1121unlines = Stream.interposeSuffix '\n'

1121

1122

1122-- | Unfold the elements of a stream to character streams using the supplied

1123-- | Unfold the elements of a stream to character streams using the supplied

@@ -1130,5 +1131,5 @@ unlines = Stream.interposeSuffix '\n'

1130--

1131--

1131-- /Pre-release/

1132-- /Pre-release/

1132{-# INLINE unwords #-}

1133{-# INLINE unwords #-}

1133−unwords :: (MonadIO m) => Unfold m a Char -> Stream m a -> Stream m Char

1134+unwords :: MonadIO m => Unfold m a Char -> Stream m a -> Stream m Char

1134unwords = Stream.interpose ' '

1135unwords = Stream.interpose ' '

core/streamly-core.cabal+5−4

@@ -324,15 +324,17 @@ library

324 , Streamly.Internal.Data.Array.Unboxed

325 , Streamly.Internal.Data.Array.Stream.Mut.Foreign

326 , Streamly.Internal.Data.Array.Stream.Fold.Foreign

327−

328 , Streamly.Internal.Data.Array.Stream.Foreign

327 , Streamly.Internal.Data.Array.Stream.Foreign

329−

328+

330 -- streamly-unicode

329 -- streamly-unicode

331 , Streamly.Internal.Unicode.Stream

330 , Streamly.Internal.Unicode.Stream

332 , Streamly.Internal.Unicode.String

331 , Streamly.Internal.Unicode.String

333 , Streamly.Internal.Unicode.Char.Parser

332 , Streamly.Internal.Unicode.Char.Parser

334 , Streamly.Internal.Unicode.Array.Char

333 , Streamly.Internal.Unicode.Array.Char

335

334

335+ -- Filesystem/IO

336+ , Streamly.Internal.FileSystem.Handle

337+

336 -- Ring Arrays

338 -- Ring Arrays

337 , Streamly.Internal.Data.Ring.Foreign

339 , Streamly.Internal.Data.Ring.Foreign

338 , Streamly.Internal.Data.Ring

340 , Streamly.Internal.Data.Ring

@@ -349,9 +351,8 @@ library

349 , Streamly.Data.Unfold

351 , Streamly.Data.Unfold

350 , Streamly.Data.Array.Unboxed

352 , Streamly.Data.Array.Unboxed

351 , Streamly.Data.Array.Unboxed.Mut

353 , Streamly.Data.Array.Unboxed.Mut

352−

353− -- Text Processing

354 , Streamly.Unicode.Stream

355+ , Streamly.FileSystem.Handle

355

356

356 if flag(dev)

357 if flag(dev)

357 exposed-modules:

358 exposed-modules:

src/Streamly/Internal/FileSystem/Dir.hs+13−33

@@ -52,34 +52,16 @@ where

53import Control.Monad.IO.Class (MonadIO(..))

54import Data.Either (isRight, isLeft, fromLeft, fromRight)

55−-- import Data.Word (Word8)

56−-- import Foreign.ForeignPtr (withForeignPtr)

57−-- import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

58−-- import Foreign.Ptr (minusPtr, plusPtr)

59−-- import Foreign.Storable (Storable(..))

60−-- import GHC.ForeignPtr (mallocPlainForeignPtrBytes)

61−-- import System.IO (Handle, hGetBufSome, hPutBuf)

62−import Prelude hiding (read)

63−

64−-- import Streamly.Data.Fold (Fold)

55+import Streamly.Data.Stream (Stream)

65import Streamly.Internal.Data.Unfold.Type (Unfold(..))

56import Streamly.Internal.Data.Unfold.Type (Unfold(..))

66−-- import Streamly.Internal.Data.Array.Unboxed.Type

57+

67−-- (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit,

68−-- lpackArraysChunksOf)

69−-- import Streamly.Internal.Data.Stream (Stream)

70−import Streamly.Internal.Data.Stream.IsStream.Type (IsStream)

71−-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

72−

73−-- import qualified Streamly.Data.Fold as FL

74−-- import qualified Streamly.Internal.Data.Fold.Type as FL

75import qualified Streamly.Data.Unfold as UF

58import qualified Streamly.Data.Unfold as UF

76import qualified Streamly.Internal.Data.Unfold as UF (mapM2)

59import qualified Streamly.Internal.Data.Unfold as UF (mapM2)

77−-- import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

78−import qualified Streamly.Internal.Data.Stream.IsStream as S

60+import qualified Streamly.Data.Stream as S

79−-- import qualified Streamly.Data.Array.Unboxed as A

80−-- import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

81import qualified System.Directory as Dir

61import qualified System.Directory as Dir

63+import Prelude hiding (read)

64+

83{-

65{-

84{-# INLINABLE readArrayUpto #-}

66{-# INLINABLE readArrayUpto #-}

85readArrayUpto :: Int -> Handle -> IO (Array Word8)

67readArrayUpto :: Int -> Handle -> IO (Array Word8)

@@ -104,8 +86,7 @@ readArrayUpto size h = do

104-- The maximum size of a single array is specified by @size@. The actual size

86-- The maximum size of a single array is specified by @size@. The actual size

105-- read may be less than or equal to @size@.

87-- read may be less than or equal to @size@.

106{-# INLINE _toChunksWithBufferOf #-}

88{-# INLINE _toChunksWithBufferOf #-}

107−_toChunksWithBufferOf :: (IsStream t, MonadIO m)

89+_toChunksWithBufferOf :: MonadIO m => Int -> Handle -> Stream m (Array Word8)

108− => Int -> Handle -> t m (Array Word8)

109_toChunksWithBufferOf size h = go

90_toChunksWithBufferOf size h = go

110 where

91 where

111 -- XXX use cons/nil instead

92 -- XXX use cons/nil instead

@@ -121,7 +102,7 @@ _toChunksWithBufferOf size h = go

121--

102--

122-- @since 0.7.0

103-- @since 0.7.0

123{-# INLINE_NORMAL toChunksWithBufferOf #-}

104{-# INLINE_NORMAL toChunksWithBufferOf #-}

124−toChunksWithBufferOf :: (IsStream t, MonadIO m) => Int -> Handle -> t m (Array Word8)

105+toChunksWithBufferOf :: MonadIO m => Int -> Handle -> Stream m (Array Word8)

125toChunksWithBufferOf size h = D.fromStreamD (D.Stream step ())

106toChunksWithBufferOf size h = D.fromStreamD (D.Stream step ())

126 where

107 where

127 {-# INLINE_LATE step #-}

108 {-# INLINE_LATE step #-}

@@ -161,7 +142,7 @@ readChunksWithBufferOf = Unfold step return

161--

142--

162-- @since 0.7.0

143-- @since 0.7.0

163{-# INLINE toChunks #-}

144{-# INLINE toChunks #-}

164−toChunks :: (IsStream t, MonadIO m) => Handle -> t m (Array Word8)

145+toChunks :: MonadIO m => Handle -> Stream m (Array Word8)

165toChunks = toChunksWithBufferOf defaultChunkSize

146toChunks = toChunksWithBufferOf defaultChunkSize

166

147

167-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

148-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

@@ -196,7 +177,7 @@ readWithBufferOf = UF.many readChunksWithBufferOf A.read

196--

177--

197-- /Pre-release/

178-- /Pre-release/

198{-# INLINE toStreamWithBufferOf #-}

179{-# INLINE toStreamWithBufferOf #-}

199−toStreamWithBufferOf :: (IsStream t, MonadIO m) => Int -> Handle -> t m Word8

180+toStreamWithBufferOf :: MonadIO m => Int -> Handle -> Stream m Word8

200toStreamWithBufferOf chunkSize h = AS.concat $ toChunksWithBufferOf chunkSize h

181toStreamWithBufferOf chunkSize h = AS.concat $ toChunksWithBufferOf chunkSize h

201-}

182-}

202

183

@@ -254,7 +235,7 @@ readDirs = fmap (fromLeft undefined) $ UF.filter isLeft readEither

254--

235--

255-- /Pre-release/

236-- /Pre-release/

256{-# INLINE toStream #-}

237{-# INLINE toStream #-}

257−toStream :: (IsStream t, MonadIO m) => String -> t m String

238+toStream :: MonadIO m => String -> Stream m String

258toStream = S.unfold read

239toStream = S.unfold read

259

240

260-- | Read directories as Left and files as Right. Filter out "." and ".."

241-- | Read directories as Left and files as Right. Filter out "." and ".."

@@ -262,8 +243,7 @@ toStream = S.unfold read

262--

243--

263-- /Pre-release/

244-- /Pre-release/

264{-# INLINE toEither #-}

245{-# INLINE toEither #-}

265−toEither :: (IsStream t, MonadIO m)

266− => String -> t m (Either String String)

246+toEither :: MonadIO m => String -> Stream m (Either String String)

267toEither = S.unfold readEither

247toEither = S.unfold readEither

268

248

269-- | Read files only.

249-- | Read files only.

@@ -271,7 +251,7 @@ toEither = S.unfold readEither

271-- /Internal/

251-- /Internal/

272--

252--

273{-# INLINE toFiles #-}

253{-# INLINE toFiles #-}

274−toFiles :: (IsStream t, MonadIO m) => String -> t m String

254+toFiles :: MonadIO m => String -> Stream m String

275toFiles = S.unfold readFiles

255toFiles = S.unfold readFiles

276

256

277-- | Read directories only.

257-- | Read directories only.

@@ -279,7 +259,7 @@ toFiles = S.unfold readFiles

279-- /Internal/

259-- /Internal/

280--

260--

281{-# INLINE toDirs #-}

261{-# INLINE toDirs #-}

282−toDirs :: (IsStream t, MonadIO m) => String -> t m String

262+toDirs :: MonadIO m => String -> Stream m String

283toDirs = S.unfold readDirs

263toDirs = S.unfold readDirs

284

264

285{-

265{-

streamly.cabal+2−2

@@ -219,8 +219,10 @@ extra-source-files:

219 core/src/Streamly/Data/Unbox.hs

220 core/src/Streamly/Data/Array/Unboxed.hs

221 core/src/Streamly/Data/Array/Unboxed/Mut.hs

222+ core/src/Streamly/FileSystem/Handle.hs

222 core/src/Streamly/Internal/Data/Time/Clock/Darwin.c

223 core/src/Streamly/Internal/Data/Time/Clock/Darwin.c

223 core/src/Streamly/Internal/Data/Time/Clock/Windows.c

224 core/src/Streamly/Internal/Data/Time/Clock/Windows.c

225+ core/src/Streamly/Internal/FileSystem/Handle.hs

224 core/src/Streamly/Internal/Unicode/Array/Char.hs

226 core/src/Streamly/Internal/Unicode/Array/Char.hs

225 core/src/Streamly/Internal/Unicode/Char/Parser.hs

227 core/src/Streamly/Internal/Unicode/Char/Parser.hs

226 core/src/Streamly/Internal/Unicode/Stream.hs

228 core/src/Streamly/Internal/Unicode/Stream.hs

@@ -491,7 +493,6 @@ library

491 , Streamly.Internal.Unicode.Char

493 , Streamly.Internal.Unicode.Char

492

494

493 -- streamly-filesystem

495 -- streamly-filesystem

494− , Streamly.Internal.FileSystem.Handle

495 , Streamly.Internal.FileSystem.Dir

496 , Streamly.Internal.FileSystem.Dir

496 , Streamly.Internal.FileSystem.File

497 , Streamly.Internal.FileSystem.File

497

498

@@ -506,7 +507,6 @@ library

506 , Streamly.Prelude

507 , Streamly.Prelude

507

508

508 -- Filesystem/IO

509 -- Filesystem/IO

509− , Streamly.FileSystem.Handle

510 , Streamly.Console.Stdio

511

512 -- Network/IO