Top-level module for reading templates

8 files changed, 16 insertions, 10 deletions

diff --git a/src/Hakyll.hs b/src/Hakyll.hs
index 93c9ccc..64d5330 100644
--- a/src/Hakyll.hs
+++ b/src/Hakyll.hs
@@ -10,6 +10,7 @@ module Hakyll
     , module Hakyll.Core.Util.Arrow
     , module Hakyll.Core.Util.File
     , module Hakyll.Core.Writable
+    , module Hakyll.Main
     , module Hakyll.Web
     , module Hakyll.Web.CompressCss
     , module Hakyll.Web.Feed
@@ -33,6 +34,7 @@ import Hakyll.Core.Rules
 import Hakyll.Core.Util.Arrow
 import Hakyll.Core.Util.File
 import Hakyll.Core.Writable
+import Hakyll.Main
 import Hakyll.Web
 import Hakyll.Web.CompressCss
 import Hakyll.Web.Feed
diff --git a/src/Hakyll/Web.hs b/src/Hakyll/Web.hs
index f991e21..92cdab5 100644
--- a/src/Hakyll/Web.hs
+++ b/src/Hakyll/Web.hs
@@ -20,8 +20,7 @@ import Hakyll.Core.Identifier
 import Hakyll.Web.Page
 import Hakyll.Web.Pandoc
 import Hakyll.Web.Template
-import Hakyll.Web.Template.Read.Hakyll
-import Hakyll.Web.Template.Read.Hamlet
+import Hakyll.Web.Template.Read
 import Hakyll.Web.RelativizeUrls
 import Hakyll.Web.Util.String
 import Hakyll.Web.CompressCss
diff --git a/src/Hakyll/Web/Feed.hs b/src/Hakyll/Web/Feed.hs
index 17a69eb..417f484 100644
--- a/src/Hakyll/Web/Feed.hs
+++ b/src/Hakyll/Web/Feed.hs
@@ -32,6 +32,7 @@ import Hakyll.Core.Compiler
 import Hakyll.Web.Page
 import Hakyll.Web.Page.Metadata
 import Hakyll.Web.Template
+import Hakyll.Web.Template.Read.Hakyll (readTemplate)
 
 import Paths_hakyll
 
diff --git a/src/Hakyll/Web/Template.hs b/src/Hakyll/Web/Template.hs
index 83fd7eb..06794e8 100644
--- a/src/Hakyll/Web/Template.hs
+++ b/src/Hakyll/Web/Template.hs
@@ -8,7 +8,7 @@ import Data.Maybe (fromMaybe)
 import qualified Data.Map as M
 
 import Hakyll.Web.Template.Internal
-import Hakyll.Web.Template.Read.Hakyll (readTemplate)
+import Hakyll.Web.Template.Read
 import Hakyll.Web.Page
 
 -- | Substitutes @$identifiers@ in the given @Template@ by values from the given
diff --git a/src/Hakyll/Web/Template/Read.hs b/src/Hakyll/Web/Template/Read.hs
new file mode 100644
index 0000000..421b7e9
--- /dev/null
+++ b/src/Hakyll/Web/Template/Read.hs
@@ -0,0 +1,10 @@
+-- | Re-exports all different template reading modules
+--
+module Hakyll.Web.Template.Read
+    ( readTemplate
+    , readHamletTemplate
+    , readHamletTemplateWith
+    ) where
+
+import Hakyll.Web.Template.Read.Hakyll
+import Hakyll.Web.Template.Read.Hamlet
diff --git a/src/Hakyll/Web/Template/Read/Hakyll.hs b/src/Hakyll/Web/Template/Read/Hakyll.hs
index fbbfee2..e0e10f4 100644
--- a/src/Hakyll/Web/Template/Read/Hakyll.hs
+++ b/src/Hakyll/Web/Template/Read/Hakyll.hs
@@ -6,7 +6,6 @@ module Hakyll.Web.Template.Read.Hakyll
 
 import Data.List (isPrefixOf)
 import Data.Char (isAlphaNum)
-import Data.Maybe (fromMaybe)
 
 import Hakyll.Web.Template.Internal
 
diff --git a/src/Hakyll/Web/Template/Read/Hamlet.hs b/src/Hakyll/Web/Template/Read/Hamlet.hs
index 1c9bbf6..55b73f8 100644
--- a/src/Hakyll/Web/Template/Read/Hamlet.hs
+++ b/src/Hakyll/Web/Template/Read/Hamlet.hs
@@ -6,12 +6,8 @@ module Hakyll.Web.Template.Read.Hamlet
     , readHamletTemplateWith
     ) where
 
-import Control.Monad.Trans (liftIO)
-import System.FilePath (takeExtension)
-
 import Text.Hamlet (HamletSettings (..), defaultHamletSettings)
 import Text.Hamlet.RT
-import Control.Failure
 
 import Hakyll.Web.Template.Internal
 
diff --git a/tests/Hakyll/Web/Template/Tests.hs b/tests/Hakyll/Web/Template/Tests.hs
index d95b151..a52eb5b 100644
--- a/tests/Hakyll/Web/Template/Tests.hs
+++ b/tests/Hakyll/Web/Template/Tests.hs
@@ -11,8 +11,7 @@ import qualified Data.Map as M
 
 import Hakyll.Web.Page
 import Hakyll.Web.Template
-import Hakyll.Web.Template.Read.Hakyll
-import Hakyll.Web.Template.Read.Hamlet
+import Hakyll.Web.Template.Read
 import TestSuite.Util
 
 tests :: [Test]