f9872ba · hakyll · git.iko.soy

git.iko.soy/hakyll

Allow empty template, fix some import warnings

Closes #355

commitf9872ba1bb06e2af30639a8cadc26004afcd5ca3 authorJasper Van der Jeugt <m@jaspervdj.be> dateTue 30 Jun 2015, 11:51 (11 years ago) parent43c4e2a

4 files changed+6−5

compare with master

unifiedsplit

src/Hakyll/Core/Item.hs+1−1 src/Hakyll/Preview/Poll.hs+2−1 src/Hakyll/Web/Template/Context.hs+2−2 src/Hakyll/Web/Template/Internal.hs+1−1

src/Hakyll/Core/Item.hs+1−1

@@ -10,7 +10,7 @@ module Hakyll.Core.Item

1010

1111

1212--------------------------------------------------------------------------------

13−import Control.Applicative (Applicative, (<$>), (<*>))

13+import Control.Applicative ((<$>), (<*>))

1414import Data.Binary (Binary (..))

1515import Data.Foldable (Foldable (..))

1616import Data.Traversable (Traversable (..))

src/Hakyll/Preview/Poll.hs+2−1

@@ -14,7 +14,7 @@ import Control.Exception (AsyncException, fromException,

1414import Control.Monad (forever, void, when)

1515import Filesystem.Path.CurrentOS (decodeString, encodeString)

1616import System.Directory (canonicalizePath)

17−import System.FilePath (pathSeparators, (</>))

17+import System.FilePath (pathSeparators)

1818import System.FSNotify (Event (..), startManager,

1919 watchTree)

2020

@@ -23,6 +23,7 @@ import Control.Concurrent (threadDelay)

2323import Control.Exception (IOException, throw, try)

2424import System.Directory (doesFileExist)

2525import System.Exit (exitFailure)

26+import System.FilePath ((</>))

2627import System.IO (Handle, IOMode (ReadMode),

2728 hClose, openFile)

2829import System.IO.Error (isPermissionError)

src/Hakyll/Web/Template/Context.hs+2−2

@@ -36,7 +36,7 @@ import qualified Data.Map as M

3636import Data.Monoid (Monoid (..))

3737import Data.Time.Clock (UTCTime (..))

3838import Data.Time.Format (TimeLocale, defaultTimeLocale,

39− formatTime, parseTime)

39+ formatTime, parseTimeM)

4040import System.FilePath (splitDirectories, takeBaseName)

4141

4242

@@ -282,7 +282,7 @@ getItemUTC locale id' = do

282282 where

283283 empty' = fail $ "Hakyll.Web.Template.Context.getItemUTC: " ++

284284 "could not parse time for " ++ show id'

285− parseTime' = parseTime locale

285+ parseTime' = parseTimeM True locale

286286 formats =

287287 [ "%a, %d %b %Y %H:%M:%S %Z"

288288 , "%Y-%m-%dT%H:%M:%S%Z"

src/Hakyll/Web/Template/Internal.hs+1−1

@@ -128,7 +128,7 @@ readTemplate input = case P.parse template "" input of

128128--------------------------------------------------------------------------------

129129template :: P.Parser Template

130130template = Template <$>

132132

133133

134134--------------------------------------------------------------------------------