file-embed 0.0.9.1 → 0.0.10

raw patch · 3 files changed

+49/−3 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ChangeLog.md +4/−0
• Data/FileEmbed.hs +44/−2
• file-embed.cabal +1/−1

@@ -1,3 +1,7 @@+## 0.0.10++* `makeRelativeToProject`+ ## 0.0.9  * embedStringFile [#14](https://github.com/snoyberg/file-embed/pull/14)

@@ -35,6 +35,8 @@     , injectFile     , injectWith     , injectFileWith+      -- * Relative path manipulation+    , makeRelativeToProject       -- * Internal     , stringToBs     , bsToExp@@ -50,12 +52,13 @@ #endif     , Q     , runIO+    , qLocation, loc_filename #if MIN_VERSION_template_haskell(2,7,0)     , Quasi(qAddDependentFile) #endif     ) import System.Directory (doesDirectoryExist, doesFileExist,-                         getDirectoryContents)+                         getDirectoryContents, canonicalizePath) import Control.Exception (throw, ErrorCall(..)) import Control.Monad (filterM) import qualified Data.ByteString as B@@ -64,7 +67,7 @@ import Control.Applicative ((<$>)) import Data.ByteString.Unsafe (unsafePackAddressLen) import System.IO.Unsafe (unsafePerformIO)-import System.FilePath ((</>))+import System.FilePath ((</>), takeDirectory, takeExtension) import Data.String (fromString) import Prelude as P @@ -336,3 +339,42 @@ available, you can use the non-@With@ variants.  -}++-- | Take a relative file path and attach it to the root of the current+-- project.+--+-- The idea here is that, when building with Stack, the build will always be+-- executed with a current working directory of the root of the project (where+-- your .cabal file is located). However, if you load up multiple projects with+-- @stack ghci@, the working directory may be something else entirely.+--+-- This function looks at the source location of the Haskell file calling it,+-- finds the first parent directory with a .cabal file, and uses that as the+-- root directory for fixing the relative path.+--+-- @@@+-- $(makeRelativeToProject "data/foo.txt" >>= fileEmbed)+-- @@@+--+-- @since 0.0.10+makeRelativeToProject :: FilePath -> Q FilePath+makeRelativeToProject rel = do+    loc <- qLocation+    runIO $ do+        srcFP <- canonicalizePath $ loc_filename loc+        mdir <- findProjectDir srcFP+        case mdir of+            Nothing -> error $ "Could not find .cabal file for path: " ++ srcFP+            Just dir -> return $ dir </> rel+  where+    findProjectDir x = do+        let dir = takeDirectory x+        if dir == x+            then return Nothing+            else do+                contents <- getDirectoryContents dir+                if any isCabalFile contents+                    then return (Just dir)+                    else findProjectDir dir++    isCabalFile fp = takeExtension fp == ".cabal"

@@ -1,5 +1,5 @@ name:            file-embed-version:         0.0.9.1+version:         0.0.10 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>