haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better fileSource

Browse Source
This commit is contained in:
Michael Snoyman 2013-03-14 19:02:20 +02:00
parent 326c13d8b4
commit 44a01d7107
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yesod-core/Yesod/Core/Handler.hs
View File

@ -889,3 +889,8 @@ rawRequestBody :: (HandlerReader m, MonadResource m) => Source m S.ByteString
rawRequestBody = do rawRequestBody = do
req <- lift waiRequest req <- lift waiRequest
transPipe liftResourceT $ W.requestBody req transPipe liftResourceT $ W.requestBody req
-- | Stream the data from the file. Since Yesod 1.2, this has been generalized
-- to work in any @MonadResource@.
fileSource :: MonadResource m => FileInfo -> Source m S.ByteString
fileSource = transPipe liftResourceT . fileSourceRaw

1
yesod-core/Yesod/Core/Internal/Request.hs
View File

@ -6,7 +6,6 @@ module Yesod.Core.Internal.Request
, FileInfo , FileInfo
, fileName , fileName
, fileContentType , fileContentType
, fileSource
, fileMove , fileMove
, mkFileInfoLBS , mkFileInfoLBS
, mkFileInfoFile , mkFileInfoFile

2
yesod-core/Yesod/Core/Types.hs
View File

@ -124,7 +124,7 @@ type RequestBodyContents =
data FileInfo = FileInfo data FileInfo = FileInfo
{ fileName :: !Text { fileName :: !Text
, fileContentType :: !Text , fileContentType :: !Text
, fileSource :: !(Source (ResourceT IO) ByteString) , fileSourceRaw :: !(Source (ResourceT IO) ByteString)
, fileMove :: !(FilePath -> IO ()) , fileMove :: !(FilePath -> IO ())
} }