haskell/zip-stream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete trailing white spaces

Browse Source
This commit is contained in:
Philipp Balzarek 2019-04-17 10:37:41 +02:00
parent e61bc7b897
commit a0fd5d6c6a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Codec/Archive/Zip/Conduit/Zip.hs
View File

@ -77,7 +77,7 @@ dataSize (Left _) = Nothing
dataSize (Right b) = Just $ fromIntegral $ BSL.length b dataSize (Right b) = Just $ fromIntegral $ BSL.length b
toDOSTime :: LocalTime -> (Word16, Word16) toDOSTime :: LocalTime -> (Word16, Word16)
toDOSTime (LocalTime (toGregorian -> (year, month, day)) (TimeOfDay hour mins secs)) = toDOSTime (LocalTime (toGregorian -> (year, month, day)) (TimeOfDay hour mins secs)) =
( fromIntegral hour `shiftL` 11 .|. fromIntegral mins `shiftL` 5 .|. truncate secs `shiftR` 1 ( fromIntegral hour `shiftL` 11 .|. fromIntegral mins `shiftL` 5 .|. truncate secs `shiftR` 1
, fromIntegral (year - 1980) `shiftL` 9 .|. fromIntegral month `shiftL` 5 .|. fromIntegral day , fromIntegral (year - 1980) `shiftL` 9 .|. fromIntegral month `shiftL` 5 .|. fromIntegral day
) )
@ -97,7 +97,7 @@ maxBound16 = fromIntegral (maxBound :: Word16)
-- --
-- Depending on options, the resulting zip file should be compatible with most unzipping applications. -- Depending on options, the resulting zip file should be compatible with most unzipping applications.
-- Any errors are thrown in the underlying monad (as 'ZipError's). -- Any errors are thrown in the underlying monad (as 'ZipError's).
zipStream :: zipStream ::
( MonadThrow m ( MonadThrow m
#if MIN_VERSION_conduit(1,3,0) #if MIN_VERSION_conduit(1,3,0)
, PrimMonad m , PrimMonad m
@ -110,7 +110,7 @@ zipStream ZipOptions{..} = execStateC 0 $ do
cdoff <- get cdoff <- get
output cdir output cdir
eoff <- get eoff <- get
endDirectory cdoff (eoff - cdoff) cnt endDirectory cdoff (eoff - cdoff) cnt
where where
next cnt dir = C.await >>= maybe next cnt dir = C.await >>= maybe
(return (cnt, dir)) (return (cnt, dir))

2
cmd/unzip.hs
View File

@ -52,7 +52,7 @@ main = do
unless (null args) $ do unless (null args) $ do
hPutStrLn stderr $ "Usage: " ++ prog ++ "\nRead a zip file from stdin and extract it in the current directory." hPutStrLn stderr $ "Usage: " ++ prog ++ "\nRead a zip file from stdin and extract it in the current directory."
exitFailure exitFailure
ZipInfo{..} <- C.runConduit ZipInfo{..} <- C.runConduit
$ CB.sourceHandle stdin $ CB.sourceHandle stdin
C..| C.fuseUpstream unZipStream extract C..| C.fuseUpstream unZipStream extract
BSC.putStrLn zipComment BSC.putStrLn zipComment