git.iko.soy/typeable/file-embed
on master help sign in
swap
548430d27 ahead, 0 behind
9 files changed+136−285
since splitsnapshots
unifiedsplit
.github/workflows/tests.yml+32 .travis.yml−227 ChangeLog.md+26 Data/FileEmbed.hs+60−16 README.md+1−3 appveyor.yml−32 file-embed.cabal+7−4 stack.yaml+1−1 test/main.hs+9−2
.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 }}
.travis.ymldeleted−227
@@ -1,227 +0,0 @@
1−# This is the complex Travis configuration, which is intended for use
2−# on open source libraries which need compatibility across multiple GHC
3−# versions, must work with cabal-install, and should be
4−# cross-platform. For more information and other options, see:
5−#
6−# https://docs.haskellstack.org/en/stable/travis_ci/
7−#
8−# Copy these contents into the root directory of your Github project in a file
9−# named .travis.yml
10−
11−# Use new container infrastructure to enable caching
12−sudo: false
13−
14−# Do not choose a language; we provide our own build tools.
15−language: generic
16−
17−# Caching so the next build will be fast too.
18−cache:
19− directories:
20− - $HOME/.ghc
21− - $HOME/.cabal
22− - $HOME/.stack
23− - $TRAVIS_BUILD_DIR/.stack-work
24−
25−# The different configurations we want to test. We have BUILD=cabal which uses
26−# cabal-install, and BUILD=stack which uses Stack. More documentation on each
27−# of those below.
28−#
29−# We set the compiler values here to tell Travis to use a different
30−# cache file per set of arguments.
31−#
32−# If you need to have different apt packages for each combination in the
33−# matrix, you can use a line such as:
34−# addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
35−matrix:
36− include:
37− # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
38− # https://github.com/hvr/multi-ghc-travis
39− - env: BUILD=cabal GHCVER=7.0.4 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
40− compiler: ": #GHC 7.0.4"
41− addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
42− - env: BUILD=cabal GHCVER=7.2.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
43− compiler: ": #GHC 7.2.2"
44− addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
45− - env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
46− compiler: ": #GHC 7.4.2"
47− addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
48− - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
49− compiler: ": #GHC 7.6.3"
50− addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
51− - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
52− compiler: ": #GHC 7.8.4"
53− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
54− - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
55− compiler: ": #GHC 7.10.3"
56− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
57− - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
58− compiler: ": #GHC 8.0.2"
59− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
60− - env: BUILD=cabal GHCVER=8.2.2 CABALVER=2.0 HAPPYVER=1.19.5 ALEXVER=3.1.7
61− compiler: ": #GHC 8.2.2"
62− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
63− - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 HAPPYVER=1.19.5 ALEXVER=3.1.7
64− compiler: ": #GHC 8.4.3"
65− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
66−
67− # Build with the newest GHC and cabal-install. This is an accepted failure,
68− # see below.
69− - env: BUILD=cabal GHCVER=head CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
70− compiler: ": #GHC HEAD"
71− addons: {apt: {packages: [cabal-install-head,ghc-head,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
72−
73− # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
74− # variable, such as using --stack-yaml to point to a different file.
75− - env: BUILD=stack ARGS=""
76− compiler: ": #stack default"
77− addons: {apt: {packages: [libgmp-dev]}}
78−
79− - env: BUILD=stack ARGS="--resolver lts-2"
80− compiler: ": #stack 7.8.4"
81− addons: {apt: {packages: [libgmp-dev]}}
82−
83− - env: BUILD=stack ARGS="--resolver lts-3"
84− compiler: ": #stack 7.10.2"
85− addons: {apt: {packages: [libgmp-dev]}}
86−
87− - env: BUILD=stack ARGS="--resolver lts-6"
88− compiler: ": #stack 7.10.3"
89− addons: {apt: {packages: [libgmp-dev]}}
90−
91− - env: BUILD=stack ARGS="--resolver lts-7"
92− compiler: ": #stack 8.0.1"
93− addons: {apt: {packages: [libgmp-dev]}}
94−
95− - env: BUILD=stack ARGS="--resolver lts-9"
96− compiler: ": #stack 8.0.2"
97− addons: {apt: {packages: [libgmp-dev]}}
98−
99− - env: BUILD=stack ARGS="--resolver lts-11"
100− compiler: ": #stack 8.2.2"
101− addons: {apt: {packages: [libgmp-dev]}}
102−
103− # Nightly builds are allowed to fail
104− - env: BUILD=stack ARGS="--resolver nightly"
105− compiler: ": #stack nightly"
106− addons: {apt: {packages: [libgmp-dev]}}
107−
108− # Build on macOS in addition to Linux
109− - env: BUILD=stack ARGS=""
110− compiler: ": #stack default osx"
111− os: osx
112−
113− # Travis includes an macOS which is incompatible with GHC 7.8.4
114− #- env: BUILD=stack ARGS="--resolver lts-2"
115− # compiler: ": #stack 7.8.4 osx"
116− # os: osx
117−
118− - env: BUILD=stack ARGS="--resolver lts-3"
119− compiler: ": #stack 7.10.2 osx"
120− os: osx
121−
122− - env: BUILD=stack ARGS="--resolver lts-6"
123− compiler: ": #stack 7.10.3 osx"
124− os: osx
125−
126− - env: BUILD=stack ARGS="--resolver lts-7"
127− compiler: ": #stack 8.0.1 osx"
128− os: osx
129−
130− - env: BUILD=stack ARGS="--resolver lts-9"
131− compiler: ": #stack 8.0.2 osx"
132− os: osx
133−
134− - env: BUILD=stack ARGS="--resolver lts-11"
135− compiler: ": #stack 8.2.2 osx"
136− os: osx
137−
138− - env: BUILD=stack ARGS="--resolver nightly"
139− compiler: ": #stack nightly osx"
140− os: osx
141−
142− allow_failures:
143− - env: BUILD=cabal GHCVER=head CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
144− - env: BUILD=stack ARGS="--resolver nightly"
145−
146−before_install:
147−# Using compiler above sets CC to an invalid value, so unset it
148−- unset CC
149−
150−# We want to always allow newer versions of packages when building on GHC HEAD
151−- CABALARGS=""
152−- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
153−
154−# Download and unpack the stack executable
155−- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:/opt/alex/$ALEXVER/bin:/opt/happy/$HAPPYVER/bin:$HOME/.cabal/bin:$PATH
156−- mkdir -p ~/.local/bin
157−- |
158− if [ `uname` = "Darwin" ]
159− then
160− travis_retry curl --insecure -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
161− else
162− travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
163− fi
164−
165− # Use the more reliable S3 mirror of Hackage
166− mkdir -p $HOME/.cabal
167− echo 'remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/' > $HOME/.cabal/config
168− echo 'remote-repo-cache: $HOME/.cabal/packages' >> $HOME/.cabal/config
169−
170−
171−install:
172−- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
173−- if [ -f configure.ac ]; then autoreconf -i; fi
174−- |
175− set -ex
176− case "$BUILD" in
177− stack)
178− # Build the dependencies
179− stack --no-terminal --install-ghc $ARGS test --bench --only-dependencies
180− ;;
181− cabal)
182− cabal --version
183− travis_retry cabal update
184−
185− # Get the list of packages from the stack.yaml file. Note that
186− # this will also implicitly run hpack as necessary to generate
187− # the .cabal files needed by cabal-install.
188− PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@')
189−
190− cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
191− ;;
192− esac
193− set +ex
194−
195−script:
196−- |
197− set -ex
198− case "$BUILD" in
199− stack)
200− stack --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps
201− ;;
202− cabal)
203− cabal install --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
204−
205− ORIGDIR=$(pwd)
206− for dir in $PACKAGES
207− do
208− cd $dir
209− cabal check || [ "$CABALVER" == "1.16" ]
210− cabal sdist
211− PKGVER=$(cabal info . | awk '{print $2;exit}')
212− SRC_TGZ=$PKGVER.tar.gz
213− cd dist
214− tar zxfv "$SRC_TGZ"
215− cd "$PKGVER"
216− cabal configure --enable-tests --ghc-options -O0
217− cabal build
218− if [ "$CABALVER" = "1.16" ] || [ "$CABALVER" = "1.18" ]; then
219− cabal test
220− else
221− cabal test --show-details=streaming --log=/dev/stdout
222− fi
223− cd $ORIGDIR
224− done
225− ;;
226− esac
227− set +ex
ChangeLog.md+26
@@ -1,3 +1,29 @@
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+
127## 0.0.11
228
329* embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26)
Data/FileEmbed.hs+60−16
@@ -19,6 +19,7 @@
1919module Data.FileEmbed
2020 ( -- * Embed at compile time
2121 embedFile
22+ , embedFileIfExists
2223 , embedOneFileOf
2324 , embedDir
2425 , embedDirListing
@@ -38,6 +39,7 @@ module Data.FileEmbed
3839 , injectFileWith
3940 -- * Relative path manipulation
4041 , makeRelativeToProject
42+ , makeRelativeToLocationPredicate
4143 -- * Internal
4244 , stringToBs
4345 , bsToExp
@@ -46,11 +48,7 @@ module Data.FileEmbed
4648
4749import Language.Haskell.TH.Syntax
4850 ( Exp (AppE, ListE, LitE, TupE, SigE, VarE)
49−#if MIN_VERSION_template_haskell(2,5,0)
50− , Lit (StringL, StringPrimL, IntegerL)
51−#else
52− , Lit (StringL, IntegerL)
53−#endif
51+ , Lit (..)
5452 , Q
5553 , runIO
5654 , qLocation, loc_filename
@@ -58,19 +56,26 @@ import Language.Haskell.TH.Syntax
5856 , Quasi(qAddDependentFile)
5957#endif
6058 )
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
6163import System.Directory (doesDirectoryExist, doesFileExist,
6264 getDirectoryContents, canonicalizePath)
63−import Control.Exception (throw, ErrorCall(..))
64−import Control.Monad (filterM)
65+import Control.Exception (throw, tryJust, ErrorCall(..))
66+import Control.Monad (filterM, guard)
6567import qualified Data.ByteString as B
6668import qualified Data.ByteString.Char8 as B8
6769import Control.Arrow ((&&&), second)
6870import Control.Applicative ((<$>))
6971import Data.ByteString.Unsafe (unsafePackAddressLen)
72+import System.IO.Error (isDoesNotExistError)
7073import System.IO.Unsafe (unsafePerformIO)
7174import System.FilePath ((</>), takeDirectory, takeExtension)
7275import Data.String (fromString)
7376import Prelude as P
77+import Data.List (sortBy)
78+import Data.Ord (comparing)
7479
7580-- | Embed a single file in your source code.
7681--
@@ -85,6 +90,33 @@ embedFile fp =
8590#endif
8691 (runIO $ B.readFile fp) >>= bsToExp
8792
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+
88120-- | Embed a single existing file in your source code
89121-- out of list a list of paths supplied.
90122--
@@ -155,7 +187,11 @@ bsToExp bs =
155187 return $ VarE 'unsafePerformIO
156188 `AppE` (VarE 'unsafePackAddressLen
157189 `AppE` LitE (IntegerL $ fromIntegral $ B8.length bs)
158−#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)
159195 `AppE` LitE (StringPrimL $ B.unpack bs))
160196#else
161197 `AppE` LitE (StringPrimL $ B8.unpack bs))
@@ -230,7 +266,7 @@ fileList' realTop top = do
230266 mapM (liftPair2 . second B.readFile)
231267 dirs <- filterM (doesDirectoryExist . snd) all' >>=
232268 mapM (fileList' realTop . fst)
233− return $ concat $ files : dirs
269+ return $ sortBy (comparing fst) $ concat $ files : dirs
234270
235271liftPair2 :: Monad m => (a, m b) -> m (a, b)
236272liftPair2 (a, b) = b >>= \b' -> return (a, b')
@@ -369,13 +405,23 @@ available, you can use the non-@With@ variants.
369405-- finds the first parent directory with a .cabal file, and uses that as the
370406-- root directory for fixing the relative path.
371407--
372−-- @@@
373−-- $(makeRelativeToProject "data/foo.txt" >>= embedFile)
374−-- @@@
408+-- @$(makeRelativeToProject "data/foo.txt" >>= embedFile)@
375409--
376410-- @since 0.0.10
377411makeRelativeToProject :: FilePath -> Q FilePath
378−makeRelativeToProject rel = do
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
379425 loc <- qLocation
380426 runIO $ do
381427 srcFP <- canonicalizePath $ loc_filename loc
@@ -390,8 +436,6 @@ makeRelativeToProject rel = do
390436 then return Nothing
391437 else do
392438 contents <- getDirectoryContents dir
393− if any isCabalFile contents
439+ if any isTargetFile contents
394440 then return (Just dir)
395441 else findProjectDir dir
396−
397− isCabalFile fp = takeExtension fp == ".cabal"
README.md+1−3
@@ -1,8 +1,6 @@
11## file-embed
22
3−[![Build Status](https://travis-ci.org/snoyberg/file-embed.svg?branch=master)](https://travis-ci.org/snoyberg/file-embed)
4−[![Build status](https://ci.appveyor.com/api/projects/status/vlgo8uudpt374uoy/branch/master?svg=true)](https://ci.appveyor.com/project/snoyberg/file-embed/branch/master)
5−
3+![Tests](https://github.com/snoyberg/file-embed/workflows/Tests/badge.svg)
64
75Use Template Haskell to read a file or all the files in a directory, and turn
86them into (path, bytestring) pairs embedded in your haskell code.
appveyor.ymldeleted−32
@@ -1,32 +0,0 @@
1−build: off
2−
3−before_test:
4−# http://help.appveyor.com/discussions/problems/6312-curl-command-not-found
5−- set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
6−
7−- curl -sS -ostack.zip -L --insecure https://get.haskellstack.org/stable/windows-x86_64.zip
8−- 7z x stack.zip stack.exe
9−
10−clone_folder: "c:\\stack"
11−environment:
12− global:
13− STACK_ROOT: "c:\\sr"
14−
15− matrix:
16− - ARGS: ""
17− #- ARGS: "--resolver lts-2"
18− #- ARGS: "--resolver lts-3"
19− - ARGS: "--resolver lts-6"
20− - ARGS: "--resolver lts-7"
21− - ARGS: "--resolver lts-9"
22− - ARGS: "--resolver lts-11"
23− #- ARGS: "--resolver nightly"
24−
25−test_script:
26−
27−# Install toolchain, but do it silently due to lots of output
28−- stack %ARGS% setup > nul
29−
30−# The ugly echo "" hack is to avoid complaints about 0 being an invalid file
31−# descriptor
32−- echo "" | stack %ARGS% --no-terminal test
file-embed.cabal+7−4
@@ -1,6 +1,6 @@
11name: file-embed
2−version: 0.0.11
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>
@@ -10,7 +10,7 @@ description: Use Template Haskell to read a file or all the files in a
1010 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−1
@@ -1 +1 @@
1−resolver: lts-9.3
1+resolver: lts-14.17
test/main.hs+9−2
@@ -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
2122 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