From 9815fe8891848d169baf4ae56321df26639d8e86 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 22 Sep 2011 08:59:52 +0300 Subject: [PATCH] tiny/Foundation uses addStaticContentExternal --- yesod/scaffold/tiny/Foundation.hs.cg | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg index 1f4262dc..38152df9 100644 --- a/yesod/scaffold/tiny/Foundation.hs.cg +++ b/yesod/scaffold/tiny/Foundation.hs.cg @@ -15,17 +15,14 @@ module Foundation import Yesod.Core import Yesod.Default.Config +import Yesod.Default.Util (addStaticContentExternal) import Yesod.Static (Static, base64md5, StaticRoute(..)) import Settings.StaticFiles import Yesod.Logger (Logger, logLazyText) import qualified Settings -import System.Directory -import qualified Data.ByteString.Lazy as L import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile) -import Control.Monad (unless) import Control.Monad.Trans.Class (lift) import Control.Monad.IO.Class (liftIO) -import qualified Data.Text as T import Web.ClientSession (getKey) -- | The site argument for your application. This can be a good place to @@ -88,11 +85,4 @@ instance Yesod ~sitearg~ where -- and names them based on a hash of their content. This allows -- expiration dates to be set far in the future without worry of -- users receiving stale content. - addStaticContent ext' _ content = do - let fn = base64md5 content ++ '.' : T.unpack ext' - let statictmp = Settings.staticDir ++ "/tmp/" - liftIO $ createDirectoryIfMissing True statictmp - let fn' = statictmp ++ fn - exists <- liftIO $ doesFileExist fn' - unless exists $ liftIO $ L.writeFile fn' content - return $ Just $ Right (StaticR $ StaticRoute ["tmp", T.pack fn] [], []) + addStaticContent = addStaticContentExternal (const $ Left ()) base64md5 Settings.staticDir (StaticR . flip StaticRoute [])