@@ -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,20 +60,17 @@ 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)
7673import Prelude as P
77−import Data.List (sortBy)
78−import Data.Ord (comparing)
7974
8075-- | Embed a single file in your source code.
8176--
@@ -90,33 +85,6 @@ embedFile fp =
9085#endif
9186 (runIO $ B.readFile fp) >>= bsToExp
9287
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−
12088-- | Embed a single existing file in your source code
12189-- out of list a list of paths supplied.
12290--
@@ -266,7 +234,7 @@ fileList' realTop top = do
266234 mapM (liftPair2 . second B.readFile)
267235 dirs <- filterM (doesDirectoryExist . snd) all' >>=
268236 mapM (fileList' realTop . fst)
269− return $ sortBy (comparing fst) $ concat $ files : dirs
237+ return $ concat $ files : dirs
270238
271239liftPair2 :: Monad m => (a, m b) -> m (a, b)
272240liftPair2 (a, b) = b >>= \b' -> return (a, b')
@@ -409,19 +377,7 @@ available, you can use the non-@With@ variants.
409377--
410378-- @since 0.0.10
411379makeRelativeToProject :: 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
380+makeRelativeToProject rel = do
425381 loc <- qLocation
426382 runIO $ do
427383 srcFP <- canonicalizePath $ loc_filename loc
@@ -436,6 +392,8 @@ makeRelativeToLocationPredicate isTargetFile rel = do
436392 then return Nothing
437393 else do
438394 contents <- getDirectoryContents dir
439− if any isTargetFile contents
395+ if any isCabalFile contents
440396 then return (Just dir)
441397 else findProjectDir dir
398+
399+ isCabalFile fp = takeExtension fp == ".cabal"