23 files changed, 234 insertions, 113 deletions

diff --git a/.gitignore b/.gitignore
index c4a847d..f36f933 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /result
+/_cache/
+/_site/
diff --git a/blog.cabal b/blog.cabal
index b8daa19..c014a21 100644
--- a/blog.cabal
+++ b/blog.cabal
@@ -17,7 +17,12 @@ build-type:          Simple
 cabal-version:       >=1.10
 
 executable site
+  default-language:    Haskell2010
   hs-source-dirs:      src
   main-is:             Site.hs
   build-depends:       base >=4.7 && <4.8
                      , hakyll >=4.6 && <5
+                     , containers >=0.5 && <0.6
+                     , pandoc >=1.13 && <2
+                     , data-default >=0.5 && <0.6
+                     , filepath >=1.3 && <2
diff --git a/blog.nix b/blog.nix
index 52e23ca..a4c5d8c 100644
--- a/blog.nix
+++ b/blog.nix
@@ -1,7 +1,7 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { mkDerivation, stdenv
-, hakyll
+, hakyll, containers, pandoc, data-default, filepath
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
   isExecutable = true;
   isLibrary = false;
   buildDepends = [
-    hakyll
+    hakyll containers pandoc data-default filepath
   ];
   license = stdenv.lib.licenses.publicDomain;
 }
diff --git a/lists/default.md.do b/lists/default.md.do
deleted file mode 100644
index 55abe6f..0000000
--- a/lists/default.md.do
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-redo-ifchange "$2/title"
-
-POSTS=()
-while read -r -d $'\0'; do
-    post=$(realpath --relative-to=. "$REPLY")
-    POSTS+=("$post")
-done < <(find "$2" -maxdepth 1 -mindepth 1 -not -name 'title' -not -name 'preview' -print0 | sort -z)
-
-for x in "${POSTS[@]}"; do
-    printf "%s\0%s\0" "$x" "${x%.md}.html"
-done | xargs -r -0 redo-ifchange
-
-TITLE=$(< $2/title)
-
-cat <<EOF
-% $(< "$2/title")
-
-EOF
-
-POST_TITLES=()
-for x in "${POSTS[@]}"; do
-    title=$(pandoc -t json "$x" | ../build/extract-title.hs)
-    POST_TITLES+=("$title")
-done
-
-for n in $(seq 0 $((${#POSTS[@]}-1))); do
-    printf "* [%s](%s)\n" "${POST_TITLES[$n]}" "${POSTS[$n]%.md}.html"
-done
-
->"$2/preview"
-prev_no=3
-if [[ ${#POSTS[@]} -gt $prev_no ]]; then
-    printf "* …\n" >> "$2/preview"
-else
-    prev_no=${#POSTS[@]}
-fi
-
-for n in $(seq $prev_no -1 1); do
-    printf "* [%s](%s)\n" "${POST_TITLES[-$n]}" "${POSTS[-$n]%.md}.html" >>"$2/preview"
-done
diff --git a/lists/dirty-haskell/001 b/lists/dirty-haskell/001
deleted file mode 120000
index 92c240d..0000000
--- a/lists/dirty-haskell/001
+++ /dev/null
@@ -1 +0,0 @@
-../../posts/blog-documentation.md
\ No newline at end of file
diff --git a/lists/dirty-haskell/002 b/lists/dirty-haskell/002
deleted file mode 120000
index ed24126..0000000
--- a/lists/dirty-haskell/002
+++ /dev/null
@@ -1 +0,0 @@
-../../posts/blog-rss.md
\ No newline at end of file
diff --git a/lists/dirty-haskell/title b/lists/dirty-haskell/title
deleted file mode 100644
index e40f49c..0000000
--- a/lists/dirty-haskell/title
+++ /dev/null
@@ -1 +0,0 @@
-Blog Software
diff --git a/lists/zz_all/001 b/lists/zz_all/001
deleted file mode 120000
index 92c240d..0000000
--- a/lists/zz_all/001
+++ /dev/null
@@ -1 +0,0 @@
-../../posts/blog-documentation.md
\ No newline at end of file
diff --git a/lists/zz_all/002 b/lists/zz_all/002
deleted file mode 120000
index ed24126..0000000
--- a/lists/zz_all/002
+++ /dev/null
@@ -1 +0,0 @@
-../../posts/blog-rss.md
\ No newline at end of file
diff --git a/lists/zz_all/003 b/lists/zz_all/003
deleted file mode 120000
index 1057f2c..0000000
--- a/lists/zz_all/003
+++ /dev/null
@@ -1 +0,0 @@
-../../posts/pwutil.md
\ No newline at end of file
diff --git a/lists/zz_all/title b/lists/zz_all/title
deleted file mode 100644
index 73a5267..0000000
--- a/lists/zz_all/title
+++ /dev/null
@@ -1 +0,0 @@
-All Posts
diff --git a/provider/css/default.css b/provider/css/default.css
new file mode 100644
index 0000000..7b89107
--- /dev/null
+++ b/provider/css/default.css
@@ -0,0 +1,40 @@
+body {
+    margin: auto;
+    padding-right: 1em;
+    padding-left: 1em;
+    font: normal 1.1em monospace;
+    max-width: 60em;
+    text-align: justify;
+}
+
+.display-math {
+    display: block;
+    margin-top: 0.2em;
+    margin-bottm: 0.2em;
+    text-align: center;
+}
+
+.inline-math {
+    display: inline;
+}
+
+a {
+    color: inherit;
+}
+
+p {
+    margin-bottom: 0
+}
+
+p + p {
+    text-indent: 1.5em;
+    margin-top: 0;
+}
+
+pre {
+    margin-left: 1.5em;
+}
+
+p code {
+                font-style:italic;
+}
\ No newline at end of file
diff --git a/provider/index.html b/provider/index.html
new file mode 100644
index 0000000..8eb184f
--- /dev/null
+++ b/provider/index.html
@@ -0,0 +1,8 @@
+$body$
+<ul>
+  $for(tags)$
+  <li>
+    $body$
+  </li>
+  $endfor$
+</ul>
diff --git a/provider/index.md b/provider/index.md
new file mode 100644
index 0000000..53a06bc
--- /dev/null
+++ b/provider/index.md
@@ -0,0 +1,3 @@
+This is a blog.
+It contains things.
+Send other things to <blog@dirty-haskell.org> if you so choose.
diff --git a/posts/blog-documentation.md b/provider/posts/blog-documentation.md
index 7db843d..b0d4af6 100644
--- a/posts/blog-documentation.md
+++ b/provider/posts/blog-documentation.md
@@ -1,5 +1,9 @@
-% On the Origin of dirty-haskell.org
+---
+title: On the Origin of dirty-haskell.org
+published: 2015-03-12
+tags: Blog Software
+---
 
 The software used is a trivially modified version of the one powering [math.kleen.org](http://math.kleen.org/lists/blog.html).
 
-The title is without deeper meaning.
\ No newline at end of file
+The title is without deeper meaning.
diff --git a/posts/blog-rss.md b/provider/posts/blog-rss.md
index 4e8cb24..095ff56 100644
--- a/posts/blog-rss.md
+++ b/provider/posts/blog-rss.md
@@ -1,4 +1,8 @@
-% dirty-haskell.org´s rss feeds
+---
+title: dirty-haskell.org´s rss feeds
+published: 2015-03-29
+tags: Blog Software
+---
 
 I extended the software suite inherited from [math.kleen.org](http://math.kleen.org) to include support for rss feeds.
 The heart of the issue is a ~80 line haskell script I chose to call, in a bout of creativity, "generate-rss.hs".
diff --git a/posts/pwutil.md b/provider/posts/pwutil.md
index 176ffdc..a4b3757 100644
--- a/posts/pwutil.md
+++ b/provider/posts/pwutil.md
@@ -1,4 +1,7 @@
-% A Tool to Manage a Set of YAML Objects Representing Account Information — pwutil
+---
+title: A Tool to Manage a Set of YAML Objects Representing Account Information — pwutil
+published: 2015-04-07
+---
 
 A long time ago I wrote a bunch of scripts (first in bash, then zsh, and later perl) to manage a, sometimes encrypted, file containing account information I get asked to create and remember on a daily basis—accounts for shopping websites spring to mind.
 
diff --git a/provider/templates/default.html b/provider/templates/default.html
new file mode 100644
index 0000000..14497b2
--- /dev/null
+++ b/provider/templates/default.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html$if(lang)$ lang="$lang$"$endif$>
+<head>
+  <meta charset="utf-8">
+  <meta name="generator" content="pandoc">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+  <title>$if(title)$$title$$endif$</title>
+  <style type="text/css">code{white-space: pre;}</style>
+  <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+  <link rel="stylesheet" href="/css/default.css">
+</head>
+<body>
+$if(title)$
+<header>
+  <h1 class="title"><a href="/" title="dirty-haskell.org">dirty-haskell.org</a>: $title$</h1>
+</header>
+$endif$
+$body$
+</body>
+</html>
diff --git a/provider/templates/index.html b/provider/templates/index.html
new file mode 100644
index 0000000..0eea806
--- /dev/null
+++ b/provider/templates/index.html
@@ -0,0 +1,9 @@
+$body$
+
+<ul>
+  $for(tags)$
+  <li>
+    $body$
+  </li>
+  $endfor$
+</ul>
diff --git a/provider/templates/post-list.html b/provider/templates/post-list.html
new file mode 100644
index 0000000..4d50d4d
--- /dev/null
+++ b/provider/templates/post-list.html
@@ -0,0 +1,7 @@
+<ul>
+  $for(posts)$
+  <li>
+    $if(ellipsis)$…$else$<a href="$url$">$title$</a>$endif$
+  </li>
+  $endfor$
+</ul>
diff --git a/provider/templates/tag.html b/provider/templates/tag.html
new file mode 100644
index 0000000..8854cdd
--- /dev/null
+++ b/provider/templates/tag.html
@@ -0,0 +1,2 @@
+<a href="$url$">$title$</a>$if(rss)$ (<a href="$rss$">RSS</a>)$endif$
+$body$
diff --git a/src/Site.hs b/src/Site.hs
index d1afbce..dde7047 100644
--- a/src/Site.hs
+++ b/src/Site.hs
@@ -1,16 +1,131 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, RankNTypes, StandaloneDeriving, FlexibleInstances #-}
 
 import Hakyll
 
+import Data.Monoid (Monoid(..), mconcat, (<>))
+import Control.Monad (liftM)
+import Data.Char (toLower, isSpace, isAlphaNum)
+import Data.Maybe (mapMaybe, fromMaybe)
+import Data.Map (Map)
+import qualified Data.Map as Map
+import Data.List (take, reverse)
+import Data.Default
+import Text.Pandoc.Options (WriterOptions(..), ObfuscationMethod(..))
+import Control.Applicative (Alternative(..), Applicative(..))
+
+import System.FilePath (replaceExtension)
+
 main :: IO ()
 main = hakyllWith config $ do
-  match "/posts/*" $ do
+  match "templates/*" $ compile templateCompiler
+
+  match "css/*" $ do
+    route idRoute
+    compile copyFileCompiler
+
+  match "posts/*" $ do
     route $ setExtension ".html"
     compile $ do
+      getResourceBody >>= saveSnapshot "content"
       pandocCompiler
-        >>= saveSnapshot "content"
         >>= loadAndApplyTemplate "templates/default.html" defaultContext
         >>= relativizeUrls
 
+  tags <- buildTags "posts/*" tagTranslation' >>= addTag "All Posts" "posts/*"
+
+  tagsRules tags $ \tag pattern -> do
+    route idRoute
+    compile $ do
+      let ctx = mconcat [ constField "title" tag
+                        , listField "posts" defaultContext $ chronological =<< loadAll pattern
+                        , defaultContext
+                        ]
+      makeItem ""
+        >>= loadAndApplyTemplate "templates/post-list.html" ctx
+        >>= loadAndApplyTemplate "templates/default.html" ctx
+        >>= relativizeUrls
+
+  let
+    tags' = tags { tagsMakeId = fromFilePath . (`replaceExtension` "rss") . toFilePath . tagsMakeId tags}
+
+  tagsRules tags' $ \tag pattern -> do
+    route idRoute
+    compile $ do
+      let
+        feedCtx = mconcat [ bodyField "description"
+                          , defaultContext
+                          ]
+      renderRss (feedConfig tag) feedCtx =<< loadAllSnapshots pattern "content"
+
+  match "index.md" $ do
+    route $ setExtension ".html"
+    compile $ do
+      let ctx = mconcat [ listField "tags" defaultContext $ mapM (\(k, _) -> renderTag k tags) $ tagsMap tags
+                        , constField "title" "Index"
+                        , defaultContext
+                        ]
+      item <- getResourceBody
+      pandocCompilerWith def (def { writerEmailObfuscation = NoObfuscation })
+        >>= loadAndApplyTemplate "templates/index.html" ctx
+        >>= loadAndApplyTemplate "templates/default.html" ctx
+        >>= relativizeUrls
+
+deriving instance Eq (Item String)
+
+feedConfig :: String -> FeedConfiguration
+feedConfig tagName = FeedConfiguration { feedTitle = "dirty-haskell.org: " ++ tagName
+                                       , feedDescription = "dirty-haskell.org — A Blog."
+                                       , feedAuthorName = "G. Kleen"
+                                       , feedAuthorEmail = "blog@dirty-haskell.org"
+                                       , feedRoot = "https://dirty-haskell.org"
+                                       }
+
+renderTag :: String -- ^ Tag name
+          -> Tags
+          -> Compiler (Item String)
+renderTag tag tags = do
+  ellipsisItem <- makeItem ""
+  let
+    ids = fromMaybe [] $ lookup tag $ tagsMap tags
+    postCtx = mconcat [ listField "posts" (ellipsisContext ellipsisItem) $ liftM (withEllipsis ellipsisItem) $ chronological =<< mapM load ids
+                      , constField "title" tag
+                      , constField "rss" ("tags/" ++ tagTranslation tag ++ ".rss")
+                      , constField "url" ("tags/" ++ tagTranslation tag ++ ".html")
+                      , defaultContext
+                      ]
+  makeItem ""
+    >>= loadAndApplyTemplate "templates/post-list.html" postCtx
+    >>= loadAndApplyTemplate "templates/tag.html" postCtx
+  where
+    ellipsisContext item = mconcat [ boolField "ellipsis" (== item)
+                                   , defaultContext
+                                   ]
+    boolField name f = field name (\i -> if f i
+                                         then pure (error $ unwords ["no string value for bool field:",name])
+                                         else empty)
+    withEllipsis ellipsisItem xs
+      | length xs > max = [ellipsisItem] ++ takeEnd (max - 1) xs
+      | otherwise = xs
+    takeEnd i = reverse . take i . reverse
+    max = 4
+
+tagTranslation' :: String -> Identifier
+tagTranslation' = fromCapture "tags/*.html" . tagTranslation
+
+tagTranslation :: String -> String
+tagTranslation = mapMaybe charTrans
+  where
+    charTrans c
+      | isSpace c = Just $ '-'
+      | isAlphaNum c = Just $ toLower c
+      | otherwise = Nothing
+
+addTag :: MonadMetadata m => String -> Pattern -> Tags -> m Tags
+addTag name pattern tags = do
+  ids <- getMatches pattern
+  return $ tags { tagsMap = tagsMap tags ++ [(name, ids)] }
+
 config :: Configuration
-config = defaultConfiguration
+config = defaultConfiguration { providerDirectory = "provider"
+                              , deployCommand = "rsync -av --progress -c --delete-delay -m  _site/ gkleen@surtr.yggdrasil.li:/var/www/dirty-haskell.org/"
+                              }
diff --git a/templates/default.html b/templates/default.html
deleted file mode 100644
index 970848f..0000000
--- a/templates/default.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html$if(lang)$ lang="$lang$"$endif$>
-<head>
-  <meta charset="utf-8">
-  <meta name="generator" content="pandoc">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-$for(author-meta)$
-  <meta name="author" content="$author-meta$">
-$endfor$
-$if(date-meta)$
-  <meta name="dcterms.date" content="$date-meta$">
-$endif$
-  <title>$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$</title>
-  <style type="text/css">code{white-space: pre;}</style>
-  <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-$if(quotes)$
-  <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
-$endif$
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
-$for(css)$
-  <link rel="stylesheet" href="$css$">
-$endfor$
-$if(math)$
-  $math$
-$endif$
-$for(header-includes)$
-  $header-includes$
-$endfor$
-</head>
-<body>
-$for(include-before)$
-$include-before$
-$endfor$
-$if(title)$
-<header>
-  <h1 class="title"><a href="/" title="dirty-haskell.org">dirty-haskell.org</a>: $title$</h1>
-</header>
-$endif$
-$if(toc)$
-<nav id="$idprefix$TOC">
-$toc$
-</nav>
-$endif$
-$body$
-$for(include-after)$
-$include-after$
-$endfor$
-</body>
-</html>