Revert to old category metadata collection, add support for authors

6 files changed, 69 insertions, 18 deletions

diff --git a/metadata/categories.json b/metadata/categories.json
new file mode 100644
index 0000000..9ce0815
--- /dev/null
+++ b/metadata/categories.json
@@ -0,0 +1,6 @@
+{
+    "blog": {
+        "tes": "Testing",
+        "per": "Personal"
+    }
+}
diff --git a/metadata/metadata.yaml b/metadata/metadata.yaml
index 00a8571..7d30a2a 100644
--- a/metadata/metadata.yaml
+++ b/metadata/metadata.yaml
@@ -2,6 +2,9 @@ site:
   title: Volpeon's Den
   logo: \\\\/
 
+author:
+  - name: Volpeon
+
 menus:
   main:
     - id: index
@@ -10,8 +13,3 @@ 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 12de8c8..fc5ddea 100755
--- a/scripts/build_content.sh
+++ b/scripts/build_content.sh
@@ -25,6 +25,8 @@ get_filters() {
 
 FILTERS=$(get_filters)
 
+CATEGORIES=$(cat "$METADATA_DIR/categories.json")
+
 target_filename() {
     filename=$1
     filename=${filename#"$CONTENT_DIR"}
@@ -98,6 +100,8 @@ get_subpages_meta() {
         not_empty: false \
     }")
 
+    categories="{}"
+
     if [ ${#child_pages[@]} -ne 0 ]; then
         #echo -e "\033[0;90m[////////]\033[0m Child pages:"
 
@@ -108,6 +112,8 @@ get_subpages_meta() {
 
             metadata=$(metadata "$file")
 
+            section=$(get_section "$file")
+
             url_rel=$(target_url_rel "$basedir" "$file" "html")
             url_abs=$(target_url_abs "$file" "html")
             url_full="${SITE%/}$url_abs"
@@ -119,6 +125,13 @@ get_subpages_meta() {
                 date_rfc3339=$(date -d "$date" --rfc-3339=seconds | sed 's/ /T/')
             fi
 
+            category=$(echo "$metadata" | jq -r .category)
+            category_name=""
+
+            if [ "$section" != "" ] && [ "$category" != "" ]; then
+                category_name=$(echo "$CATEGORIES" | jq -r .$section.$category)
+            fi
+
             metadata=$(echo "$metadata" | jq ". * { \
                 date: { \
                     yyyy_mm_dd: \"$date\", \
@@ -140,16 +153,23 @@ get_subpages_meta() {
 
                 pages=$(echo "$pages" | jq ".by_year.\"$date_year\" += [ $metadata ]")
             fi
-        done
 
-        pages=$(echo "$pages" \
-            | jq ".all |= (sort_by(.date) | reverse) \
-                | .by_year |= (to_entries | sort_by(.key) | reverse \
-                    | .[].value |= (sort_by(.date) | reverse))")
+            if [ "$category" != "" ]; then
+                categories=$(echo "$categories" | jq ".$category = { name: \"$category_name\", count: (.$category.count + 1) } ")
+            fi
+        done
     fi
 
+    pages=$(echo "$pages" \
+        | 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 \
+        pages: $pages, \
+        categories: $categories
     }"
 }
 
@@ -163,7 +183,7 @@ handle () {
 
         meta_file=$(mktemp)
 
-        metadata=$(metadata "$file")
+        metadata=$(metadata "$1")
         metadata=$(echo "[ \
             $metadata, \
             $(get_subpages_meta "$1") \
diff --git a/templates/base.html b/templates/base.html
index 9574d08..4b8ea1e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex" />
     <link rel="shortcut icon" href="/favicon.ico" />
-    $for(author-meta)$
-        <meta name="author" content="$author-meta$" />
+    $for(author)$
+        <meta name="author" content="$it.name$$if(it.email)$ <$it.email$>$endif$" />
     $endfor$
     $if(date-meta)$
         <meta name="dcterms.date" content="$date-meta$" />
@@ -53,7 +53,7 @@ $body$
 
             $if(section.is_blog)$
                 $if(pages.not_empty)$
-                    ${categories.blog:categoryRef()}
+                    ${categoryRef()}
                     ${pagelistByYear()}
                 $endif$
             $endif$
diff --git a/templates/categoryRef.html b/templates/categoryRef.html
index 5715fa8..58dc5fe 100644
--- a/templates/categoryRef.html
+++ b/templates/categoryRef.html
@@ -1,7 +1,7 @@
-$if(it)$
+$if(categories)$
     <ul class="c-hlist">
-        $for(it/pairs)$
-            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value$</li>
+        $for(categories)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
         $endfor$
     </ul>
 $endif$
diff --git a/templates/feed.xml b/templates/feed.xml
index 68d2fc4..f1439eb 100644
--- a/templates/feed.xml
+++ b/templates/feed.xml
@@ -5,6 +5,14 @@
     <link href="$url.full$"/>
     <updated>$feed.last_update.rfc3339$</updated>
     <id>$url.full$</id>
+    $for(author)$
+        <author>
+            <name>$it.name$</name>
+            $if(it.email)$
+                <email>$it.email$</email>
+            $endif$
+        </author>
+    $endfor$
 
     $for(pages)$
         $for(it.all)$
@@ -12,6 +20,25 @@
                 <entry>
                     <id>$it.url.full$</id>
                     <title type="html"><![CDATA[$it.title$]]></title>
+                    $if(it.author)$
+                        $for(it.author)$
+                            <author>
+                                <name>$it.name$</name>
+                                $if(it.email)$
+                                    <email>$it.email$</email>
+                                $endif$
+                            </author>
+                        $endfor$
+                    $else$
+                        $for(author)$
+                            <author>
+                                <name>$author.name$</name>
+                                $if(author.email)$
+                                    <email>$author.email$</email>
+                                $endif$
+                            </author>
+                        $endfor$
+                    $endif$
                     <link href="$it.url.full$"/>
                     <published>$it.date.rfc3339$</published>
                     <updated>$it.date.rfc3339$</updated>