@@ -6,6 +6,7 @@ module Hakyll.Core.Target
8 , runTarget
8 , runTarget
9 , getResourceString
10 , getResourceString
@@ -13,13 +14,19 @@ import Control.Applicative ((<$>))
13import Control.Monad.Reader (ask)
14import Control.Monad.Reader (ask)
14import Control.Monad.Trans (liftIO)
15import Control.Monad.Trans (liftIO)
17+import Hakyll.Core.Identifier
16import Hakyll.Core.Target.Internal
18import Hakyll.Core.Target.Internal
17import Hakyll.Core.ResourceProvider
19import Hakyll.Core.ResourceProvider
21+-- | Get the current identifier
23+getIdentifier :: TargetM a Identifier
24+getIdentifier = TargetM $ targetIdentifier <$> ask
19-- | Get the resource content as a string
26-- | Get the resource content as a string
21getResourceString :: TargetM a String
28getResourceString :: TargetM a String
22getResourceString = TargetM $ do
29getResourceString = TargetM $ do
23 provider <- targetResourceProvider <$> ask
30 provider <- targetResourceProvider <$> ask
24− identifier <- targetIdentifier <$> ask
31+ identifier <- unTargetM getIdentifier
25 liftIO $ resourceString provider identifier
32 liftIO $ resourceString provider identifier