zlib-conduit 0.4.0.2 → 1.1.0
raw patch · 3 files changed
Files
- Data/Conduit/Zlib.hs +0/−165
- test/main.hs +10/−3
- zlib-conduit.cabal +3/−27
− Data/Conduit/Zlib.hs
@@ -1,165 +0,0 @@-{-# LANGUAGE FlexibleContexts #-}--- | Streaming compression and decompression using conduits.------ Parts of this code were taken from zlib-enum and adapted for conduits.-module Data.Conduit.Zlib (- -- * Conduits- compress, decompress, gzip, ungzip,- -- * Flushing- compressFlush, decompressFlush,- -- * Re-exported from zlib-bindings- WindowBits (..), defaultWindowBits-) where--import Codec.Zlib-import Data.Conduit hiding (unsafeLiftIO)-import qualified Data.Conduit as C-import Data.ByteString (ByteString)-import qualified Data.ByteString as S-import Control.Exception (try)-import Control.Monad ((<=<))---- | Gzip compression with default parameters.-gzip :: (MonadThrow m, MonadUnsafeIO m) => Conduit ByteString m ByteString-gzip = compress 1 (WindowBits 31)---- | Gzip decompression with default parameters.-ungzip :: (MonadUnsafeIO m, MonadThrow m) => Conduit ByteString m ByteString-ungzip = decompress (WindowBits 31)--unsafeLiftIO :: (MonadUnsafeIO m, MonadThrow m) => IO a -> m a-unsafeLiftIO =- either rethrow return <=< C.unsafeLiftIO . try- where- rethrow :: MonadThrow m => ZlibException -> m a- rethrow = monadThrow---- |--- Decompress (inflate) a stream of 'ByteString's. For example:------ > sourceFile "test.z" $= decompress defaultWindowBits $$ sinkFile "test"--decompress- :: (MonadUnsafeIO m, MonadThrow m)- => WindowBits -- ^ Zlib parameter (see the zlib-bindings package as well as the zlib C library)- -> Conduit ByteString m ByteString-decompress config = NeedInput- (\input -> PipeM (do- inf <- unsafeLiftIO $ initInflate config- push inf input) (return ()))- (Done Nothing ())- where- push' inf x = PipeM (push inf x) (return ())-- push inf x = do- popper <- unsafeLiftIO $ feedInflate inf x- goPopper (push' inf) (close inf) id [] popper-- close inf = flip PipeM (return ()) $ do- chunk <- unsafeLiftIO $ finishInflate inf- return $- if S.null chunk- then Done Nothing ()- else HaveOutput (Done Nothing ()) (return ()) chunk---- | Same as 'decompress', but allows you to explicitly flush the stream.-decompressFlush- :: (MonadUnsafeIO m, MonadThrow m)- => WindowBits -- ^ Zlib parameter (see the zlib-bindings package as well as the zlib C library)- -> Conduit (Flush ByteString) m (Flush ByteString)-decompressFlush config = NeedInput- (\input -> flip PipeM (return ()) $ do- inf <- unsafeLiftIO $ initInflate config- push inf input)- (Done Nothing ())- where- push' inf x = PipeM (push inf x) (return ())-- push inf (Chunk x) = do- popper <- unsafeLiftIO $ feedInflate inf x- goPopper (push' inf) (close inf) Chunk [] popper- push inf Flush = do- chunk <- unsafeLiftIO $ flushInflate inf- let next = HaveOutput- (NeedInput (push' inf) (close inf))- (return ())- Flush- return $- if S.null chunk- then next- else HaveOutput next (return ()) (Chunk chunk)-- close inf = flip PipeM (return ()) $ do- chunk <- unsafeLiftIO $ finishInflate inf- return $- if S.null chunk- then Done Nothing ()- else HaveOutput (Done Nothing ()) (return ()) $ Chunk chunk---- |--- Compress (deflate) a stream of 'ByteString's. The 'WindowBits' also control--- the format (zlib vs. gzip).--compress- :: (MonadUnsafeIO m, MonadThrow m)- => Int -- ^ Compression level- -> WindowBits -- ^ Zlib parameter (see the zlib-bindings package as well as the zlib C library)- -> Conduit ByteString m ByteString-compress level config = NeedInput- (\input -> flip PipeM (return ()) $ do- def <- unsafeLiftIO $ initDeflate level config- push def input) (Done Nothing ())- where- push' def input = PipeM (push def input) (return ())- push def x = do- popper <- unsafeLiftIO $ feedDeflate def x- goPopper (push' def) (close def) id [] popper-- close def = slurp $ unsafeLiftIO $ finishDeflate def---- | Same as 'compress', but allows you to explicitly flush the stream.-compressFlush- :: (MonadUnsafeIO m, MonadThrow m)- => Int -- ^ Compression level- -> WindowBits -- ^ Zlib parameter (see the zlib-bindings package as well as the zlib C library)- -> Conduit (Flush ByteString) m (Flush ByteString)-compressFlush level config = NeedInput- (\input -> flip PipeM (return ()) $ do- def <- unsafeLiftIO $ initDeflate level config- push def input) (Done Nothing ())- where- push' def input = PipeM (push def input) (return ())-- push def (Chunk x) = do- popper <- unsafeLiftIO $ feedDeflate def x- goPopper (push' def) (close def) Chunk [] popper- push def Flush = goPopper (push' def) (close def) Chunk [Flush] $ flushDeflate def-- close def = flip PipeM (return ()) $ do- mchunk <- unsafeLiftIO $ finishDeflate def- return $ case mchunk of- Nothing -> Done Nothing ()- Just chunk -> HaveOutput (close def) (return ()) (Chunk chunk)--goPopper :: (MonadUnsafeIO m, MonadThrow m)- => (input -> Conduit input m output)- -> Conduit input m output- -> (S.ByteString -> output)- -> [output]- -> Popper- -> m (Conduit input m output)-goPopper push close wrap final popper = do- mbs <- unsafeLiftIO popper- return $ case mbs of- Nothing ->- let go [] = NeedInput push close- go (x:xs) = HaveOutput (go xs) (return ()) x- in go final- Just bs -> HaveOutput (PipeM (goPopper push close wrap final popper) (return ())) (return ()) (wrap bs)--slurp :: Monad m => m (Maybe a) -> Pipe i a m ()-slurp pop = flip PipeM (return ()) $ do- x <- pop- return $ case x of- Nothing -> Done Nothing ()- Just y -> HaveOutput (slurp pop) (return ()) y
test/main.hs view
@@ -1,5 +1,4 @@-import Test.Hspec.Monadic-import Test.Hspec.HUnit ()+import Test.Hspec import Test.Hspec.QuickCheck (prop) import qualified Data.Conduit as C@@ -13,7 +12,7 @@ import Control.Monad.Trans.Resource (runExceptionT_) main :: IO ()-main = hspecX $ do+main = hspec $ do describe "zlib" $ do prop "idempotent" $ \bss' -> runST $ do let bss = map S.pack bss'@@ -30,3 +29,11 @@ C.$= CZ.decompressFlush (CZ.WindowBits 31) C.$$ CL.consume return $ bssC == outBssC+ it "compressFlush large data" $ do+ let content = L.pack $ map (fromIntegral . fromEnum) $ concat $ ["BEGIN"] ++ map show [1..100000 :: Int] ++ ["END"]+ src = CL.sourceList $ map C.Chunk $ L.toChunks content+ bssC <- src C.$$ CZ.compressFlush 5 (CZ.WindowBits 31) C.=$ CL.consume+ let unChunk (C.Chunk x) = [x]+ unChunk C.Flush = []+ bss <- CL.sourceList bssC C.$$ CL.concatMap unChunk C.=$ CZ.ungzip C.=$ CL.consume+ L.fromChunks bss `shouldBe` content
zlib-conduit.cabal view
@@ -1,6 +1,6 @@ Name: zlib-conduit-Version: 0.4.0.2-Synopsis: Streaming compression/decompression via conduits.+Version: 1.1.0+Synopsis: Streaming compression/decompression via conduits. (deprecated) Description: Streaming compression/decompression via conduits. License: BSD3 License-file: LICENSE@@ -12,33 +12,9 @@ Homepage: http://github.com/snoyberg/conduit extra-source-files: test/main.hs -flag debug- Library- Exposed-modules: Data.Conduit.Zlib Build-depends: base >= 4 && < 5- , containers- , transformers >= 0.2.2 && < 0.4- , bytestring >= 0.9- , zlib-bindings >= 0.1 && < 0.2- , conduit >= 0.4 && < 0.5- ghc-options: -Wall--test-suite test- hs-source-dirs: test- main-is: main.hs- type: exitcode-stdio-1.0- cpp-options: -DTEST- build-depends: conduit- , base- , hspec- , HUnit- , QuickCheck- , bytestring- , transformers- , zlib-conduit- , resourcet- ghc-options: -Wall+ , conduit >= 1.1 source-repository head type: git