git.iko.soy/typeable/file-embed
on master help sign in
.github/workflows/tests.ymlnew file+32
since splitsnapshots
unifiedsplit
@@ -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+2
@@ -1,2 +1,4 @@
1dist
1dist
2*.swp
2*.swp
3+.stack-work
4+/tarballs/
ChangeLog.mdnew file+57
@@ -0,0 +1,57 @@
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+
39+## 0.0.9
40+
41+* embedStringFile [#14](https://github.com/snoyberg/file-embed/pull/14)
42+
43+## 0.0.8.2
44+
45+* Improve inject documentation [#11](https://github.com/snoyberg/file-embed/issues/11)
46+
47+## 0.0.8.1
48+
49+Minor cleanup
50+
51+## 0.0.8
52+
53+* Custom postfix for magic string [#7](https://github.com/snoyberg/file-embed/issues/7)
54+
55+## 0.0.7.1
56+
57+Minor cleanup
Data/FileEmbed.hs+265−32
@@ -1,8 +1,9 @@
1{-# LANGUAGE TemplateHaskell #-}
1{-# LANGUAGE TemplateHaskell #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3+{-# LANGUAGE OverloadedStrings #-}
3-- | This module uses template Haskell. Following is a simplified explanation of usage for those unfamiliar with calling Template Haskell functions.
4-- | This module uses template Haskell. Following is a simplified explanation of usage for those unfamiliar with calling Template Haskell functions.
4--
5--
5−-- The function @embedFile@ in this modules embeds a file into the exceutable
6+-- The function @embedFile@ in this modules embeds a file into the executable
6-- that you can use it at runtime. A file is represented as a @ByteString@.
7-- that you can use it at runtime. A file is represented as a @ByteString@.
7-- However, as you can see below, the type signature indicates a value of type
8-- However, as you can see below, the type signature indicates a value of type
8-- @Q Exp@ will be returned. In order to convert this into a @ByteString@, you
9-- @Q Exp@ will be returned. In order to convert this into a @ByteString@, you
@@ -18,43 +19,63 @@
18module Data.FileEmbed
19module Data.FileEmbed
19 ( -- * Embed at compile time
20 ( -- * Embed at compile time
20 embedFile
21 embedFile
22+ , embedFileIfExists
21 , embedOneFileOf
23 , embedOneFileOf
22 , embedDir
24 , embedDir
25+ , embedDirListing
23 , getDir
26 , getDir
27+ -- * Embed as a IsString
28+ , embedStringFile
29+ , embedOneStringFileOf
24 -- * Inject into an executable
30 -- * Inject into an executable
31+ -- $inject
25#if MIN_VERSION_template_haskell(2,5,0)
32#if MIN_VERSION_template_haskell(2,5,0)
26 , dummySpace
33 , dummySpace
34+ , dummySpaceWith
27#endif
35#endif
28 , inject
36 , inject
29 , injectFile
37 , injectFile
38+ , injectWith
39+ , injectFileWith
40+ -- * Relative path manipulation
41+ , makeRelativeToProject
42+ , makeRelativeToLocationPredicate
30 -- * Internal
43 -- * Internal
31 , stringToBs
44 , stringToBs
45+ , bsToExp
46+ , strToExp
32 ) where
47 ) where
33
48
34import Language.Haskell.TH.Syntax
49import Language.Haskell.TH.Syntax
35− ( Exp (AppE, ListE, LitE, TupE, SigE)
50+ ( Exp (AppE, ListE, LitE, TupE, SigE, VarE)
36−#if MIN_VERSION_template_haskell(2,5,0)
51+ , Lit (..)
37− , Lit (StringL, StringPrimL, IntegerL)
38−#else
39− , Lit (StringL, IntegerL)
40−#endif
41 , Q
52 , Q
42 , runIO
53 , runIO
54+ , qLocation, loc_filename
43#if MIN_VERSION_template_haskell(2,7,0)
55#if MIN_VERSION_template_haskell(2,7,0)
44 , Quasi(qAddDependentFile)
56 , Quasi(qAddDependentFile)
45#endif
57#endif
46 )
58 )
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
47import System.Directory (doesDirectoryExist, doesFileExist,
63import System.Directory (doesDirectoryExist, doesFileExist,
48− getDirectoryContents)
64+ getDirectoryContents, canonicalizePath)
49−import Control.Exception (throw, ErrorCall(..))
65+import Control.Exception (throw, tryJust, ErrorCall(..))
50−import Control.Monad (filterM)
66+import Control.Monad (filterM, guard)
51import qualified Data.ByteString as B
67import qualified Data.ByteString as B
52import qualified Data.ByteString.Char8 as B8
68import qualified Data.ByteString.Char8 as B8
53import Control.Arrow ((&&&), second)
69import Control.Arrow ((&&&), second)
54import Control.Applicative ((<$>))
70import Control.Applicative ((<$>))
55import Data.ByteString.Unsafe (unsafePackAddressLen)
71import Data.ByteString.Unsafe (unsafePackAddressLen)
72+import System.IO.Error (isDoesNotExistError)
56import System.IO.Unsafe (unsafePerformIO)
73import System.IO.Unsafe (unsafePerformIO)
57−import System.FilePath ((</>))
74+import System.FilePath ((</>), takeDirectory, takeExtension)
75+import Data.String (fromString)
76+import Prelude as P
77+import Data.List (sortBy)
78+import Data.Ord (comparing)
58
79
59-- | Embed a single file in your source code.
80-- | Embed a single file in your source code.
60--
81--
@@ -69,13 +90,40 @@ embedFile fp =
69#endif
90#endif
70 (runIO $ B.readFile fp) >>= bsToExp
91 (runIO $ B.readFile fp) >>= bsToExp
71
92
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+
72-- | Embed a single existing file in your source code
120-- | Embed a single existing file in your source code
73-- out of list a list of paths supplied.
121-- out of list a list of paths supplied.
74--
122--
75-- > import qualified Data.ByteString
123-- > import qualified Data.ByteString
76-- >
124-- >
77-- > myFile :: Data.ByteString.ByteString
125-- > myFile :: Data.ByteString.ByteString
78−-- > myFile = $(embedFile' [ "dirName/fileName", "src/dirName/fileName" ])
126+-- > myFile = $(embedOneFileOf [ "dirName/fileName", "src/dirName/fileName" ])
79embedOneFileOf :: [FilePath] -> Q Exp
127embedOneFileOf :: [FilePath] -> Q Exp
80embedOneFileOf ps =
128embedOneFileOf ps =
81 (runIO $ readExistingFile ps) >>= \ ( path, content ) -> do
129 (runIO $ readExistingFile ps) >>= \ ( path, content ) -> do
@@ -103,6 +151,18 @@ embedDir fp = do
103 e <- ListE <$> ((runIO $ fileList fp) >>= mapM (pairToExp fp))
151 e <- ListE <$> ((runIO $ fileList fp) >>= mapM (pairToExp fp))
104 return $ SigE e typ
152 return $ SigE e typ
105
153
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+
106-- | Get a directory tree in the IO monad.
166-- | Get a directory tree in the IO monad.
107--
167--
108-- This is the workhorse of 'embedDir'
168-- This is the workhorse of 'embedDir'
@@ -115,17 +175,82 @@ pairToExp _root (path, bs) = do
115 qAddDependentFile $ _root ++ '/' : path
175 qAddDependentFile $ _root ++ '/' : path
116#endif
176#endif
117 exp' <- bsToExp bs
177 exp' <- bsToExp bs
178+ return $! TupE
179+#if MIN_VERSION_template_haskell(2,16,0)
180+ $ map Just
181+#endif
118− return $! TupE [LitE $ StringL path, exp']
182+ [LitE $ StringL path, exp']
119
183
120bsToExp :: B.ByteString -> Q Exp
184bsToExp :: B.ByteString -> Q Exp
185+#if MIN_VERSION_template_haskell(2, 5, 0)
186+bsToExp bs =
187+ return $ VarE 'unsafePerformIO
188+ `AppE` (VarE 'unsafePackAddressLen
189+ `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)
195+ `AppE` LitE (StringPrimL $ B.unpack bs))
196+#else
197+ `AppE` LitE (StringPrimL $ B8.unpack bs))
198+#endif
199+#else
121bsToExp bs = do
200bsToExp bs = do
122 helper <- [| stringToBs |]
201 helper <- [| stringToBs |]
123 let chars = B8.unpack bs
202 let chars = B8.unpack bs
124 return $! AppE helper $! LitE $! StringL chars
203 return $! AppE helper $! LitE $! StringL chars
204+#endif
125
205
126stringToBs :: String -> B.ByteString
206stringToBs :: String -> B.ByteString
127stringToBs = B8.pack
207stringToBs = B8.pack
128
208
209+-- | Embed a single file in your source code.
210+--
211+-- > import Data.String
212+-- >
213+-- > myFile :: IsString a => a
214+-- > myFile = $(embedStringFile "dirName/fileName")
215+--
216+-- Since 0.0.9
217+embedStringFile :: FilePath -> Q Exp
218+embedStringFile fp =
219+#if MIN_VERSION_template_haskell(2,7,0)
220+ qAddDependentFile fp >>
221+#endif
222+ (runIO $ P.readFile fp) >>= strToExp
223+
224+-- | Embed a single existing string file in your source code
225+-- out of list a list of paths supplied.
226+--
227+-- Since 0.0.9
228+embedOneStringFileOf :: [FilePath] -> Q Exp
229+embedOneStringFileOf ps =
230+ (runIO $ readExistingFile ps) >>= \ ( path, content ) -> do
231+#if MIN_VERSION_template_haskell(2,7,0)
232+ qAddDependentFile path
233+#endif
234+ strToExp content
235+ where
236+ readExistingFile :: [FilePath] -> IO ( FilePath, String )
237+ readExistingFile xs = do
238+ ys <- filterM doesFileExist xs
239+ case ys of
240+ (p:_) -> P.readFile p >>= \ c -> return ( p, c )
241+ _ -> throw $ ErrorCall "Cannot find file to embed as resource"
242+
243+strToExp :: String -> Q Exp
244+#if MIN_VERSION_template_haskell(2, 5, 0)
245+strToExp s =
246+ return $ VarE 'fromString
247+ `AppE` LitE (StringL s)
248+#else
249+strToExp s = do
250+ helper <- [| fromString |]
251+ return $! AppE helper $! LitE $! StringL s
252+#endif
253+
129notHidden :: FilePath -> Bool
254notHidden :: FilePath -> Bool
130notHidden ('.':_) = False
255notHidden ('.':_) = False
131notHidden _ = True
256notHidden _ = True
@@ -141,20 +266,20 @@ fileList' realTop top = do
141 mapM (liftPair2 . second B.readFile)
266 mapM (liftPair2 . second B.readFile)
142 dirs <- filterM (doesDirectoryExist . snd) all' >>=
267 dirs <- filterM (doesDirectoryExist . snd) all' >>=
143 mapM (fileList' realTop . fst)
268 mapM (fileList' realTop . fst)
144− return $ concat $ files : dirs
269+ return $ sortBy (comparing fst) $ concat $ files : dirs
145
270
146liftPair2 :: Monad m => (a, m b) -> m (a, b)
271liftPair2 :: Monad m => (a, m b) -> m (a, b)
147liftPair2 (a, b) = b >>= \b' -> return (a, b')
272liftPair2 (a, b) = b >>= \b' -> return (a, b')
148
273
149−magic :: String
274+magic :: B.ByteString -> B.ByteString
150−magic = concat ["fe", "MS"]
275+magic x = B8.concat ["fe", x]
151
276
152sizeLen :: Int
277sizeLen :: Int
153sizeLen = 20
278sizeLen = 20
154
279
155getInner :: B.ByteString -> B.ByteString
280getInner :: B.ByteString -> B.ByteString
156getInner b =
281getInner b =
157− let (sizeBS, rest) = B.splitAt sizeLen $ B.drop (length magic) b
282+ let (sizeBS, rest) = B.splitAt sizeLen b
158 in case reads $ B8.unpack sizeBS of
283 in case reads $ B8.unpack sizeBS of
159 (i, _):_ -> B.take i rest
284 (i, _):_ -> B.take i rest
160 [] -> error "Data.FileEmbed (getInner): Your dummy space has been corrupted."
285 [] -> error "Data.FileEmbed (getInner): Your dummy space has been corrupted."
@@ -165,44 +290,152 @@ padSize i =
165 in replicate (sizeLen - length s) '0' ++ s
290 in replicate (sizeLen - length s) '0' ++ s
166
291
167#if MIN_VERSION_template_haskell(2,5,0)
292#if MIN_VERSION_template_haskell(2,5,0)
293+-- | Allocate the given number of bytes in the generate executable. That space
294+-- can be filled up with the 'inject' and 'injectFile' functions.
168dummySpace :: Int -> Q Exp
295dummySpace :: Int -> Q Exp
169−dummySpace space = do
296+dummySpace = dummySpaceWith "MS"
297+
298+-- | Like 'dummySpace', but takes a postfix for the magic string. In
299+-- order for this to work, the same postfix must be used by 'inject' /
300+-- 'injectFile'. This allows an executable to have multiple
301+-- 'ByteString's injected into it, without encountering collisions.
302+--
303+-- Since 0.0.8
304+dummySpaceWith :: B.ByteString -> Int -> Q Exp
305+dummySpaceWith postfix space = do
170 let size = padSize space
306 let size = padSize space
307+ magic' = magic postfix
171− let start = magic ++ size
308+ start = B8.unpack magic' ++ size
309+ magicLen = B8.length magic'
310+ len = magicLen + sizeLen + space
172− let chars = LitE $ StringPrimL $
311+ chars = LitE $ StringPrimL $
173#if MIN_VERSION_template_haskell(2,6,0)
312#if MIN_VERSION_template_haskell(2,6,0)
174 map (toEnum . fromEnum) $
313 map (toEnum . fromEnum) $
175#endif
314#endif
176 start ++ replicate space '0'
315 start ++ replicate space '0'
177− let len = LitE $ IntegerL $ fromIntegral $ length start + space
178− upi <- [|unsafePerformIO|]
179− pack <- [|unsafePackAddressLen|]
316+ [| getInner (B.drop magicLen (unsafePerformIO (unsafePackAddressLen len $(return chars)))) |]
180− getInner' <- [|getInner|]
181− return $ getInner' `AppE` (upi `AppE` (pack `AppE` len `AppE` chars))
182#endif
317#endif
183
318
319+-- | Inject some raw data inside a @ByteString@ containing empty, dummy space
320+-- (allocated with @dummySpace@). Typically, the original @ByteString@ is an
321+-- executable read from the filesystem.
184inject :: B.ByteString -- ^ bs to inject
322inject :: B.ByteString -- ^ bs to inject
185 -> B.ByteString -- ^ original BS containing dummy
323 -> B.ByteString -- ^ original BS containing dummy
186 -> Maybe B.ByteString -- ^ new BS, or Nothing if there is insufficient dummy space
324 -> Maybe B.ByteString -- ^ new BS, or Nothing if there is insufficient dummy space
325+inject = injectWith "MS"
326+
327+-- | Like 'inject', but takes a postfix for the magic string.
328+--
329+-- Since 0.0.8
330+injectWith :: B.ByteString -- ^ postfix of magic string
331+ -> B.ByteString -- ^ bs to inject
332+ -> B.ByteString -- ^ original BS containing dummy
333+ -> Maybe B.ByteString -- ^ new BS, or Nothing if there is insufficient dummy space
187−inject toInj orig =
334+injectWith postfix toInj orig =
188 if toInjL > size
335 if toInjL > size
189 then Nothing
336 then Nothing
190− else Just $ B.concat [before, B8.pack magic, B8.pack $ padSize toInjL, toInj, B8.pack $ replicate (size - toInjL) '0', after]
337+ else Just $ B.concat [before, magic', B8.pack $ padSize toInjL, toInj, B8.pack $ replicate (size - toInjL) '0', after]
191 where
338 where
339+ magic' = magic postfix
192 toInjL = B.length toInj
340 toInjL = B.length toInj
193− (before, rest) = B.breakSubstring (B8.pack magic) orig
341+ (before, rest) = B.breakSubstring magic' orig
194− (sizeBS, rest') = B.splitAt sizeLen $ B.drop (length magic) rest
342+ (sizeBS, rest') = B.splitAt sizeLen $ B.drop (B8.length magic') rest
195 size = case reads $ B8.unpack sizeBS of
343 size = case reads $ B8.unpack sizeBS of
196 (i, _):_ -> i
344 (i, _):_ -> i
197 [] -> error $ "Data.FileEmbed (inject): Your dummy space has been corrupted. Size is: " ++ show sizeBS
345 [] -> error $ "Data.FileEmbed (inject): Your dummy space has been corrupted. Size is: " ++ show sizeBS
198 after = B.drop size rest'
346 after = B.drop size rest'
199
347
348+-- | Same as 'inject', but instead of performing the injecting in memory, read
349+-- the contents from the filesystem and write back to a different file on the
350+-- filesystem.
200−injectFile :: B.ByteString
351+injectFile :: B.ByteString -- ^ bs to inject
201 -> FilePath -- ^ template file
352 -> FilePath -- ^ template file
202 -> FilePath -- ^ output file
353 -> FilePath -- ^ output file
203 -> IO ()
354 -> IO ()
355+injectFile = injectFileWith "MS"
356+
357+-- | Like 'injectFile', but takes a postfix for the magic string.
358+--
359+-- Since 0.0.8
360+injectFileWith :: B.ByteString -- ^ postfix of magic string
361+ -> B.ByteString -- ^ bs to inject
362+ -> FilePath -- ^ template file
363+ -> FilePath -- ^ output file
364+ -> IO ()
204−injectFile inj srcFP dstFP = do
365+injectFileWith postfix inj srcFP dstFP = do
205 src <- B.readFile srcFP
366 src <- B.readFile srcFP
206− case inject inj src of
367+ case injectWith postfix inj src of
207 Nothing -> error "Insufficient dummy space"
368 Nothing -> error "Insufficient dummy space"
208 Just dst -> B.writeFile dstFP dst
369 Just dst -> B.writeFile dstFP dst
370+
371+{- $inject
372+
373+The inject system allows arbitrary content to be embedded inside a Haskell
374+executable, post compilation. Typically, file-embed allows you to read some
375+contents from the file system at compile time and embed them inside your
376+executable. Consider a case, instead, where you would want to embed these
377+contents after compilation. Two real-world examples are:
378+
379+* You would like to embed a hash of the executable itself, for sanity checking in a network protocol. (Obviously the hash will change after you embed the hash.)
380+
381+* You want to create a self-contained web server that has a set of content, but will need to update the content on machines that do not have access to GHC.
382+
383+The typical workflow use:
384+
385+* Use 'dummySpace' or 'dummySpaceWith' to create some empty space in your executable
386+
387+* Use 'injectFile' or 'injectFileWith' from a separate utility to modify that executable to have the updated content.
388+
389+The reason for the @With@-variant of the functions is for cases where you wish
390+to inject multiple different kinds of content, and therefore need control over
391+the magic key. If you know for certain that there will only be one dummy space
392+available, you can use the non-@With@ variants.
393+
394+-}
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
READMEdeleted−1
@@ -1 +0,0 @@
1−Use Template Haskell to embed file contents directly.
README.mdnew file+6
@@ -0,0 +1,6 @@
1+## file-embed
2+
3+![Tests](https://github.com/snoyberg/file-embed/workflows/Tests/badge.svg)
4+
5+Use Template Haskell to read a file or all the files in a directory, and turn
6+them into (path, bytestring) pairs embedded in your haskell code.
file-embed.cabal+12−8
@@ -1,22 +1,25 @@
1name: file-embed
1name: file-embed
2−version: 0.0.6
2+version: 0.0.15.0
3−license: BSD3
3+license: BSD2
4license-file: LICENSE
4license-file: LICENSE
5author: Michael Snoyman <michael@snoyman.com>
5author: Michael Snoyman <michael@snoyman.com>
6maintainer: Michael Snoyman <michael@snoyman.com>
6maintainer: Michael Snoyman <michael@snoyman.com>
7synopsis: Use Template Haskell to embed file contents directly.
7synopsis: Use Template Haskell to embed file contents directly.
8description: Use Template Haskell to read a file or all the files in a
8description: Use Template Haskell to read a file or all the files in a
9− directory, and turn them into (path, text) pairs embedded
9+ directory, and turn them into (path, bytestring) pairs
10− in your haskell code.
10+ embedded in your Haskell code.
11category: Data
11category: Data
12stability: Stable
12stability: Stable
13−cabal-version: >= 1.8
13+cabal-version: >= 1.10
14build-type: Simple
14build-type: Simple
15homepage: https://github.com/snoyberg/file-embed
15homepage: https://github.com/snoyberg/file-embed
16−extra-source-files: test/main.hs, test/sample/foo, test/sample/bar/baz
16+extra-source-files: test/main.hs, test/sample/foo, test/sample/bar/baz,
17+ ChangeLog.md
18+ README.md
17
19
18library
20library
21+ default-language: Haskell2010
19− build-depends: base >= 4 && < 5
22+ build-depends: base >= 4.9.1 && < 5
20 , bytestring >= 0.9.1.4
23 , bytestring >= 0.9.1.4
21 , directory >= 1.0.0.3
24 , directory >= 1.0.0.3
22 , template-haskell
25 , template-haskell
@@ -25,12 +28,13 @@ library
25 ghc-options: -Wall
28 ghc-options: -Wall
26
29
27test-suite test
30test-suite test
31+ default-language: Haskell2010
28 type: exitcode-stdio-1.0
32 type: exitcode-stdio-1.0
29 main-is: main.hs
33 main-is: main.hs
30 hs-source-dirs: test
34 hs-source-dirs: test
31 build-depends: base
35 build-depends: base
36+ , bytestring
32 , file-embed
37 , file-embed
33− , HUnit
34 , filepath
38 , filepath
35
39
36source-repository head
40source-repository head
stack.yamlnew file+1
@@ -0,0 +1 @@
1+resolver: lts-14.17
test/main.hs+17−3
@@ -1,14 +1,28 @@
1{-# LANGUAGE TemplateHaskell #-}
1{-# LANGUAGE TemplateHaskell #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
3
3
4+import Control.Monad (unless)
5+import qualified Data.ByteString as B (ByteString, filter)
4import Data.FileEmbed
6import Data.FileEmbed
5−import Test.HUnit ((@?=))
6import System.FilePath ((</>))
7import System.FilePath ((</>))
7
8
9+infix 1 @?=
10+
11+(@?=) :: (Eq a, Show a) => a -> a -> IO ()
12+actual @?= expected = unless (actual == expected) (error $ "expected: " ++ show expected ++ "\n but got: " ++ show actual)
13+
8main :: IO ()
14main :: IO ()
9main = do
15main = do
10 let received = $(embedDir "test/sample")
16 let received = $(embedDir "test/sample")
11 received @?=
17 received @?=
12− [ ("foo", "foo\r\n")
13− , ("bar" </> "baz", "baz\r\n")
18+ [ ("bar" </> "baz", "baz\r\n")
19+ , ("foo", "foo\r\n")
14 ]
20 ]
21+ 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