git.iko.soy/typeable/file-embed
on db14ded help sign in
9 files changed+78−208
since splitsnapshots
unifiedsplit
.github/workflows/tests.yml−32 .gitignore−1 .travis.yml+52 ChangeLog.md−38 Data/FileEmbed.hs+13−116 README.md−2 file-embed.cabal+5−8 stack.yaml+5−1 test/main.hs+3−10
.github/workflows/tests.ymldeleted−32
@@ -1,32 +0,0 @@
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,4 +1,3 @@
11dist
22*.swp
33.stack-work
4−/tarballs/
.travis.ymlnew file+52
@@ -0,0 +1,52 @@
1+# This file has been generated
2+language: c
3+sudo: false
4+
5+matrix:
6+ include:
7+ # Have to use newer cabal, 1.16 passes -XHaskell98 to GHC
8+ - env: CABALVER=1.22 GHCVER=6.12.3
9+ addons: {apt: {packages: [cabal-install-1.22,ghc-6.12.3], sources: [hvr-ghc]}}
10+ - env: CABALVER=1.16 GHCVER=7.0.4
11+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.4], sources: [hvr-ghc]}}
12+ - env: CABALVER=1.16 GHCVER=7.2.2
13+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2], sources: [hvr-ghc]}}
14+ - env: CABALVER=1.16 GHCVER=7.4.2
15+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
16+ - env: CABALVER=1.16 GHCVER=7.6.3
17+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
18+ - env: CABALVER=1.18 GHCVER=7.8.4
19+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
20+ - env: CABALVER=1.22 GHCVER=7.10.1
21+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1], sources: [hvr-ghc]}}
22+ - env: CABALVER=head GHCVER=head
23+ addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
24+
25+ allow_failures:
26+ - env: CABALVER=head GHCVER=head
27+
28+before_install:
29+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
30+
31+install:
32+ - cabal --version
33+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
34+ - travis_retry cabal update
35+ - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
36+ - cabal install --only-dependencies --enable-tests --enable-benchmarks;
37+
38+script:
39+ - if [ -f configure.ac ]; then autoreconf -i; fi
40+ - cabal configure --enable-tests --enable-benchmarks -v2;
41+ - cabal build # this builds all libraries and executables (including tests/benchmarks)
42+ - cabal test
43+ - cabal check
44+ - cabal sdist # tests that a source-distribution can be generated
45+
46+# Check that the resulting source distribution can be built & installed.
47+# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
48+# `cabal install --force-reinstalls dist/*-*.tar.gz`
49+ - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
50+ (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
51+
52+# EOF
ChangeLog.md−38
@@ -1,41 +1,3 @@
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−
391## 0.0.9
402
413* embedStringFile [#14](https://github.com/snoyberg/file-embed/pull/14)
Data/FileEmbed.hs+13−116
@@ -19,10 +19,8 @@
1919module Data.FileEmbed
2020 ( -- * Embed at compile time
2121 embedFile
22− , embedFileIfExists
2322 , embedOneFileOf
2423 , embedDir
25− , embedDirListing
2624 , getDir
2725 -- * Embed as a IsString
2826 , embedStringFile
@@ -37,9 +35,6 @@ module Data.FileEmbed
3735 , injectFile
3836 , injectWith
3937 , injectFileWith
40− -- * Relative path manipulation
41− , makeRelativeToProject
42− , makeRelativeToLocationPredicate
4338 -- * Internal
4439 , stringToBs
4540 , bsToExp
@@ -48,34 +43,30 @@ module Data.FileEmbed
4843
4944import Language.Haskell.TH.Syntax
5045 ( Exp (AppE, ListE, LitE, TupE, SigE, VarE)
51− , Lit (..)
46+#if MIN_VERSION_template_haskell(2,5,0)
47+ , Lit (StringL, StringPrimL, IntegerL)
48+#else
49+ , Lit (StringL, IntegerL)
50+#endif
5251 , Q
5352 , runIO
54− , qLocation, loc_filename
5553#if MIN_VERSION_template_haskell(2,7,0)
5654 , Quasi(qAddDependentFile)
5755#endif
5856 )
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
6357import System.Directory (doesDirectoryExist, doesFileExist,
64− getDirectoryContents, canonicalizePath)
65−import Control.Exception (throw, tryJust, ErrorCall(..))
66−import Control.Monad (filterM, guard)
58+ getDirectoryContents)
59+import Control.Exception (throw, ErrorCall(..))
60+import Control.Monad (filterM)
6761import qualified Data.ByteString as B
6862import qualified Data.ByteString.Char8 as B8
6963import Control.Arrow ((&&&), second)
7064import Control.Applicative ((<$>))
7165import Data.ByteString.Unsafe (unsafePackAddressLen)
72−import System.IO.Error (isDoesNotExistError)
7366import System.IO.Unsafe (unsafePerformIO)
74−import System.FilePath ((</>), takeDirectory, takeExtension)
67+import System.FilePath ((</>))
7568import Data.String (fromString)
7669import Prelude as P
77−import Data.List (sortBy)
78−import Data.Ord (comparing)
7970
8071-- | Embed a single file in your source code.
8172--
@@ -90,40 +81,13 @@ embedFile fp =
9081#endif
9182 (runIO $ B.readFile fp) >>= bsToExp
9283
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−
12084-- | Embed a single existing file in your source code
12185-- out of list a list of paths supplied.
12286--
12387-- > import qualified Data.ByteString
12488-- >
12589-- > myFile :: Data.ByteString.ByteString
126−-- > myFile = $(embedOneFileOf [ "dirName/fileName", "src/dirName/fileName" ])
90+-- > myFile = $(embedFile' [ "dirName/fileName", "src/dirName/fileName" ])
12791embedOneFileOf :: [FilePath] -> Q Exp
12892embedOneFileOf ps =
12993 (runIO $ readExistingFile ps) >>= \ ( path, content ) -> do
@@ -151,18 +115,6 @@ embedDir fp = do
151115 e <- ListE <$> ((runIO $ fileList fp) >>= mapM (pairToExp fp))
152116 return $ SigE e typ
153117
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−
166118-- | Get a directory tree in the IO monad.
167119--
168120-- This is the workhorse of 'embedDir'
@@ -175,11 +127,7 @@ pairToExp _root (path, bs) = do
175127 qAddDependentFile $ _root ++ '/' : path
176128#endif
177129 exp' <- bsToExp bs
178− return $! TupE
179−#if MIN_VERSION_template_haskell(2,16,0)
180− $ map Just
181−#endif
182− [LitE $ StringL path, exp']
130+ return $! TupE [LitE $ StringL path, exp']
183131
184132bsToExp :: B.ByteString -> Q Exp
185133#if MIN_VERSION_template_haskell(2, 5, 0)
@@ -187,11 +135,7 @@ bsToExp bs =
187135 return $ VarE 'unsafePerformIO
188136 `AppE` (VarE 'unsafePackAddressLen
189137 `AppE` LitE (IntegerL $ fromIntegral $ B8.length bs)
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)
138+#if MIN_VERSION_template_haskell(2, 8, 0)
195139 `AppE` LitE (StringPrimL $ B.unpack bs))
196140#else
197141 `AppE` LitE (StringPrimL $ B8.unpack bs))
@@ -266,7 +210,7 @@ fileList' realTop top = do
266210 mapM (liftPair2 . second B.readFile)
267211 dirs <- filterM (doesDirectoryExist . snd) all' >>=
268212 mapM (fileList' realTop . fst)
269− return $ sortBy (comparing fst) $ concat $ files : dirs
213+ return $ concat $ files : dirs
270214
271215liftPair2 :: Monad m => (a, m b) -> m (a, b)
272216liftPair2 (a, b) = b >>= \b' -> return (a, b')
@@ -392,50 +336,3 @@ the magic key. If you know for certain that there will only be one dummy space
392336available, you can use the non-@With@ variants.
393337
394338-}
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,6 +1,4 @@
11## file-embed
22
3−![Tests](https://github.com/snoyberg/file-embed/workflows/Tests/badge.svg)
4−
53Use Template Haskell to read a file or all the files in a directory, and turn
64them into (path, bytestring) pairs embedded in your haskell code.
file-embed.cabal+5−8
@@ -1,16 +1,16 @@
11name: file-embed
2−version: 0.0.15.0
3−license: BSD2
2+version: 0.0.9
3+license: BSD3
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.10
13+cabal-version: >= 1.8
1414build-type: Simple
1515homepage: https://github.com/snoyberg/file-embed
1616extra-source-files: test/main.hs, test/sample/foo, test/sample/bar/baz,
@@ -18,8 +18,7 @@ extra-source-files: test/main.hs, test/sample/foo, test/sample/bar/baz,
1818 README.md
1919
2020library
21− default-language: Haskell2010
22− build-depends: base >= 4.9.1 && < 5
21+ build-depends: base >= 4 && < 5
2322 , bytestring >= 0.9.1.4
2423 , directory >= 1.0.0.3
2524 , template-haskell
@@ -28,12 +27,10 @@ library
2827 ghc-options: -Wall
2928
3029test-suite test
31− default-language: Haskell2010
3230 type: exitcode-stdio-1.0
3331 main-is: main.hs
3432 hs-source-dirs: test
3533 build-depends: base
36− , bytestring
3734 , file-embed
3835 , filepath
3936
stack.yaml+5−1
@@ -1 +1,5 @@
1−resolver: lts-14.17
1+flags: {}
2+packages:
3+- '.'
4+extra-deps: []
5+resolver: lts-3.0
test/main.hs+3−10
@@ -2,7 +2,6 @@
22{-# LANGUAGE OverloadedStrings #-}
33
44import Control.Monad (unless)
5−import qualified Data.ByteString as B (ByteString, filter)
65import Data.FileEmbed
76import System.FilePath ((</>))
87
@@ -15,14 +14,8 @@ main :: IO ()
1514main = do
1615 let received = $(embedDir "test/sample")
1716 received @?=
18− [ ("bar" </> "baz", "baz\r\n")
19− , ("foo", "foo\r\n")
17+ [ ("foo", "foo\r\n")
18+ , ("bar" </> "baz", "baz\r\n")
2019 ]
2120 let str = $(embedStringFile "test/sample/foo") :: String
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
21+ str @?= "foo\r\n"