git.iko.soy/typeable/servant
on master help sign in
reintroduce serveDirectory (to give some time to users to change their code), but deprecate it
6d35f3dAlp Mestanogullari
servant-server/src/Servant/Utils/StaticFiles.hs+9−2
compare with master
unifiedsplit
@@ -11,6 +11,8 @@ module Servant.Utils.StaticFiles
11 , serveDirectoryFileServer
11 , serveDirectoryFileServer
12 , serveDirectoryEmbedded
12 , serveDirectoryEmbedded
13 , serveDirectoryWith
13 , serveDirectoryWith
14+ , -- * Deprecated
15+ serveDirectory
14 ) where
16 ) where
15
17
16import Data.ByteString (ByteString)
18import Data.ByteString (ByteString)
@@ -49,8 +51,6 @@ serveDirectoryWebApp :: FilePath -> Server Raw
49serveDirectoryWebApp = staticApp . defaultWebAppSettings . fixPath
51serveDirectoryWebApp = staticApp . defaultWebAppSettings . fixPath
50
52
51-- | Same as 'serveDirectoryWebApp', but uses `defaultFileServerSettings`.
53-- | Same as 'serveDirectoryWebApp', but uses `defaultFileServerSettings`.
52−--
53−-- This used to be called 'serveDirectory' in @servant < 0.10@.
54serveDirectoryFileServer :: FilePath -> Server Raw
54serveDirectoryFileServer :: FilePath -> Server Raw
55serveDirectoryFileServer = staticApp . defaultFileServerSettings . fixPath
55serveDirectoryFileServer = staticApp . defaultFileServerSettings . fixPath
56
56
@@ -70,6 +70,13 @@ serveDirectoryEmbedded files = staticApp (embeddedSettings files)
70serveDirectoryWith :: StaticSettings -> Server Raw
70serveDirectoryWith :: StaticSettings -> Server Raw
71serveDirectoryWith = staticApp
71serveDirectoryWith = staticApp
72
72
73+-- | Same as 'serveDirectoryFileServer'. It used to be the only
74+-- file serving function in servant pre-0.10 and will be kept
75+-- around for a few versions, but is deprecated.
76+serveDirectory :: FilePath -> Server Raw
77+serveDirectory = serveDirectoryFileServer
78+{-# DEPRECATED serveDirectory "Use serveDirectoryFileServer instead" #-}
79+
73fixPath :: FilePath -> FilePath
80fixPath :: FilePath -> FilePath
74fixPath =
81fixPath =
75#if MIN_VERSION_wai_app_static(3,1,0)
82#if MIN_VERSION_wai_app_static(3,1,0)