edf569a · obelisk · git.iko.soy

git.iko.soy/obelisk

asset gathering not strict enough (#393)

obelisk-asset-manifest: Make toHashedPath strict

commitedf569a7751af8a85129fb927cf7a202d6db6320 authorDan Bornside <dan.bornside@gmail.com> dateMon 15 Apr 2019, 21:28 (8 years ago) parent20ba787

3 files changed+6−1

compare with master

unifiedsplit

ChangeLog.md+1 lib/asset/manifest/obelisk-asset-manifest.cabal+1 lib/asset/manifest/src/Obelisk/Asset/Gather.hs+4−1

ChangeLog.md+1

@@ -7,6 +7,7 @@ This project's release branch is `master`. This log is written from the perspect

77* Fix crashes of Android apps on 32-bit ARM devices.

88* Provide a way to indicate acceptance of the Android SDK license by passing `config.android_sdk.accept_license = true;` in the arguments to the import of `.obelisk/impl` in the project's `default.nix`.

99* Add `COMPLETE` pragma to `(:/)`. Using this pattern synonym should no longer generate spurious warnings about non-exhaustive pattern matching.

10+* Make asset path hashing strict (see `Obelisk.Asset.Gather`)

1011

1112## v0.1.0.0 - 2019-03-29

1213

lib/asset/manifest/obelisk-asset-manifest.cabal+1

@@ -17,6 +17,7 @@ library

1717 base

1818 , bytestring

1919 , containers

20+ , deepseq

2021 , directory

2122 , SHA

2223 , filepath

lib/asset/manifest/src/Obelisk/Asset/Gather.hs+4−1

@@ -1,10 +1,12 @@

11{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE BangPatterns #-}

23-- | Functions for collecting up files to be processed by the asset pipeline

34module Obelisk.Asset.Gather

45 ( gatherHashedPaths

56 , toHashedPath

67 ) where

9+import Control.DeepSeq

810import Control.Monad (forM)

911import Data.Bits

1012import qualified Data.ByteString.Lazy as LBS

@@ -47,7 +49,8 @@ toHashedPath root relativePath = do

4749 contents <- LBS.readFile path

4850 let hashPrefix = T.unpack $ decodeUtf8 $ LBS.toStrict $ toNixBase32 $ bytestringDigest $ sha256 contents

4951 (dir, filename) = splitFileName relativePath

50− return $ normalise $ dir </> (hashPrefix <> "-" <> filename)

52+ !hashedRelativePath = force $ normalise $ dir </> (hashPrefix <> "-" <> filename)

53+ return hashedRelativePath

5154

5255-- | Convert a ByteString to base 32 in the way that Nix does

5356toNixBase32 :: LBS.ByteString -> LBS.ByteString