Revert "Include preload hints about static content"
This reverts commit c757bf9a00.
This commit is contained in:
parent
e94173acb1
commit
3f60f6391c
@ -721,19 +721,11 @@ instance Yesod UniWorX where
|
||||
UniWorX{appWidgetMemcached, appSettings} <- getYesod
|
||||
for ((,) <$> appWidgetMemcached <*> appWidgetMemcachedConf appSettings) $ \(mConn, WidgetMemcachedConf{ widgetMemcachedConnectInfo = _, .. }) -> do
|
||||
let expiry = (maybe 0 ceiling widgetMemcachedExpiry)
|
||||
touch = liftIO $ Memcached.touch expiry (encodeUtf8 $ pack fileName) mConn
|
||||
add = liftIO $ Memcached.add zeroBits expiry (encodeUtf8 $ pack fileName) content mConn
|
||||
link = pack $ unpack widgetMemcachedBaseUrl </> fileName
|
||||
linkAs :: Maybe Text
|
||||
linkAs
|
||||
| ext == "js" = Just "script"
|
||||
| ext == "css" = Just "style"
|
||||
| otherwise = Nothing
|
||||
touch = liftIO $ Memcached.touch expiry fileName mConn
|
||||
add = liftIO $ Memcached.add zeroBits expiry fileName content mConn
|
||||
C.catchIf Memcached.isKeyNotFound touch $ \_ ->
|
||||
C.handleIf Memcached.isKeyExists (\_ -> return ()) add
|
||||
whenIsJust linkAs $ \linkAs' ->
|
||||
addHeader "Link" [st|<#{link}>; as=#{linkAs'}; rel=preload|]
|
||||
return $ Left link
|
||||
return . Left $ widgetMemcachedBaseUrl <> "/" <> decodeUtf8 fileName
|
||||
where
|
||||
-- Generate a unique filename based on the content itself, this is used
|
||||
-- for deduplication so a collision resistant hash function is required
|
||||
@ -742,9 +734,7 @@ instance Yesod UniWorX where
|
||||
--
|
||||
-- Length of hash is 144 bits instead of MD5's 128, so as to avoid
|
||||
-- padding after base64-conversion
|
||||
fileName = (<.> unpack ext)
|
||||
. unpack
|
||||
. decodeUtf8
|
||||
fileName = (<> ("." <> encodeUtf8 ext))
|
||||
. Base64.encode
|
||||
. (convert :: Digest (SHAKE256 144) -> ByteString)
|
||||
. runIdentity
|
||||
|
||||
@ -41,7 +41,7 @@ import qualified Database.Esqueleto as E
|
||||
|
||||
import qualified Data.Conduit.List as Conduit
|
||||
|
||||
import Utils.Lens
|
||||
import Utils.Lens hiding ((<.>))
|
||||
|
||||
|
||||
instance HasResolution prec => Pretty (Fixed prec) where
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
module Utils.Lens ( module Utils.Lens ) where
|
||||
|
||||
import Import.NoFoundation
|
||||
import Control.Lens as Utils.Lens hiding ((<.>))
|
||||
import Control.Lens as Utils.Lens
|
||||
import Control.Lens.Extras as Utils.Lens (is)
|
||||
import Utils.Lens.TH as Utils.Lens (makeLenses_)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user