Improved metadata generation, added ATOM feeds

10 files changed, 187 insertions, 109 deletions

diff --git a/content/blog/index.md b/content/blog/index.md
index 576a8c3..1053dc2 100644
--- a/content/blog/index.md
+++ b/content/blog/index.md
@@ -1,5 +1,7 @@
 ---
 title: Blog
+
+create_feed: true
 ---
 
 # Blog
diff --git a/metadata/categories.json b/metadata/categories.json
deleted file mode 100644
index b0c5f84..0000000
--- a/metadata/categories.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tes": "Testing",
-    "per": "Personal"
-}
diff --git a/metadata/metadata.yaml b/metadata/metadata.yaml
index d2d4b1f..00a8571 100644
--- a/metadata/metadata.yaml
+++ b/metadata/metadata.yaml
@@ -10,3 +10,8 @@ menus:
     - id: blog
       label: Blog
       url: /blog/
+
+categories:
+  blog:
+    tes: Testing
+    per: Personal
diff --git a/scripts/build_content.sh b/scripts/build_content.sh
index b258449..e2b3bb3 100755
--- a/scripts/build_content.sh
+++ b/scripts/build_content.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
+SITE="https://volpeon.ink/"
+
 CONTENT_DIR="content/"
 FILTERS_DIR="filters/"
 METADATA_DIR="metadata/"
 TEMPLATES_DIR="templates/"
 OUTPUT_DIR="output/"
 
-CATEGORY_MAP=$(cat "$METADATA_DIR/categories.json")
-
 get_filters() {
     filters_args=""
 
@@ -37,16 +37,22 @@ target_filename() {
 target_url_rel() {
     basedir=$1
     filename=$2
+    ext=$3
     filename=$(realpath --relative-to="$basedir" "$filename")
-    filename="${filename%.md}.html"
-    if [ "${filename##*/}" = "index.html" ]; then
-        filename=${filename%index.html}
-    fi
+    filename="${filename%.md}.$ext"
+    filename=${filename%index.html}
     echo "$filename"
 }
 
 target_url_abs() {
-    echo "/$(target_url_rel "$CONTENT_DIR" "$1")"
+    echo "/$(target_url_rel "$CONTENT_DIR" "$1" "$2")"
+}
+
+metadata() {
+    pandoc "$1" \
+        -f markdown \
+        -t plain \
+        --template scripts/metadata_tpl.json
 }
 
 get_section() {
@@ -65,7 +71,7 @@ get_subpages_basedir() {
     echo "$filename"
 }
 
-get_metadata() {
+get_subpages_meta() {
     basedir=$(get_subpages_basedir "$1")
     child_pages=()
 
@@ -86,42 +92,44 @@ get_metadata() {
         child_pages=("${child_pages_1[@]}" "${child_pages_2[@]}")
     fi
 
+    pages=$(echo "{}" | jq ". + { \
+        all: [], \
+        by_year: {} \
+    }")
+
     if [ ${#child_pages[@]} -ne 0 ]; then
         #echo -e "\033[0;90m[////////]\033[0m Child pages:"
 
-        pages=$(echo "{}" | jq ". + { \
-            all: [], \
-            by_year: {} \
-        }")
-
-        categories="{}"
-
         for file in "${child_pages[@]}"; do
             #echo -e "\033[0;90m[////////]\033[0m   -  $file"
 
-            url_rel=$(target_url_rel "$basedir" "$file")
-            url_abs=$(target_url_abs "$file")
+            metadata=$(metadata "$file")
 
-            metadata=$(pandoc "$file" \
-                -f markdown \
-                -t plain \
-                --template scripts/metadata_tpl.json)
+            url_rel=$(target_url_rel "$basedir" "$file" "html")
+            url_abs=$(target_url_abs "$file" "html")
+            url_full="${SITE%/}$url_abs"
 
             date=$(echo "$metadata" | jq -r .date)
-            category=$(echo "$metadata" | jq -r .category)
-            category_name=$(echo "$CATEGORY_MAP" | jq -r .$category)
+            date_rfc3339=""
 
-            metadata=$(echo "$metadata" | jq ". + { \
-                url_rel: \"$url_rel\", \
-                url_abs: \"$url_abs\" \
+            if [ "$date" != "" ]; then
+                date_rfc3339=$(date -d "$date" --rfc-3339=seconds | sed 's/ /T/')
+            fi
+
+            metadata=$(echo "$metadata" | jq ". * { \
+                date: { \
+                    yyyy_mm_dd: \"$date\", \
+                    rfc3339: \"$date_rfc3339\" \
+                }, \
+                url: { \
+                    rel: \"$url_rel\", \
+                    abs: \"$url_abs\", \
+                    full: \"$url_full\" \
+                } \
             }")
 
             pages=$(echo "$pages" | jq ".all += [ $metadata ]")
 
-            if [ "$category" != "" ]; then
-                categories=$(echo "$categories" | jq ". + { $category: \"$category_name\" }")
-            fi
-
             if [ "$date" != "" ]; then
                 date_year=$(date -d "$date" +%Y)
                 #date_month=$(date -d "$date" +%m)
@@ -135,58 +143,101 @@ get_metadata() {
             | jq ".all |= (sort_by(.date) | reverse) \
                 | .by_year |= (to_entries | sort_by(.key) | reverse \
                     | .[].value |= (sort_by(.date) | reverse))")
-
-        categories=$(echo "$categories" | jq ". | to_entries | sort_by(.key)")
-
-        echo "{}" | jq ". + { \
-            pages: $pages, \
-            categories: $categories \
-        }"
     fi
+
+    echo "{}" | jq ". + { \
+        pages: $pages \
+    }"
 }
 
 handle () {
-    target=$(target_filename "$1")
+    target_file=$(target_filename "$1")
 
-    mkdir -p $(dirname "$target")
+    mkdir -p $(dirname "$target_file")
 
     if [ "${1#*.}" = "md" ]; then
-        echo -e "\033[0;32m[COMPILE ]\033[0m $1 -> $target"
+        echo -e "\033[0;32m[COMPILE ]\033[0m $1 -> $target_file"
+
+        meta_file=$(mktemp)
+
+        metadata=$(metadata "$file")
+        metadata=$(echo "[ \
+            $metadata, \
+            $(get_subpages_meta "$1") \
+        ]" | jq ".[0] * .[1]")
+
+        url_abs=$(target_url_abs "$1" "html")
+        url_full="${SITE%/}$url_abs"
 
-        is_home=false
         section=$(get_section "$1")
 
-        if [ "$target" = "${OUTPUT_DIR}index.html" ]; then
+        is_home=false
+        if [ "$target_file" = "${OUTPUT_DIR}index.html" ]; then
             is_home=true
         fi
 
-        subpages_meta_file=$(mktemp)
+        metadata=$(echo "$metadata" | jq ". * { \
+            url: { \
+                abs: \"$url_abs\", \
+                full: \"$url_full\" \
+            }, \
+            section: { \
+                id: \"$section\", \
+                is_$section: true \
+            }, \
+            is_home: $is_home \
+        }")
 
-        # echo "$(get_metadata "$1")"
-        echo "$(get_metadata "$1")" > "$subpages_meta_file"
+        create_feed=$(echo "$metadata" | jq -r ".create_feed")
+
+        if [ "$create_feed" = "true" ]; then
+            feed_target_file="${target_file%.html}.xml"
+            feed_url_abs="$(target_url_abs "$1" "xml")"
+            feed_url_full="${SITE%/}$feed_url_abs"
+            last_update=$(echo "$metadata" | jq -r ".pages.all[0].date")
+
+            metadata=$(echo "$metadata" | jq ". * { \
+                feed: { \
+                    last_update: $last_update, \
+                    url: { \
+                        abs: \"$feed_url_abs\", \
+                        full: \"$feed_url_full\" \
+                    } \
+                } \
+            }")
 
-        # echo $(pandoc "$1" \
-        #     -f markdown \
-        #     -t json)
+            echo "$metadata" > "$meta_file"
+            
+            pandoc "$1" \
+                -f markdown \
+                -t html5 \
+                --template "${TEMPLATES_DIR}feed.xml" \
+                -o "$feed_target_file" \
+                --metadata-file metadata/metadata.yaml \
+                --metadata-file "$meta_file" \
+                $FILTERS
+        fi
+
+        echo "$metadata" > "$meta_file"
 
         pandoc "$1" \
             -f markdown \
             -t html5 \
             --template "${TEMPLATES_DIR}base.html" \
-            -o "$target" \
-            --metadata "ishome"=$is_home \
-            --metadata section=$section \
-            --metadata "is$section" \
+            -o "$target_file" \
             --metadata-file metadata/metadata.yaml \
-            --metadata-file "$subpages_meta_file" \
+            --metadata-file "$meta_file" \
             $FILTERS
-            # --lua-filter "filters/add_refs.lua"
 
-        rm "$subpages_meta_file"
+        rm "$meta_file"
+
+        # echo $(pandoc "$1" \
+        #     -f markdown \
+        #     -t json)
     else
-        echo -e "\033[0;32m[COPY    ]\033[0m $1 -> $target"
+        echo -e "\033[0;32m[COPY    ]\033[0m $1 -> $target_file"
 
-        cp "$1" "$target"
+        cp "$1" "$target_file"
     fi
 }
 
@@ -215,9 +266,9 @@ elif [ "$1" = "delete" ]; then
     if [ -z "$2" ]; then
         echo -e "\033[0;31m[ERROR   ]\033[0m \"delete\" operation requires file argument"
     else
-        TARGET=$(target_filename "$2")
-        echo -e "\033[0;32m[DELETE  ]\033[0m $2 -> $TARGET"
-        rm -rf $TARGET
+        target_file=$(target_filename "$2")
+        echo -e "\033[0;32m[DELETE  ]\033[0m $2 -> $target_file"
+        rm -rf $target_file
     fi
 else
     echo -e "\033[0;31m[ERROR   ]\033[0m Unknown operation: \"$1\""
diff --git a/scripts/metadata_tpl.json b/scripts/metadata_tpl.json
index 76e4439..79eabe1 100755
--- a/scripts/metadata_tpl.json
+++ b/scripts/metadata_tpl.json
@@ -1,5 +1,6 @@
 {
     "title": "$title$",
     "date": "$date$",
-    "category": "$category$"
+    "category": "$category$",
+    "create_feed": "$create_feed$"
 }
diff --git a/templates/base.html b/templates/base.html
index 3fca9f1..0704388 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,24 +7,27 @@
     <meta name="robots" content="noindex" />
     <link rel="shortcut icon" href="/favicon.ico" />
     $for(author-meta)$
-    <meta name="author" content="$author-meta$" />
+        <meta name="author" content="$author-meta$" />
     $endfor$
     $if(date-meta)$
-    <meta name="dcterms.date" content="$date-meta$" />
+        <meta name="dcterms.date" content="$date-meta$" />
     $endif$
     $if(keywords)$
-    <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
+        <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
     $endif$
-    <title>$if(ishome)$$else$$title$ – $endif$$site.title$</title>
+    $if(feed.url.abs)$
+        <link href="$feed.url.abs$" type="application/atom+xml" rel="alternate" title="$if(is_home)$$else$$title$ – $endif$$site.title$" />
+    $endif$
+    <title>$if(is_home)$$else$$title$ – $endif$$site.title$</title>
     <link rel="stylesheet" href="/style.css" />
-    $if(section)$
-    <style>
-        .c-nav__item--$section$ {
-            border-color: var(--nav--item--active--fg);
-            color: var(--nav--item--active--fg);
-            font-weight: bold;
-        }
-    </style>
+    $if(section.id)$
+        <style>
+            .c-nav__item--$section.id$ {
+                border-color: var(--nav--item--active--fg);
+                color: var(--nav--item--active--fg);
+                font-weight: bold;
+            }
+        </style>
     $endif$
 </head>
 
@@ -33,14 +36,14 @@
         <div class="c-nav__items l-container">
             <a class="c-nav__logo" href="/" title="$site.title$">$site.logo$</a>
             $for(menus.main)$
-            <a class="c-nav__item c-nav__item--$it.id$" href="$it.url$">$it.label$</a>
+                <a class="c-nav__item c-nav__item--$it.id$" href="$it.url$">$it.label$</a>
             $endfor$
         </div>
     </nav>
         
     <main class="c-page s-page l-container l-container--content l-container--pad-v">
         <div class="c-page__content">
-            $if(ishome)$
+            $if(is_home)$
                 <header class="c-page-header u-hidden@sm-down" role="presentation">
 ${pageHeader()}
                 </header>
@@ -48,26 +51,26 @@ ${pageHeader()}
 
 $body$
 
-            $if(isblog)$
-            ${categoryRef()}
-            ${pagelistByYear()}
+            $if(section.is_blog)$
+                ${categories.blog:categoryRef()}
+                ${pagelistByYear()}
             $endif$
         </div>
     </main>
 
-    $if(ishome)$
-    <template id="header-sm">
+    $if(is_home)$
+        <template id="header-sm">
 ${pageHeaderSm()}
-    </template>
+        </template>
 
-    <script>
-        var headerEl = document.querySelector(".c-page-header");
-        var headerTemplateEl = document.getElementById("header-sm");
-        var headerSmEl = headerTemplateEl.content.cloneNode("true");
+        <script>
+            var headerEl = document.querySelector(".c-page-header");
+            var headerTemplateEl = document.getElementById("header-sm");
+            var headerSmEl = headerTemplateEl.content.cloneNode("true");
 
-        headerEl.classList.remove("u-hidden@sm-down");
-        headerEl.appendChild(headerSmEl);
-    </script>
+            headerEl.classList.remove("u-hidden@sm-down");
+            headerEl.appendChild(headerSmEl);
+        </script>
     $endif$
 </body>
 
diff --git a/templates/categoryRef.html b/templates/categoryRef.html
index 9a363cf..5715fa8 100644
--- a/templates/categoryRef.html
+++ b/templates/categoryRef.html
@@ -1,7 +1,7 @@
-$if(categories)$
-<ul class="c-hlist">
-    $for(categories)$
-    <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value$</li>
-    $endfor$
-</ul>
+$if(it)$
+    <ul class="c-hlist">
+        $for(it/pairs)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value$</li>
+        $endfor$
+    </ul>
 $endif$
diff --git a/templates/feed.xml b/templates/feed.xml
new file mode 100644
index 0000000..68d2fc4
--- /dev/null
+++ b/templates/feed.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <title>$if(is_home)$$else$$title$ – $endif$$site.title$</title>
+    <link href="$feed.url.full$" rel="self"/>
+    <link href="$url.full$"/>
+    <updated>$feed.last_update.rfc3339$</updated>
+    <id>$url.full$</id>
+
+    $for(pages)$
+        $for(it.all)$
+            $if(it.date.rfc3339)$
+                <entry>
+                    <id>$it.url.full$</id>
+                    <title type="html"><![CDATA[$it.title$]]></title>
+                    <link href="$it.url.full$"/>
+                    <published>$it.date.rfc3339$</published>
+                    <updated>$it.date.rfc3339$</updated>
+                </entry>
+            $endif$
+        $endfor$
+    $endfor$
+</feed>
diff --git a/templates/pageHeaderSm.html b/templates/pageHeaderSm.html
index 232b5b2..4db186c 100644
--- a/templates/pageHeaderSm.html
+++ b/templates/pageHeaderSm.html
@@ -3,7 +3,7 @@ $--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   '
 $-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
 $--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
 
-<pre class="c-page__prefixed c-page__prefixed--pre u-mt0 $if(ishome)$u-hidden@sm-up$endif$">
+<pre class="c-page__prefixed c-page__prefixed--pre u-mt0 $if(is_home)$u-hidden@sm-up$endif$">
 .|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
  |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
 '|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
diff --git a/templates/pagelistByYear.html b/templates/pagelistByYear.html
index b884d89..ff55f0f 100644
--- a/templates/pagelistByYear.html
+++ b/templates/pagelistByYear.html
@@ -1,13 +1,11 @@
 $for(pages)$
-$for(it.by_year)$
-$-- <hr class="c-spacer" />
-$-- <h2>$it.key$</h2>
-<ul>
-    $for(it.value)$
-    <li class="c-page__prefixed c-page__prefixed--ref">
-        <a href="$it.url_rel$">$it.category/uppercase$ $it.date$ - $it.title$</a>
-    </li>
+    $for(it.by_year)$
+        <ul>
+            $for(it.value)$
+                <li class="c-page__prefixed c-page__prefixed--ref">
+                    <a href="$it.url.rel$">$it.category/uppercase$ $it.date.yyyy_mm_dd$ - $it.title$</a>
+                </li>
+            $endfor$
+        </ul>
     $endfor$
-</ul>
-$endfor$
 $endfor$