Added MD4C support to render HTML from Markdown text.

 * additional blog metadata properties

Signed-off-by: lns <matzeton@googlemail.com>

2 files changed, 44 insertions, 14 deletions

diff --git a/src/content/blog/Blog.cpp b/src/content/blog/Blog.cpp
index d2a66c8..ba8638e 100644
--- a/src/content/blog/Blog.cpp
+++ b/src/content/blog/Blog.cpp
@@ -41,9 +41,9 @@ bool Blog::Init()
 
         m_Redirections.push_back(std::filesystem::path(jfile.first).stem());
     }
-    std::sort(m_BlogEntriesSortedByDate.begin(), m_BlogEntriesSortedByDate.end(), [](auto const & a, auto const & b) {
-        return a->publishDate > b->publishDate;
-    });
+    std::sort(m_BlogEntriesSortedByDate.begin(),
+              m_BlogEntriesSortedByDate.end(),
+              [](auto const & a, auto const & b) { return a->publishDate > b->publishDate; });
 
     m_BlogContents.Init();
 
@@ -100,17 +100,19 @@ bool Blog::ValidateAndSetMetdadata(BlogMetadata const & blogMetadata, BlogEntry
 {
     bool retval = true;
     std::function<bool(BlogMetadata const &, std::string const)> validateMetadata =
-        [blogEntry](BlogMetadata const & bm, std::string const tname) {
-            if (bm.find(tname) == bm.cend())
-            {
-                std::cerr << "Metadata validation: JSON key '" << tname << "' missing in "
-                          << blogEntry->metadata_filename << std::endl;
-                return false;
-            }
-            return true;
-        };
-    std::function<bool(std::string const &, std::time_t &)> parseDateTime = [](std::string const & timeStr,
-                                                                               std::time_t & time) {
+        [blogEntry](BlogMetadata const & bm, std::string const tname)
+    {
+        if (bm.find(tname) == bm.cend())
+        {
+            std::cerr << "Metadata validation: JSON key '" << tname << "' missing in " << blogEntry->metadata_filename
+                      << std::endl;
+            return false;
+        }
+        return true;
+    };
+    std::function<bool(std::string const &, std::time_t &)> parseDateTime =
+        [](std::string const & timeStr, std::time_t & time)
+    {
         std::tm tm = {};
         std::stringstream ss(timeStr);
         ss >> std::get_time(&tm, "%d.%m.%y %H:%M");
@@ -124,6 +126,27 @@ bool Blog::ValidateAndSetMetdadata(BlogMetadata const & blogMetadata, BlogEntry
         return true;
     };
 
+    if (validateMetadata(blogMetadata, "title") == false)
+    {
+        retval = false;
+    }
+    blogEntry->title = blogMetadata["title"];
+
+    if (validateMetadata(blogMetadata, "tags") == false)
+    {
+        retval = false;
+    }
+    for (auto const & tag : blogMetadata["tags"])
+    {
+        blogEntry->tags.push_back(tag);
+    }
+
+    if (validateMetadata(blogMetadata, "author") == false)
+    {
+        retval = false;
+    }
+    blogEntry->author = blogMetadata["author"];
+
     if (validateMetadata(blogMetadata, "createDate") == false ||
         parseDateTime(blogMetadata["createDate"], blogEntry->createDate) == false)
     {
@@ -184,6 +207,9 @@ void Blog::GenerateBlogListing(RenderData & rd)
         RenderData re;
         re["metadata_filename"] = e->metadata_filename;
         re["content_filename"] = e->content_filename;
+        re["title"] = e->title;
+        re["tags"] = e->tags;
+        re["author"] = e->author;
         re["createDate"] = e->createDate;
         re["publishDate"] = e->publishDate;
         re["published"] = e->published;
diff --git a/src/content/blog/Blog.hpp b/src/content/blog/Blog.hpp
index f577d69..d99185a 100644
--- a/src/content/blog/Blog.hpp
+++ b/src/content/blog/Blog.hpp
@@ -16,6 +16,10 @@ struct blog_entry
 
     std::string const metadata_filename;
     std::string const content_filename;
+
+    std::string title;
+    std::vector<std::string> tags;
+    std::string author;
     std::time_t createDate;
     std::time_t publishDate;
     bool published;