yesodweb / wai

Haskell Web Application Interface
MIT License
832 stars 258 forks source link

wai/warp-static/warp.hs #137

Closed gertcuykens closed 11 years ago

gertcuykens commented 11 years ago

1) Mime type seems to be always text/plain?

http://localhost:3000/test.png
Server:Warp/1.3.7.2
Content-Type:text/plain
Content-Encoding:gzip

2) How do I enable gzip only for text?

snoyberg commented 11 years ago

Seems to work for me. Silly question: does test.png actually exist?

gertcuykens commented 11 years ago
{-# LANGUAGE DeriveDataTypeable, RecordWildCards, OverloadedStrings #-}
import Network.Wai.Application.Static (staticApp, defaultFileServerSettings)
import Network.Wai.Handler.Warp
    ( runSettings, defaultSettings, settingsHost, settingsPort
    )
import System.Console.CmdArgs hiding (def)
import Text.Printf (printf)
import System.Directory (canonicalizePath)
import Control.Monad (unless)
import Control.Monad.IO.Class (liftIO)
import Network.Wai.Middleware.Autohead
import Network.Wai.Middleware.RequestLogger (logStdout)
import Network.Wai.Middleware.Gzip
import qualified Data.Map as Map
import qualified Data.ByteString.Char8 as S8
import Control.Arrow ((***))
import Data.Text (pack)
import Data.String (fromString)
import Network.Mime (defaultMimeMap, mimeByExt, defaultMimeType)
import WaiAppStatic.Types (ssIndices, toPiece, ssGetMimeType, fileName, fromPiece)
import Data.Maybe (mapMaybe)

data Args = Args
    { docroot :: FilePath
    , index :: [FilePath]
    , port :: Int
    , noindex :: Bool
    , quiet :: Bool
    , verbose :: Bool
    , mime :: [(String, String)]
    , host :: String
    }
    deriving (Show, Data, Typeable)

defaultArgs :: Args
defaultArgs = Args "." ["index2.html", "index2.htm"] 3000 False False True [] "*"

{- this works
main :: IO ()
main = do
    Args {..} <- cmdArgs defaultArgs
    let mime' = map (pack *** S8.pack) mime
    let mimeMap = Map.fromList mime' `Map.union` defaultMimeMap
    print (mimeByExt mimeMap defaultMimeType "test.png")
-}

main :: IO ()
main = do
    Args {..} <- cmdArgs defaultArgs
    let mime' = map (pack *** S8.pack) mime
    let mimeMap = Map.fromList mime' `Map.union` defaultMimeMap
    docroot' <- canonicalizePath docroot
    unless quiet $ printf "Serving directory %s on port %d with %s index files.\n" docroot' port (if noindex then "no" else show index)
    let middle = gzip def
               . (if verbose then logStdout else id)
               . autohead
    runSettings defaultSettings
        { settingsPort = port
        , settingsHost = fromString host
        } $ staticApp (defaultFileServerSettings $ fromString docroot)
        { ssIndices = if noindex then [] else mapMaybe (toPiece . pack) index
        , ssGetMimeType = return . mimeByExt mimeMap defaultMimeType . fromPiece . fileName
        }

test

log

snoyberg commented 11 years ago

It's returning a 304 status code, so there's no actual response body. What happens when you force refresh?

gertcuykens commented 11 years ago

DOH! :)

ps any comments on gzip for text only?

snoyberg commented 11 years ago

That's the default behavior I believe: https://github.com/yesodweb/wai/blob/master/wai-extra/Network/Wai/Middleware/Gzip.hs#L53. It seems to work correctly in my testing, can you check again with the forced refresh?

gertcuykens commented 11 years ago

DOOH! :) yes, it both works sorry

snoyberg commented 11 years ago

No problem.