From dfac0e11fe73f7f24ea41f4d83dedf6cd5b6b8f4 Mon Sep 17 00:00:00 2001
From: Orestis <orestis.malaspinas@pm.me>
Date: Sat, 19 Feb 2022 18:34:17 +0100
Subject: [PATCH] updated to use some kind of index
---
hakyll-bootstrap/Main.hs | 31 ++++++++++++++++++++++---------
hakyll-bootstrap/Makefile | 3 ++-
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/hakyll-bootstrap/Main.hs b/hakyll-bootstrap/Main.hs
index d5b15de..5c249b8 100644
--- a/hakyll-bootstrap/Main.hs
+++ b/hakyll-bootstrap/Main.hs
@@ -22,6 +22,8 @@ import Hakyll.Images ( loadImage
, scaleImageCompiler
)
import System.Exit (ExitCode)
+-- import Data.List (isPrefixOf, isSuffixOf)
+-- import System.FilePath (isAbsolute, normalise, takeFileName, makeRelative)
--------------------------------------------------------------------------------
-- | Entry point
@@ -52,8 +54,9 @@ main = hakyllWith config $ do
.||. "reveal.js/dist/**"
.||. "reveal.js/plugin/**"
.||. "cours/prog_seq/slides/figs/*"
- .||. "cours/algo/slides/figs/*"
+ -- .||. "cours/algo/slides/figs/*"
.||. "cours/math_tech_info/figs/*"
+ .||. "cours/algo/slides/*.pdf"
.||. "cours/math_tech_info/cours.pdf"
.||. "cours/isc_physics/cours.pdf"
.||. "cours/isc_physics/figs/*") $ do
@@ -125,18 +128,18 @@ main = hakyllWith config $ do
>>= relativizeUrls
- -- Algorithmique slides
- match "cours/algo/slides/*.markdown" $ do
- route $ setExtension "html"
- compile $ pandocRevealCompiler
- >>= loadAndApplyTemplate "templates/reveal.html" postCtx
- >>= relativizeUrls
+ -- -- Algorithmique slides
+ -- match "cours/algo/slides/*.markdown" $ do
+ -- route $ setExtension "html"
+ -- compile $ pandocRevealCompiler
+ -- >>= loadAndApplyTemplate "templates/reveal.html" postCtx
+ -- >>= relativizeUrls
-- Prog seq post list
create ["cours/algo.html"] $ do
route idRoute
compile $ do
- posts <- recentFirst =<< loadAll "cours/algo/slides/*.markdown"
+ posts <- recentFirst =<< loadAll "cours/algo/slides/index.md"
makeItem ""
>>= loadAndApplyTemplate "templates/archive.html" (pagesCtx posts "Algorithmique et structure de données")
>>= relativizeUrls
@@ -353,9 +356,19 @@ pandocRevealCompiler = do
--------------------------------------------------------------------------------
config :: Configuration
config = defaultConfiguration
- { deploySite = deploy
+ {
+ deploySite = deploy
+-- , ignoreFile = ignoreFile'
}
where
+ -- ignoreFile' path
+ -- | "." `isPrefixOf` fileName = False
+ -- | "#" `isPrefixOf` fileName = True
+ -- | "~" `isSuffixOf` fileName = True
+ -- | ".swp" `isSuffixOf` fileName = True
+ -- | otherwise = False
+ -- where
+ -- fileName = takeFileName path
deploy :: Configuration -> IO ExitCode
deploy _c = do
Process.rawSystem "rsync"
diff --git a/hakyll-bootstrap/Makefile b/hakyll-bootstrap/Makefile
index 5006000..b5f318d 100644
--- a/hakyll-bootstrap/Makefile
+++ b/hakyll-bootstrap/Makefile
@@ -10,7 +10,8 @@ build: update Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md
make -C cours/math_tech_info
make -C cours/isc_physics
make markdown -C cours/prog_seq/slides
- make markdown -C cours/algo/slides
+ # make markdown -C cours/algo/slides
+ make index -C cours/algo/slides
stack build --allow-different-user && stack exec --allow-different-user blog -- build
# cabal install && blog build
# stack build && stack exec blog -- build
--
GitLab