CPP for support for all 3.X versions of wai-app-static
This commit is contained in:
parent
955261ddd3
commit
c41267811e
1 changed files with 12 additions and 3 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
{-# LANGUAGE CPP #-}
|
||||||
-- | This module defines a sever-side handler that lets you serve static files.
|
-- | This module defines a sever-side handler that lets you serve static files.
|
||||||
--
|
--
|
||||||
-- - 'serveDirectory' lets you serve anything that lives under a particular
|
-- - 'serveDirectory' lets you serve anything that lives under a particular
|
||||||
|
@ -6,10 +7,13 @@ module Servant.Utils.StaticFiles (
|
||||||
serveDirectory,
|
serveDirectory,
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Filesystem.Path.CurrentOS (decodeString)
|
import Data.List (isSuffixOf)
|
||||||
import Network.Wai.Application.Static (staticApp, defaultFileServerSettings)
|
import Network.Wai.Application.Static (staticApp, defaultFileServerSettings)
|
||||||
import Servant.API.Raw (Raw)
|
import Servant.API.Raw (Raw)
|
||||||
import Servant.Server (Server)
|
import Servant.Server (Server)
|
||||||
|
#if !MIN_VERSION_wai_app_static(3,1,0)
|
||||||
|
import Filesystem.Path.CurrentOS (decodeString)
|
||||||
|
#endif
|
||||||
|
|
||||||
-- | Serve anything under the specified directory as a 'Raw' endpoint.
|
-- | Serve anything under the specified directory as a 'Raw' endpoint.
|
||||||
--
|
--
|
||||||
|
@ -32,5 +36,10 @@ import Servant.Server (Server)
|
||||||
-- handler in the last position, because /servant/ will try to match the handlers
|
-- handler in the last position, because /servant/ will try to match the handlers
|
||||||
-- in order.
|
-- in order.
|
||||||
serveDirectory :: FilePath -> Server Raw
|
serveDirectory :: FilePath -> Server Raw
|
||||||
serveDirectory documentRoot =
|
serveDirectory =
|
||||||
staticApp (defaultFileServerSettings (decodeString (documentRoot ++ "/")))
|
#if MIN_VERSION_wai_app_static(3,1,0)
|
||||||
|
staticApp . defaultFileServerSettings . mkSuff
|
||||||
|
#else
|
||||||
|
staticApp . defaultFileServerSettings . decodeString . mkSuff
|
||||||
|
#endif
|
||||||
|
where mkSuff x = if "/" `isSuffixOf` x then x else x ++ "/"
|
||||||
|
|
Loading…
Reference in a new issue