ea1bb41 · hakyll · git.iko.soy

on master help sign in

Readability improvements.

ea1bb41Jasper Van der Jeugt17 years ago

src/Text/Hakyll/Context.hs+8−7

@@ -59,13 +59,14 @@ renderDate :: String -- ^ Key in which the rendered date should be placed.

59renderDate key format defaultValue context = M.insert key value context

60 where

61 value = fromMaybe defaultValue pretty

62+ pretty = do

62− pretty = do filePath <- M.lookup "path" context

63+ filePath <- M.lookup "path" context

63− let dateString = substituteRegex "^([0-9]*-[0-9]*-[0-9]*).*" "\\1"

64+ let dateString = substituteRegex "^([0-9]*-[0-9]*-[0-9]*).*" "\\1"

64− (takeFileName filePath)

65+ (takeFileName filePath)

65− time <- parseTime defaultTimeLocale

66+ time <- parseTime defaultTimeLocale

66− "%Y-%m-%d"

67+ "%Y-%m-%d"

67− dateString :: Maybe UTCTime

68+ dateString :: Maybe UTCTime

68− return $ formatTime defaultTimeLocale format time

69+ return $ formatTime defaultTimeLocale format time

70-- | Change the extension of a file. This is only needed when you want to

71-- | Change the extension of a file. This is only needed when you want to

71-- render, for example, mardown to @.php@ files instead of @.html@ files.

72-- render, for example, mardown to @.php@ files instead of @.html@ files.

src/Text/Hakyll/Regex.hs+2−1

@@ -41,7 +41,8 @@ subRegex regexp inp replacement =

41 in case matchRegexAll regexp inp of

42 Nothing -> inp

43 Just (lead, match', trail, groups) ->

44− lead ++ lookup' match' replacement groups ++ subRegex regexp trail replacement

44+ lead ++ lookup' match' replacement groups

45+ ++ subRegex regexp trail replacement

46-- | Splits a string based on a regular expression. The regular expression

47-- | Splits a string based on a regular expression. The regular expression

47-- should identify one delimiter.

48-- should identify one delimiter.