Changed to tibbe's style guide for imports.
This commit is contained in:
parent
aa44d6c0da
commit
fb381ddfd3
12 changed files with 19 additions and 19 deletions
|
@ -5,9 +5,9 @@ module Network.Hakyll.SimpleServer
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Prelude hiding (log)
|
import Prelude hiding (log)
|
||||||
import Network
|
|
||||||
import Control.Monad (forever)
|
import Control.Monad (forever)
|
||||||
import Control.Monad.Reader (ReaderT, runReaderT, ask, liftIO)
|
import Control.Monad.Reader (ReaderT, runReaderT, ask, liftIO)
|
||||||
|
import Network
|
||||||
import System.IO
|
import System.IO
|
||||||
import System.Directory (doesFileExist, doesDirectoryExist)
|
import System.Directory (doesFileExist, doesDirectoryExist)
|
||||||
import Control.Concurrent (forkIO)
|
import Control.Concurrent (forkIO)
|
||||||
|
|
|
@ -5,13 +5,12 @@ module Text.Hakyll
|
||||||
|
|
||||||
import Control.Monad.Reader (runReaderT)
|
import Control.Monad.Reader (runReaderT)
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
|
import System.Environment (getArgs, getProgName)
|
||||||
|
import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
|
||||||
|
|
||||||
import Network.Hakyll.SimpleServer (simpleServer)
|
import Network.Hakyll.SimpleServer (simpleServer)
|
||||||
import Text.Hakyll.Hakyll
|
import Text.Hakyll.Hakyll
|
||||||
|
|
||||||
import System.Environment (getArgs, getProgName)
|
|
||||||
import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
|
|
||||||
|
|
||||||
-- | Default hakyll configuration.
|
-- | Default hakyll configuration.
|
||||||
defaultHakyllConfiguration :: HakyllConfiguration
|
defaultHakyllConfiguration :: HakyllConfiguration
|
||||||
defaultHakyllConfiguration = HakyllConfiguration
|
defaultHakyllConfiguration = HakyllConfiguration
|
||||||
|
|
|
@ -3,6 +3,7 @@ module Text.Hakyll.CompressCSS
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Data.List (isPrefixOf)
|
import Data.List (isPrefixOf)
|
||||||
|
|
||||||
import Text.Hakyll.Regex (substituteRegex)
|
import Text.Hakyll.Regex (substituteRegex)
|
||||||
|
|
||||||
-- | Compress CSS to speed up your site.
|
-- | Compress CSS to speed up your site.
|
||||||
|
|
|
@ -8,12 +8,12 @@ module Text.Hakyll.Context
|
||||||
|
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import Data.Map (Map)
|
import Data.Map (Map)
|
||||||
|
|
||||||
import System.Locale (defaultTimeLocale)
|
import System.Locale (defaultTimeLocale)
|
||||||
import System.FilePath (takeFileName)
|
import System.FilePath (takeFileName)
|
||||||
import Data.Time.Format (parseTime, formatTime)
|
import Data.Time.Format (parseTime, formatTime)
|
||||||
import Data.Time.Clock (UTCTime)
|
import Data.Time.Clock (UTCTime)
|
||||||
import Data.Maybe (fromMaybe)
|
import Data.Maybe (fromMaybe)
|
||||||
|
|
||||||
import Text.Hakyll.Regex (substituteRegex)
|
import Text.Hakyll.Regex (substituteRegex)
|
||||||
|
|
||||||
-- | Type for a context.
|
-- | Type for a context.
|
||||||
|
|
|
@ -17,9 +17,10 @@ import System.Directory
|
||||||
import System.FilePath
|
import System.FilePath
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import Data.List (isPrefixOf)
|
import Data.List (isPrefixOf)
|
||||||
import Text.Hakyll.Hakyll (Hakyll)
|
|
||||||
import Control.Monad.Reader (liftIO)
|
import Control.Monad.Reader (liftIO)
|
||||||
|
|
||||||
|
import Text.Hakyll.Hakyll (Hakyll)
|
||||||
|
|
||||||
-- | Auxiliary function to remove pathSeparators form the start. We don't deal
|
-- | Auxiliary function to remove pathSeparators form the start. We don't deal
|
||||||
-- with absolute paths here. We also remove $root from the start.
|
-- with absolute paths here. We also remove $root from the start.
|
||||||
removeLeadingSeparator :: FilePath -> FilePath
|
removeLeadingSeparator :: FilePath -> FilePath
|
||||||
|
|
|
@ -5,10 +5,11 @@ module Text.Hakyll.Hakyll
|
||||||
, askHakyll
|
, askHakyll
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Text.Hakyll.Context (Context)
|
|
||||||
import Control.Monad.Reader (ReaderT, ask)
|
import Control.Monad.Reader (ReaderT, ask)
|
||||||
import Control.Monad (liftM)
|
import Control.Monad (liftM)
|
||||||
|
|
||||||
|
import Text.Hakyll.Context (Context)
|
||||||
|
|
||||||
-- | Hakyll global configuration type.
|
-- | Hakyll global configuration type.
|
||||||
data HakyllConfiguration = HakyllConfiguration
|
data HakyllConfiguration = HakyllConfiguration
|
||||||
{ -- | An additional context to use when rendering. This additional context
|
{ -- | An additional context to use when rendering. This additional context
|
||||||
|
|
|
@ -9,20 +9,18 @@ module Text.Hakyll.Page
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import qualified Data.List as L
|
import qualified Data.List as L
|
||||||
import Data.Maybe (fromMaybe)
|
import Data.Maybe (fromMaybe)
|
||||||
|
|
||||||
import Control.Parallel.Strategies (rdeepseq, ($|))
|
import Control.Parallel.Strategies (rdeepseq, ($|))
|
||||||
import Control.Monad.Reader (liftIO)
|
import Control.Monad.Reader (liftIO)
|
||||||
|
|
||||||
import System.FilePath (takeExtension)
|
import System.FilePath (takeExtension)
|
||||||
import System.IO
|
import System.IO
|
||||||
|
|
||||||
|
import Text.Pandoc
|
||||||
|
|
||||||
import Text.Hakyll.Hakyll (Hakyll)
|
import Text.Hakyll.Hakyll (Hakyll)
|
||||||
import Text.Hakyll.File
|
import Text.Hakyll.File
|
||||||
import Text.Hakyll.Util (trim)
|
import Text.Hakyll.Util (trim)
|
||||||
import Text.Hakyll.Context (Context)
|
import Text.Hakyll.Context (Context)
|
||||||
import Text.Hakyll.Renderable
|
import Text.Hakyll.Renderable
|
||||||
import Text.Pandoc
|
|
||||||
|
|
||||||
|
|
||||||
-- | A Page is basically key-value mapping. Certain keys have special
|
-- | A Page is basically key-value mapping. Certain keys have special
|
||||||
-- meanings, like for example url, body and title.
|
-- meanings, like for example url, body and title.
|
||||||
|
|
|
@ -12,7 +12,6 @@ module Text.Hakyll.Render
|
||||||
|
|
||||||
import Control.Monad (unless)
|
import Control.Monad (unless)
|
||||||
import Control.Monad.Reader (liftIO)
|
import Control.Monad.Reader (liftIO)
|
||||||
|
|
||||||
import System.Directory (copyFile)
|
import System.Directory (copyFile)
|
||||||
|
|
||||||
import Text.Hakyll.Hakyll (Hakyll)
|
import Text.Hakyll.Hakyll (Hakyll)
|
||||||
|
@ -21,7 +20,6 @@ import Text.Hakyll.Page
|
||||||
import Text.Hakyll.Renderable
|
import Text.Hakyll.Renderable
|
||||||
import Text.Hakyll.File
|
import Text.Hakyll.File
|
||||||
import Text.Hakyll.CompressCSS
|
import Text.Hakyll.CompressCSS
|
||||||
|
|
||||||
import Text.Hakyll.Render.Internal
|
import Text.Hakyll.Render.Internal
|
||||||
|
|
||||||
-- | Execute an IO action only when the cache is invalid.
|
-- | Execute an IO action only when the cache is invalid.
|
||||||
|
|
|
@ -16,6 +16,7 @@ import Data.List (isPrefixOf, foldl')
|
||||||
import Data.Char (isAlpha)
|
import Data.Char (isAlpha)
|
||||||
import Data.Maybe (fromMaybe)
|
import Data.Maybe (fromMaybe)
|
||||||
import Control.Parallel.Strategies (rdeepseq, ($|))
|
import Control.Parallel.Strategies (rdeepseq, ($|))
|
||||||
|
|
||||||
import Text.Hakyll.Renderable
|
import Text.Hakyll.Renderable
|
||||||
import Text.Hakyll.Page
|
import Text.Hakyll.Page
|
||||||
import Text.Hakyll.File
|
import Text.Hakyll.File
|
||||||
|
|
|
@ -5,8 +5,9 @@ module Text.Hakyll.Renderables
|
||||||
, createPagePath
|
, createPagePath
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Text.Hakyll.Hakyll (Hakyll)
|
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
|
|
||||||
|
import Text.Hakyll.Hakyll (Hakyll)
|
||||||
import Text.Hakyll.Page
|
import Text.Hakyll.Page
|
||||||
import Text.Hakyll.Renderable
|
import Text.Hakyll.Renderable
|
||||||
import Text.Hakyll.File
|
import Text.Hakyll.File
|
||||||
|
|
|
@ -9,14 +9,14 @@ module Text.Hakyll.Tags
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import Data.List (intercalate)
|
import Data.List (intercalate)
|
||||||
import Control.Monad (foldM)
|
import Control.Monad (foldM)
|
||||||
import Text.Hakyll.Hakyll (Hakyll)
|
import Control.Arrow (second)
|
||||||
|
|
||||||
|
import Text.Hakyll.Hakyll (Hakyll)
|
||||||
import Text.Hakyll.Context (ContextManipulation, renderValue)
|
import Text.Hakyll.Context (ContextManipulation, renderValue)
|
||||||
import Text.Hakyll.Render.Internal (finalSubstitute)
|
import Text.Hakyll.Render.Internal (finalSubstitute)
|
||||||
import Text.Hakyll.Regex
|
import Text.Hakyll.Regex
|
||||||
import Text.Hakyll.Util
|
import Text.Hakyll.Util
|
||||||
import Text.Hakyll.Page
|
import Text.Hakyll.Page
|
||||||
import Control.Arrow (second)
|
|
||||||
|
|
||||||
-- | Read a tag map. This creates a map from tags to page paths. This function
|
-- | Read a tag map. This creates a map from tags to page paths. This function
|
||||||
-- assumes the tags are located in the @tags@ metadata field, separated by
|
-- assumes the tags are located in the @tags@ metadata field, separated by
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
|
import Data.Char
|
||||||
|
import qualified Data.Map as M
|
||||||
|
|
||||||
import Test.Framework (defaultMain, testGroup)
|
import Test.Framework (defaultMain, testGroup)
|
||||||
import Test.Framework.Providers.QuickCheck2
|
import Test.Framework.Providers.QuickCheck2
|
||||||
import Test.Framework.Providers.HUnit
|
import Test.Framework.Providers.HUnit
|
||||||
import Test.QuickCheck
|
import Test.QuickCheck
|
||||||
import Test.HUnit
|
import Test.HUnit
|
||||||
|
|
||||||
import Data.Char
|
|
||||||
import qualified Data.Map as M
|
|
||||||
|
|
||||||
import Text.Hakyll.CompressCSS
|
import Text.Hakyll.CompressCSS
|
||||||
import Text.Hakyll.Util
|
import Text.Hakyll.Util
|
||||||
import Text.Hakyll.Regex
|
import Text.Hakyll.Regex
|
||||||
|
|
Loading…
Reference in a new issue