git.iko.soy/typeable/file-embed
on master help sign in
9 files changed+208−131
since splitsnapshots
unifiedsplit
.github/workflows/tests.yml+32 .gitignore+1 .travis.yml−105 ChangeLog.md+38 Data/FileEmbed.hs+116−13 README.md+2 file-embed.cabal+8−5 stack.yaml+1−5 test/main.hs+10−3
.github/workflows/tests.ymlnew file+32
@@ -0,0 +1,32 @@
1+name: Tests
2+
3+on: [pull_request, push]
4+
5+jobs:
6+ build:
7+ name: CI
8+ runs-on: ${{ matrix.os }}
9+ strategy:
10+ fail-fast: false
11+ matrix:
12+ os: [ubuntu-latest, macos-latest, windows-latest]
13+ resolver: [nightly, lts-15, lts-14, lts-12, lts-11, lts-9]
14+
15+ steps:
16+ - name: Clone project
17+ uses: actions/checkout@v2
18+
19+ - name: Cache dependencies
20+ uses: actions/cache@v1
21+ with:
22+ path: ~/.stack
23+ key: ${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles('stack.yaml') }}
24+ restore-keys: |
25+ ${{ runner.os }}-${{ matrix.resolver }}-
26+
27+ - name: Build and run tests
28+ shell: bash
29+ run: |
30+ set -ex
31+ stack upgrade || curl -sSL https://get.haskellstack.org/ | sh -s - -f
32+ stack test --fast --no-terminal --resolver=${{ matrix.resolver }}
.gitignore+1
@@ -1,3 +1,4 @@
11dist
22*.swp
33.stack-work
4+/tarballs/
.travis.ymldeleted−105
@@ -1,105 +0,0 @@
1−language: c
2−sudo: false
3−
4−cache:
5− directories:
6− - $HOME/.ghc
7− - $HOME/.cabal
8− - $HOME/.stack
9−
10−matrix:
11− include:
12− - env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16
13− compiler: ": #GHC 7.4.2"
14− addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
15− - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16
16− compiler: ": #GHC 7.6.3"
17− addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
18− - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18
19− compiler: ": #GHC 7.8.4"
20− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
21− - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22
22− compiler: ": #GHC 7.10.3"
23− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
24−
25− - env: BUILD=cabal GHCVER=head CABALVER=head
26− compiler: ": #GHC HEAD"
27− addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
28−
29− - env: BUILD=stack ARGS="--resolver lts-2"
30− compiler: ": #stack 7.8.4"
31− addons: {apt: {packages: [ghc-7.8.4], sources: [hvr-ghc]}}
32−
33− - env: BUILD=stack ARGS="--resolver lts-3"
34− compiler: ": #stack 7.10.2"
35− addons: {apt: {packages: [ghc-7.10.2], sources: [hvr-ghc]}}
36−
37− - env: BUILD=stack ARGS="--resolver lts-5"
38− compiler: ": #stack 7.10.3"
39− addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
40−
41− - env: BUILD=stack ARGS="--resolver nightly"
42− compiler: ": #stack nightly"
43− addons: {apt: {packages: [libgmp-dev]}}
44−
45− - env: BUILD=stack ARGS="--resolver lts-2"
46− compiler: ": #stack 7.8.4 osx"
47− os: osx
48−
49− - env: BUILD=stack ARGS="--resolver lts-3"
50− compiler: ": #stack 7.10.2 osx"
51− os: osx
52−
53− - env: BUILD=stack ARGS="--resolver lts-5"
54− compiler: ": #stack 7.10.3 osx"
55− os: osx
56−
57− - env: BUILD=stack ARGS="--resolver nightly"
58− compiler: ": #stack nightly osx"
59− os: osx
60−
61− allow_failures:
62− - env: BUILD=cabal GHCVER=head CABALVER=head
63− - env: BUILD=stack ARGS="--resolver nightly"
64−
65−before_install:
66−- unset CC
67−- CABALARGS=""
68−- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
69−- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:$PATH
70−- mkdir -p ~/.local/bin
71−- |
72− if [ `uname` = "Darwin" ];
73− then
74− curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
75− else
76− curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack';
77− fi
78−
79−install:
80−- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
81−- if [ -f configure.ac ]; then autoreconf -i; fi
82−- |
83− case "$BUILD" in
84− stack)
85− stack --no-terminal --install-ghc $ARGS test --only-dependencies;;
86− cabal)
87− cabal --version;
88− travis_retry cabal update;
89− cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS;;
90− esac
91−
92−script:
93−- case "$BUILD" in
94− stack)
95− stack --no-terminal $ARGS test --haddock --no-haddock-deps;;
96− cabal)
97− cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options="-O0 -Werror";
98− cabal build;
99− cabal check || [ "$CABALVER" == "1.16" ];
100− cabal test;
101− cabal sdist;
102− cabal copy;
103− SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
104− (cd dist && cabal install --force-reinstalls "$SRC_TGZ");;
105− esac
ChangeLog.md+38
@@ -1,3 +1,41 @@
1+# ChangeLog for file-embed
2+
3+## 0.0.15.0
4+
5+* Add `makeRelativeToLocationPredicate`
6+
7+## 0.0.14.0
8+
9+* Add `embedFileIfExists`
10+
11+## 0.0.13.0
12+
13+* Ensure that directory listings are returned in sorted order for reproducibility [yesodweb/yesod#1684](https://github.com/yesodweb/yesod/issues/1684)
14+
15+## 0.0.12.0
16+
17+* Use the `Bytes` literal on newer GHCs to reduce memory usage during compilation [#36](https://github.com/snoyberg/file-embed/pull/36)
18+
19+## 0.0.11.2
20+
21+* Haddock markup fix
22+
23+## 0.0.11.1
24+
25+* Support GHC 8.10
26+
27+## 0.0.11
28+
29+* embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26)
30+
31+## 0.0.10.1
32+
33+* Minor doc improvements
34+
35+## 0.0.10
36+
37+* `makeRelativeToProject`
38+
139## 0.0.9
240
341* embedStringFile [#14](https://github.com/snoyberg/file-embed/pull/14)
Data/FileEmbed.hs+116−13
@@ -19,8 +19,10 @@
1919module Data.FileEmbed
2020 ( -- * Embed at compile time
2121 embedFile
22+ , embedFileIfExists
2223 , embedOneFileOf
2324 , embedDir
25+ , embedDirListing
2426 , getDir
2527 -- * Embed as a IsString
2628 , embedStringFile
@@ -35,6 +37,9 @@ module Data.FileEmbed
3537 , injectFile
3638 , injectWith
3739 , injectFileWith
40+ -- * Relative path manipulation
41+ , makeRelativeToProject
42+ , makeRelativeToLocationPredicate
3843 -- * Internal
3944 , stringToBs
4045 , bsToExp
@@ -43,30 +48,34 @@ module Data.FileEmbed
4348
4449import Language.Haskell.TH.Syntax
4550 ( Exp (AppE, ListE, LitE, TupE, SigE, VarE)
46−#if MIN_VERSION_template_haskell(2,5,0)
47− , Lit (StringL, StringPrimL, IntegerL)
48−#else
49− , Lit (StringL, IntegerL)
50−#endif
51+ , Lit (..)
5152 , Q
5253 , runIO
54+ , qLocation, loc_filename
5355#if MIN_VERSION_template_haskell(2,7,0)
5456 , Quasi(qAddDependentFile)
5557#endif
5658 )
59+#if MIN_VERSION_template_haskell(2,16,0)
60+import Language.Haskell.TH ( mkBytes, bytesPrimL )
61+import qualified Data.ByteString.Internal as B
62+#endif
5763import System.Directory (doesDirectoryExist, doesFileExist,
58− getDirectoryContents)
59−import Control.Exception (throw, ErrorCall(..))
60−import Control.Monad (filterM)
64+ getDirectoryContents, canonicalizePath)
65+import Control.Exception (throw, tryJust, ErrorCall(..))
66+import Control.Monad (filterM, guard)
6167import qualified Data.ByteString as B
6268import qualified Data.ByteString.Char8 as B8
6369import Control.Arrow ((&&&), second)
6470import Control.Applicative ((<$>))
6571import Data.ByteString.Unsafe (unsafePackAddressLen)
72+import System.IO.Error (isDoesNotExistError)
6673import System.IO.Unsafe (unsafePerformIO)
67−import System.FilePath ((</>))
74+import System.FilePath ((</>), takeDirectory, takeExtension)
6875import Data.String (fromString)
6976import Prelude as P
77+import Data.List (sortBy)
78+import Data.Ord (comparing)
7079
7180-- | Embed a single file in your source code.
7281--
@@ -81,13 +90,40 @@ embedFile fp =
8190#endif
8291 (runIO $ B.readFile fp) >>= bsToExp
8392
93+-- | Maybe embed a single file in your source code depending on whether or not file exists.
94+--
95+-- Warning: When a build is compiled with the file missing, a recompile when the file exists might not trigger an embed of the file.
96+-- You might try to fix this by doing a clean build.
97+--
98+-- > import qualified Data.ByteString
99+-- >
100+-- > maybeMyFile :: Maybe Data.ByteString.ByteString
101+-- > maybeMyFile = $(embedFileIfExists "dirName/fileName")
102+--
103+-- @since 0.0.14.0
104+embedFileIfExists :: FilePath -> Q Exp
105+embedFileIfExists fp = do
106+ mbs <- runIO maybeFile
107+ case mbs of
108+ Nothing -> [| Nothing |]
109+ Just bs -> do
110+#if MIN_VERSION_template_haskell(2,7,0)
111+ qAddDependentFile fp
112+#endif
113+ [| Just $(bsToExp bs) |]
114+ where
115+ maybeFile :: IO (Maybe B.ByteString)
116+ maybeFile =
117+ either (const Nothing) Just <$>
118+ tryJust (guard . isDoesNotExistError) (B.readFile fp)
119+
84120-- | Embed a single existing file in your source code
85121-- out of list a list of paths supplied.
86122--
87123-- > import qualified Data.ByteString
88124-- >
89125-- > myFile :: Data.ByteString.ByteString
90−-- > myFile = $(embedFile' [ "dirName/fileName", "src/dirName/fileName" ])
126+-- > myFile = $(embedOneFileOf [ "dirName/fileName", "src/dirName/fileName" ])
91127embedOneFileOf :: [FilePath] -> Q Exp
92128embedOneFileOf ps =
93129 (runIO $ readExistingFile ps) >>= \ ( path, content ) -> do
@@ -115,6 +151,18 @@ embedDir fp = do
115151 e <- ListE <$> ((runIO $ fileList fp) >>= mapM (pairToExp fp))
116152 return $ SigE e typ
117153
154+-- | Embed a directory listing recursively in your source code.
155+--
156+-- > myFiles :: [FilePath]
157+-- > myFiles = $(embedDirListing "dirName")
158+--
159+-- @since 0.0.11
160+embedDirListing :: FilePath -> Q Exp
161+embedDirListing fp = do
162+ typ <- [t| [FilePath] |]
163+ e <- ListE <$> ((runIO $ fmap fst <$> fileList fp) >>= mapM strToExp)
164+ return $ SigE e typ
165+
118166-- | Get a directory tree in the IO monad.
119167--
120168-- This is the workhorse of 'embedDir'
@@ -127,7 +175,11 @@ pairToExp _root (path, bs) = do
127175 qAddDependentFile $ _root ++ '/' : path
128176#endif
129177 exp' <- bsToExp bs
130− return $! TupE [LitE $ StringL path, exp']
178+ return $! TupE
179+#if MIN_VERSION_template_haskell(2,16,0)
180+ $ map Just
181+#endif
182+ [LitE $ StringL path, exp']
131183
132184bsToExp :: B.ByteString -> Q Exp
133185#if MIN_VERSION_template_haskell(2, 5, 0)
@@ -135,7 +187,11 @@ bsToExp bs =
135187 return $ VarE 'unsafePerformIO
136188 `AppE` (VarE 'unsafePackAddressLen
137189 `AppE` LitE (IntegerL $ fromIntegral $ B8.length bs)
138−#if MIN_VERSION_template_haskell(2, 8, 0)
190+#if MIN_VERSION_template_haskell(2, 16, 0)
191+ `AppE` LitE (bytesPrimL (
192+ let B.PS ptr off sz = bs
193+ in mkBytes ptr (fromIntegral off) (fromIntegral sz))))
194+#elif MIN_VERSION_template_haskell(2, 8, 0)
139195 `AppE` LitE (StringPrimL $ B.unpack bs))
140196#else
141197 `AppE` LitE (StringPrimL $ B8.unpack bs))
@@ -210,7 +266,7 @@ fileList' realTop top = do
210266 mapM (liftPair2 . second B.readFile)
211267 dirs <- filterM (doesDirectoryExist . snd) all' >>=
212268 mapM (fileList' realTop . fst)
213− return $ concat $ files : dirs
269+ return $ sortBy (comparing fst) $ concat $ files : dirs
214270
215271liftPair2 :: Monad m => (a, m b) -> m (a, b)
216272liftPair2 (a, b) = b >>= \b' -> return (a, b')
@@ -336,3 +392,50 @@ the magic key. If you know for certain that there will only be one dummy space
336392available, you can use the non-@With@ variants.
337393
338394-}
395+
396+-- | Take a relative file path and attach it to the root of the current
397+-- project.
398+--
399+-- The idea here is that, when building with Stack, the build will always be
400+-- executed with a current working directory of the root of the project (where
401+-- your .cabal file is located). However, if you load up multiple projects with
402+-- @stack ghci@, the working directory may be something else entirely.
403+--
404+-- This function looks at the source location of the Haskell file calling it,
405+-- finds the first parent directory with a .cabal file, and uses that as the
406+-- root directory for fixing the relative path.
407+--
408+-- @$(makeRelativeToProject "data/foo.txt" >>= embedFile)@
409+--
410+-- @since 0.0.10
411+makeRelativeToProject :: FilePath -> Q FilePath
412+makeRelativeToProject = makeRelativeToLocationPredicate $ (==) ".cabal" . takeExtension
413+
414+-- | Take a predicate to infer the project root and a relative file path, the given file path is then attached to the inferred project root
415+--
416+-- This function looks at the source location of the Haskell file calling it,
417+-- finds the first parent directory with a file matching the given predicate, and uses that as the
418+-- root directory for fixing the relative path.
419+--
420+-- @$(makeRelativeToLocationPredicate ((==) ".cabal" . takeExtension) "data/foo.txt" >>= embedFile)@
421+--
422+-- @since 0.0.15.0
423+makeRelativeToLocationPredicate :: (FilePath -> Bool) -> FilePath -> Q FilePath
424+makeRelativeToLocationPredicate isTargetFile rel = do
425+ loc <- qLocation
426+ runIO $ do
427+ srcFP <- canonicalizePath $ loc_filename loc
428+ mdir <- findProjectDir srcFP
429+ case mdir of
430+ Nothing -> error $ "Could not find .cabal file for path: " ++ srcFP
431+ Just dir -> return $ dir </> rel
432+ where
433+ findProjectDir x = do
434+ let dir = takeDirectory x
435+ if dir == x
436+ then return Nothing
437+ else do
438+ contents <- getDirectoryContents dir
439+ if any isTargetFile contents
440+ then return (Just dir)
441+ else findProjectDir dir
README.md+2
@@ -1,4 +1,6 @@
11## file-embed
22
3+![Tests](https://github.com/snoyberg/file-embed/workflows/Tests/badge.svg)
4+
35Use Template Haskell to read a file or all the files in a directory, and turn
46them into (path, bytestring) pairs embedded in your haskell code.
file-embed.cabal+8−5
@@ -1,16 +1,16 @@
11name: file-embed
2−version: 0.0.9.1
3−license: BSD3
2+version: 0.0.15.0
3+license: BSD2
44license-file: LICENSE
55author: Michael Snoyman <michael@snoyman.com>
66maintainer: Michael Snoyman <michael@snoyman.com>
77synopsis: Use Template Haskell to embed file contents directly.
88description: Use Template Haskell to read a file or all the files in a
99 directory, and turn them into (path, bytestring) pairs
10− embedded in your haskell code.
10+ embedded in your Haskell code.
1111category: Data
1212stability: Stable
13−cabal-version: >= 1.8
13+cabal-version: >= 1.10
1414build-type: Simple
1515homepage: https://github.com/snoyberg/file-embed
1616extra-source-files: test/main.hs, test/sample/foo, test/sample/bar/baz,
@@ -18,7 +18,8 @@ extra-source-files: test/main.hs, test/sample/foo, test/sample/bar/baz,
1818 README.md
1919
2020library
21− build-depends: base >= 4 && < 5
21+ default-language: Haskell2010
22+ build-depends: base >= 4.9.1 && < 5
2223 , bytestring >= 0.9.1.4
2324 , directory >= 1.0.0.3
2425 , template-haskell
@@ -27,10 +28,12 @@ library
2728 ghc-options: -Wall
2829
2930test-suite test
31+ default-language: Haskell2010
3032 type: exitcode-stdio-1.0
3133 main-is: main.hs
3234 hs-source-dirs: test
3335 build-depends: base
36+ , bytestring
3437 , file-embed
3538 , filepath
3639
stack.yaml+1−5
@@ -1,5 +1 @@
1−flags: {}
2−packages:
3−- '.'
4−extra-deps: []
5−resolver: lts-3.0
1+resolver: lts-14.17
test/main.hs+10−3
@@ -2,6 +2,7 @@
22{-# LANGUAGE OverloadedStrings #-}
33
44import Control.Monad (unless)
5+import qualified Data.ByteString as B (ByteString, filter)
56import Data.FileEmbed
67import System.FilePath ((</>))
78
@@ -14,8 +15,14 @@ main :: IO ()
1415main = do
1516 let received = $(embedDir "test/sample")
1617 received @?=
17− [ ("foo", "foo\r\n")
18− , ("bar" </> "baz", "baz\r\n")
18+ [ ("bar" </> "baz", "baz\r\n")
19+ , ("foo", "foo\r\n")
1920 ]
2021 let str = $(embedStringFile "test/sample/foo") :: String
21− str @?= "foo\r\n"
22+ filter (/= '\r') str @?= "foo\n"
23+
24+ let mbs = $(embedFileIfExists "test/sample/foo")
25+ fmap (B.filter (/= fromIntegral (fromEnum '\r'))) mbs @?= Just "foo\n"
26+
27+ let mbs2 = $(embedFileIfExists "test/sample/foo2") :: Maybe B.ByteString
28+ mbs2 @?= Nothing