Added Markdown and Static content module.

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

6 files changed, 192 insertions, 8 deletions

diff --git a/src/content/blog/Blog.cpp b/src/content/blog/Blog.cpp
index 56a23c1..b473bf3 100644
--- a/src/content/blog/Blog.cpp
+++ b/src/content/blog/Blog.cpp
@@ -1,7 +1,11 @@
 #include "Blog.hpp"
 
-Blog::Blog(std::string uriBasePath, std::string mainTemplatePath)
-    : Content(), m_UriBasePath(uriBasePath), m_MainTemplatePath(mainTemplatePath)
+Blog::Blog(std::string uriBasePath, std::string mainTemplatePath, std::string blogPath)
+    : Content(),
+      m_UriBasePath(uriBasePath),
+      m_MainTemplatePath(mainTemplatePath),
+      m_BlogPath(blogPath),
+      m_BlogEntries("", blogPath)
 {
     m_Redirections.push_back(uriBasePath + "/");
     m_Redirections.push_back(uriBasePath + "/index.html");
@@ -9,18 +13,34 @@ Blog::Blog(std::string uriBasePath, std::string mainTemplatePath)
 
 bool Blog::Init()
 {
+    std::cout << "Blog entries path: " << m_BlogPath << std::endl;
+
+    std::vector<std::string> extensions = {"json"};
+
+    if (m_BlogEntriesMetadata.Scan(m_BlogPath, extensions, false) == false)
+    {
+        return false;
+    }
+
+    m_BlogEntries.Init();
+
     return true;
 }
 
 void Blog::Shutdown()
 {
+    std::cout << "Blog module shutdown" << std::endl;
+
+    m_BlogEntries.Shutdown();
 }
 
-bool Blog::Render(RequestResponse & rr, RenderData & rd)
+bool Blog::Render(RequestResponse & rr, RenderData & rd, std::string & out)
 {
-    rd["blah"] = "Yoh!";
-    rr.UseOutputHeader();
-    rr.AddOutputHeader("bla", "blubb");
+    (void)rr;
+    (void)rd;
+    (void)out;
+
+    rd["blah"] = "Yooooh!";
 
     return true;
 }
diff --git a/src/content/blog/Blog.hpp b/src/content/blog/Blog.hpp
index 086acc7..970c7fd 100644
--- a/src/content/blog/Blog.hpp
+++ b/src/content/blog/Blog.hpp
@@ -2,15 +2,17 @@
 #define BLOG_H 1
 
 #include "../../Content.hpp"
+#include "../../Filesystem.hpp"
+#include "../markdown/Markdown.hpp"
 
 class Blog : public Content
 {
 public:
-    explicit Blog(std::string uriBasePath, std::string mainTemplatePath);
+    explicit Blog(std::string uriBasePath, std::string mainTemplatePath, std::string blogPath);
 
     bool Init();
     void Shutdown();
-    bool Render(RequestResponse & rr, RenderData & rd);
+    bool Render(RequestResponse & rr, RenderData & rd, std::string & out);
 
     std::string const & GetUriBasePath() const;
     std::string const & GetMainTemplate() const;
@@ -19,7 +21,10 @@ public:
 private:
     std::string m_UriBasePath;
     std::string m_MainTemplatePath;
+    std::string m_BlogPath;
     Redirections m_Redirections;
+    Filesystem m_BlogEntriesMetadata;
+    Markdown m_BlogEntries;
 };
 
 #endif
diff --git a/src/content/markdown/Markdown.cpp b/src/content/markdown/Markdown.cpp
new file mode 100644
index 0000000..2009772
--- /dev/null
+++ b/src/content/markdown/Markdown.cpp
@@ -0,0 +1,51 @@
+#include "Markdown.hpp"
+
+Markdown::Markdown(std::string uriBasePath, std::string markdownFilesPath)
+    : Content(), m_UriBasePath(uriBasePath), m_MainTemplatePath(""), m_MarkdownFilesPath(markdownFilesPath)
+{
+}
+
+bool Markdown::Init()
+{
+    std::cout << "Markdown files path: " << m_MarkdownFilesPath << std::endl;
+
+    std::vector<std::string> extensions = {"md"};
+
+    if (m_MarkdownFiles.Scan(m_MarkdownFilesPath, extensions, false) == false)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+void Markdown::Shutdown()
+{
+    std::cout << "Markdown module shutdown" << std::endl;
+}
+
+bool Markdown::Render(RequestResponse & rr, RenderData & rd, std::string & out)
+{
+    (void)out;
+
+    rd["blub"] = "Yoh21!";
+    rr.UseOutputHeader();
+    rr.AddOutputHeader("blaaaa", "blubb");
+
+    return true;
+}
+
+std::string const & Markdown::GetUriBasePath() const
+{
+    return m_UriBasePath;
+}
+
+std::string const & Markdown::GetMainTemplate() const
+{
+    return m_MainTemplatePath;
+}
+
+Redirections const & Markdown::GetRedirections() const
+{
+    return m_Redirections;
+}
diff --git a/src/content/markdown/Markdown.hpp b/src/content/markdown/Markdown.hpp
new file mode 100644
index 0000000..41c8b4d
--- /dev/null
+++ b/src/content/markdown/Markdown.hpp
@@ -0,0 +1,28 @@
+#ifndef MARKDOWN_H
+#define MARKDOWN_H 1
+
+#include "../../Content.hpp"
+#include "../../Filesystem.hpp"
+
+class Markdown : public Content
+{
+public:
+    explicit Markdown(std::string uriBasePath, std::string markdownFilesPath);
+
+    bool Init();
+    void Shutdown();
+    bool Render(RequestResponse & rr, RenderData & rd, std::string & out);
+
+    std::string const & GetUriBasePath() const;
+    std::string const & GetMainTemplate() const;
+    Redirections const & GetRedirections() const;
+
+private:
+    std::string m_UriBasePath;
+    std::string m_MainTemplatePath;
+    std::string m_MarkdownFilesPath;
+    Redirections m_Redirections;
+    Filesystem m_MarkdownFiles;
+};
+
+#endif
diff --git a/src/content/static/Static.cpp b/src/content/static/Static.cpp
new file mode 100644
index 0000000..5e38b76
--- /dev/null
+++ b/src/content/static/Static.cpp
@@ -0,0 +1,51 @@
+#include "Static.hpp"
+
+Static::Static(std::string uriBasePath, std::string staticFilesPath)
+    : Content(), m_UriBasePath(uriBasePath), m_MainTemplatePath(""), m_StaticFilesPath(staticFilesPath)
+{
+}
+
+bool Static::Init()
+{
+    std::cout << "Static files path: " << m_StaticFilesPath << std::endl;
+
+    std::vector<std::string> extensions = {"json"};
+
+    if (m_StaticFiles.Scan(m_StaticFilesPath, extensions, false) == false)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+void Static::Shutdown()
+{
+    std::cout << "Static files module shutdown" << std::endl;
+}
+
+bool Static::Render(RequestResponse & rr, RenderData & rd, std::string & out)
+{
+    (void)rr;
+    (void)rd;
+    (void)out;
+
+    rd["blah"] = "Yooooh!";
+
+    return true;
+}
+
+std::string const & Static::GetUriBasePath() const
+{
+    return m_UriBasePath;
+}
+
+std::string const & Static::GetMainTemplate() const
+{
+    return m_MainTemplatePath;
+}
+
+Redirections const & Static::GetRedirections() const
+{
+    return m_Redirections;
+}
diff --git a/src/content/static/Static.hpp b/src/content/static/Static.hpp
new file mode 100644
index 0000000..85ffd8c
--- /dev/null
+++ b/src/content/static/Static.hpp
@@ -0,0 +1,29 @@
+#ifndef STATIC_H
+#define STATIC_H 1
+
+#include "../../Content.hpp"
+#include "../../Filesystem.hpp"
+#include "../markdown/Markdown.hpp"
+
+class Static : public Content
+{
+public:
+    explicit Static(std::string uriBasePath, std::string staticFilesPath);
+
+    bool Init();
+    void Shutdown();
+    bool Render(RequestResponse & rr, RenderData & rd, std::string & out);
+
+    std::string const & GetUriBasePath() const;
+    std::string const & GetMainTemplate() const;
+    Redirections const & GetRedirections() const;
+
+private:
+    std::string m_UriBasePath;
+    std::string m_MainTemplatePath;
+    std::string m_StaticFilesPath;
+    Redirections m_Redirections;
+    Filesystem m_StaticFiles;
+};
+
+#endif