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

Reflect wai changes for #262

Browse Source
This commit is contained in:
Michael Snoyman 2012-07-11 15:58:36 +03:00
parent 58647e4826
commit 33c39662b9
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yesod-core/Yesod/Handler.hs
View File

@ -178,7 +178,6 @@ import Control.Monad.Trans.Resource
import Control.Monad.Base import Control.Monad.Base
import Yesod.Routes.Class import Yesod.Routes.Class
import Data.Word (Word64) import Data.Word (Word64)
import Data.Conduit (Sink)
import Language.Haskell.TH.Syntax (Loc) import Language.Haskell.TH.Syntax (Loc)
class YesodSubRoute s y where class YesodSubRoute s y where
@ -343,12 +342,12 @@ rbHelper upload =
FileUploadDisk s -> rbHelper' s mkFileInfoFile FileUploadDisk s -> rbHelper' s mkFileInfoFile
FileUploadSource s -> rbHelper' s mkFileInfoSource FileUploadSource s -> rbHelper' s mkFileInfoSource
rbHelper' :: Sink S8.ByteString (ResourceT IO) x rbHelper' :: NWP.BackEnd x
-> (Text -> Text -> x -> FileInfo) -> (Text -> Text -> x -> FileInfo)
-> W.Request -> W.Request
-> ResourceT IO ([(Text, Text)], [(Text, FileInfo)]) -> ResourceT IO ([(Text, Text)], [(Text, FileInfo)])
rbHelper' sink mkFI req = rbHelper' backend mkFI req =
(map fix1 *** map fix2) <$> (NWP.parseRequestBody sink req) (map fix1 *** map fix2) <$> (NWP.parseRequestBody backend req)
where where
fix1 = go *** go fix1 = go *** go
fix2 (x, NWP.FileInfo a b c) = fix2 (x, NWP.FileInfo a b c) =

6
yesod-core/Yesod/Internal/Core.hs
View File

@ -83,7 +83,7 @@ import Data.Aeson (Value (Array, String))
import Data.Aeson.Encode (encode) import Data.Aeson.Encode (encode)
import qualified Data.Vector as Vector import qualified Data.Vector as Vector
import Network.Wai.Middleware.Gzip (GzipSettings, def) import Network.Wai.Middleware.Gzip (GzipSettings, def)
import Network.Wai.Parse (tempFileSink, lbsSink) import Network.Wai.Parse (tempFileBackEnd, lbsBackEnd)
import qualified Paths_yesod_core import qualified Paths_yesod_core
import Data.Version (showVersion) import Data.Version (showVersion)
import System.Log.FastLogger (Logger, mkLogger, loggerDate, LogStr (..), loggerPutStr) import System.Log.FastLogger (Logger, mkLogger, loggerDate, LogStr (..), loggerPutStr)
@ -340,8 +340,8 @@ $doctype 5
-> Word64 -- ^ request body size -> Word64 -- ^ request body size
-> FileUpload -> FileUpload
fileUpload _ size fileUpload _ size
| size > 50000 = FileUploadDisk tempFileSink | size > 50000 = FileUploadDisk tempFileBackEnd
| otherwise = FileUploadMemory lbsSink | otherwise = FileUploadMemory lbsBackEnd
formatLogMessage :: IO ZonedDate formatLogMessage :: IO ZonedDate
-> Loc -> Loc

6
yesod-core/Yesod/Internal/Request.hs
View File

@ -145,6 +145,6 @@ mkFileInfoFile name ct fp = FileInfo name ct (sourceFile fp) (\dst -> runResourc
mkFileInfoSource :: Text -> Text -> Source (ResourceT IO) ByteString -> FileInfo mkFileInfoSource :: Text -> Text -> Source (ResourceT IO) ByteString -> FileInfo
mkFileInfoSource name ct src = FileInfo name ct src (\dst -> runResourceT $ src $$ sinkFile dst) mkFileInfoSource name ct src = FileInfo name ct src (\dst -> runResourceT $ src $$ sinkFile dst)
data FileUpload = FileUploadMemory (Sink ByteString (ResourceT IO) L.ByteString) data FileUpload = FileUploadMemory (NWP.BackEnd L.ByteString)
| FileUploadDisk (Sink ByteString (ResourceT IO) FilePath) | FileUploadDisk (NWP.BackEnd FilePath)
| FileUploadSource (Sink ByteString (ResourceT IO) (Source (ResourceT IO) ByteString)) | FileUploadSource (NWP.BackEnd (Source (ResourceT IO) ByteString))