@@ -19,7 +19,6 @@
1919module Data.FileEmbed
2020 ( -- * Embed at compile time
2121 embedFile
22− , embedFileIfExists
2322 , embedOneFileOf
2423 , embedDir
2524 , embedDirListing
@@ -39,7 +38,6 @@ module Data.FileEmbed
3938 , injectFileWith
4039 -- * Relative path manipulation
4140 , makeRelativeToProject
42− , makeRelativeToLocationPredicate
4341 -- * Internal
4442 , stringToBs
4543 , bsToExp
@@ -62,14 +60,13 @@ import qualified Data.ByteString.Internal as B
6260#endif
6361import System.Directory (doesDirectoryExist, doesFileExist,
6462 getDirectoryContents, canonicalizePath)
65−import Control.Exception (throw, tryJust, ErrorCall(..))
66−import Control.Monad (filterM, guard)
63+import Control.Exception (throw, ErrorCall(..))
64+import Control.Monad (filterM)
6765import qualified Data.ByteString as B
6866import qualified Data.ByteString.Char8 as B8
6967import Control.Arrow ((&&&), second)
7068import Control.Applicative ((<$>))
7169import Data.ByteString.Unsafe (unsafePackAddressLen)
72−import System.IO.Error (isDoesNotExistError)
7370import System.IO.Unsafe (unsafePerformIO)
7471import System.FilePath ((</>), takeDirectory, takeExtension)
7572import Data.String (fromString)
@@ -90,33 +87,6 @@ embedFile fp =
9087#endif
9188 (runIO $ B.readFile fp) >>= bsToExp
9289
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−
12090-- | Embed a single existing file in your source code
12191-- out of list a list of paths supplied.
12292--
@@ -409,19 +379,7 @@ available, you can use the non-@With@ variants.
409379--
410380-- @since 0.0.10
411381makeRelativeToProject :: 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
382+makeRelativeToProject rel = do
425383 loc <- qLocation
426384 runIO $ do
427385 srcFP <- canonicalizePath $ loc_filename loc
@@ -436,6 +394,8 @@ makeRelativeToLocationPredicate isTargetFile rel = do
436394 then return Nothing
437395 else do
438396 contents <- getDirectoryContents dir
439− if any isTargetFile contents
397+ if any isCabalFile contents
440398 then return (Just dir)
441399 else findProjectDir dir
400+
401+ isCabalFile fp = takeExtension fp == ".cabal"