From c86ece1433da3e8a85d84233f236a7d3b7945534 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Thu, 22 Jun 2023 11:43:20 +0200 Subject: implement sourcing of timestamp files --- site.hs | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'site.hs') diff --git a/site.hs b/site.hs index d3b7f15..7989dff 100644 --- a/site.hs +++ b/site.hs @@ -4,7 +4,7 @@ module Main where import Control.Monad ((>=>), filterM, join, unless, when) -import Control.Monad.Extra (whenM) +import Control.Monad.Extra (ifM, whenM) import Control.Monad.Trans.State.Lazy import qualified Data.Aeson as AE import qualified Data.Aeson.Key as K @@ -27,10 +27,13 @@ import Lens.Micro import Lens.Micro.Aeson import Lens.Micro.Mtl import qualified Options.Applicative +import System.Directory (doesFileExist) import System.FilePath ( () , isAbsolute + , joinPath , splitDirectories + , splitFileName , splitPath , takeDirectory , takeFileName @@ -171,6 +174,24 @@ addGlobalMeta (Y.Object m) = do r <- fromString <$> use urlBase pure . Y.Object $ KM.insert "root" r m +-- | Get the expected timestamp file for a given filepath +timestampFile :: FilePath -> Site FilePath +timestampFile fp = do + sfx <- use timestampSuffix + pure . uncurry () . fmap (++ sfx) . splitFileName $ fp + +-- | If a timestamp file for the page exists, add the timestamp metadata. +addTimeMeta :: PageInfo -> Y.Value -> Site Y.Value +addTimeMeta pi m'@(Y.Object m) = do + tspath <- timestampFile $ pi ^. pagePath + io $ + ifM + (doesFileExist tspath) + (do putStrLn $ "timestamp <- " ++ tspath + ts <- Y.String <$> TIO.readFile tspath + pure . Y.Object $ KM.insert "timestamp" ts m) + (pure m') + -- | Add page-specific information to the metadata. In this instance, this just -- expands the tags for rendering. Eventually would be nice to have the timestamps -- and possibly other info sourced right here. @@ -182,7 +203,7 @@ addPageMeta pi (Y.Object m) = do _String . to T.unpack . to splitDirectories - pure . Y.Object $ KM.insert "htags" (Y.array htagMeta) m + addTimeMeta pi . Y.Object $ KM.insert "htags" (Y.array htagMeta) m -- | If viable for a page (by config), add the TOC field addTOC :: PageInfo -> Text.Pandoc.Definition.Pandoc -> Y.Value -> Site Y.Value @@ -358,7 +379,7 @@ listFilename tag = indexFilename $ "list" tag -- | Fold the hierarchical tag bits to a slashed path. tagPath :: [String] -> FilePath -tagPath = foldr () "" +tagPath = joinPath -- | Make a link to the tag page tagLink :: [String] -> Site FilePath @@ -366,11 +387,11 @@ tagLink = rootUrl . ("tag" ) . tagPath -- | Fold the hierarchical tag bits to a slashed path. listPath :: [String] -> FilePath -listPath = foldr () "" +listPath = joinPath -- | Make a link to the tag page listLink :: [String] -> Site FilePath -listLink = rootUrl . ("list" ) . tagPath +listLink = rootUrl . ("list" ) . listPath -- | Make metadata for printing out a single hierarchical tag (all levels clickable) makeHTagMeta :: ([String] -> Site FilePath) -> [String] -> Site Y.Value -- cgit v1.2.3 From fa7d1fab5550822b1f4cad753f122515a818a600 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Thu, 22 Jun 2023 11:34:00 +0200 Subject: avoid overwriting timestamps if they are forced by markdown already --- Types.hs | 3 ++- cards/404.md | 2 ++ cards/index.md | 1 + cards/search.md | 1 + site.hs | 20 +++++++++++--------- 5 files changed, 17 insertions(+), 10 deletions(-) (limited to 'site.hs') diff --git a/Types.hs b/Types.hs index 455a4f4..7f09b05 100644 --- a/Types.hs +++ b/Types.hs @@ -132,7 +132,8 @@ siteOptions' = do _timestampSuffix <- strOption $ long "timestamp-prefix" <> - help "Timestamp file suffix for markdowns" <> value ".timestamp" <> showDefault + help "Timestamp file suffix for markdowns" <> + value ".timestamp" <> showDefault _dumpFinalState <- switch $ long "dump-state" <> diff --git a/cards/404.md b/cards/404.md index 60148b7..a0e09ea 100644 --- a/cards/404.md +++ b/cards/404.md @@ -2,6 +2,8 @@ mount: /404 title: Page not found search: off +toc: off +timestamp: null --- # Page not found! diff --git a/cards/index.md b/cards/index.md index b493711..fb19e6e 100644 --- a/cards/index.md +++ b/cards/index.md @@ -3,6 +3,7 @@ mount: / title: Home template: index.html toc: off +timestamp: null --- #### What are How-To Cards? diff --git a/cards/search.md b/cards/search.md index cefd3eb..42713f0 100644 --- a/cards/search.md +++ b/cards/search.md @@ -4,6 +4,7 @@ title: Search template: search.html search: off toc: off +timestamp: null --- # Search diff --git a/site.hs b/site.hs index 7989dff..d60486e 100644 --- a/site.hs +++ b/site.hs @@ -182,15 +182,17 @@ timestampFile fp = do -- | If a timestamp file for the page exists, add the timestamp metadata. addTimeMeta :: PageInfo -> Y.Value -> Site Y.Value -addTimeMeta pi m'@(Y.Object m) = do - tspath <- timestampFile $ pi ^. pagePath - io $ - ifM - (doesFileExist tspath) - (do putStrLn $ "timestamp <- " ++ tspath - ts <- Y.String <$> TIO.readFile tspath - pure . Y.Object $ KM.insert "timestamp" ts m) - (pure m') +addTimeMeta pi m'@(Y.Object m) + | "timestamp" `KM.member` m = pure m' -- do not overwrite the timestamp if present + | otherwise = do + tspath <- timestampFile $ pi ^. pagePath + io $ + ifM + (doesFileExist tspath) + (do putStrLn $ "timestamp <- " ++ tspath + ts <- Y.String <$> TIO.readFile tspath + pure . Y.Object $ KM.insert "timestamp" ts m) + (pure m') -- | Add page-specific information to the metadata. In this instance, this just -- expands the tags for rendering. Eventually would be nice to have the timestamps -- cgit v1.2.3