ParserMarkdown: Inherit from interface, not ParserLegacy

config.cpp

@@ -71,6 +71,7 @@ Config::Config(const std::map<std::string, std::string> &map)
 
 	this->configmap = map;
 	this->wikipath = optional("wikipath", "/");
+	this->parser = optional("parser", "markdown");
 	this->handlersConfig.anon_username = optional("anon_username", "anonymouse");
 	this->handlersConfig.wikiname = required("wikiname");
 	this->logfile = required("logfile");

config.h

@@ -86,6 +86,7 @@ class Config
 	std::string templateprefix;
 	std::string logfile;
 	std::string connectionstring;
+	std::string parser;
 	int session_max_lifetime;
 	int threadscount;
 

handlers/handler.h

@@ -9,10 +9,13 @@
 #include "../database/queryoption.h"
 #include "../logger.h"
 #include "../cache/icache.h"
+#include "../iparser.h"
+
 class Handler
 {
   protected:
 	ICache *cache;
+	IParser *parser;
 	Template *templ;
 	Database *database;
 	Session *userSession;
@@ -25,7 +28,7 @@ class Handler
 
   public:
 	Handler(HandlerConfig &handlersConfig, Template &templ, Database &db, Session &userSession, UrlProvider &provider,
-			ICache &cache)
+			ICache &cache, IParser &parser)
 	{
 		this->handlersConfig = &handlersConfig;
 		this->templ = &templ;
@@ -33,6 +36,7 @@ class Handler
 		this->userSession = &userSession;
 		this->urlProvider = &provider;
 		this->cache = &cache;
+		this->parser = &parser;
 	}
 
 	virtual Response handle(const Request &r);

handlers/handlerfactory.h

@@ -10,15 +10,16 @@ class HandlerFactory
 	Database &db;
 	UrlProvider &urlProvider;
 	ICache &cache;
+	IParser &parser;
 
 	template <class T> inline std::unique_ptr<T> produce(Session &userSession)
 	{
-		return std::make_unique<T>(handlerConfig, templ, db, userSession, urlProvider, cache);
+		return std::make_unique<T>(handlerConfig, templ, db, userSession, urlProvider, cache, parser);
 	}
 
   public:
-	HandlerFactory(HandlerConfig &handlerConfig, Template &templ, Database &db, UrlProvider &urlprovider, ICache &cache)
+	HandlerFactory(HandlerConfig &handlerConfig, Template &templ, Database &db, UrlProvider &urlprovider, ICache &cache, IParser &parser)
-		: handlerConfig(handlerConfig), templ(templ), db(db), urlProvider(urlprovider), cache(cache)
+		: handlerConfig(handlerConfig), templ(templ), db(db), urlProvider(urlprovider), cache(cache), parser(parser)
 	{
 	}
 	std::unique_ptr<Handler> createHandler(const std::string &action, Session &userSession);

handlers/handlerpageedit.cpp

@@ -21,8 +21,8 @@ SOFTWARE.
 #include "handlerpageedit.h"
 #include "../database/exceptions.h"
 #include "../request.h"
+#include "../parserlegacy.h"
 
-#include "../parser.h"
 bool HandlerPageEdit::canAccess(std::string page)
 {
 	return this->userSession->user.permissions.canEdit();
@@ -59,7 +59,7 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
 
 			// TODO: must check, whether categories differ, and perhaps don't allow every user
 			// to set categories
-			Parser parser;
+			ParserLegacy parser;
 			std::vector<std::string> cats = parser.extractCategories(newContent);
 			try
 			{
@@ -107,7 +107,7 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
 		if(r.post("do") == "preview")
 		{
 			std::string newContent = r.post("content");
-			Parser parser;
+			ParserLegacy parser;
 			TemplatePage templatePage = this->templ->getPage("page_creation_preview");
 			templatePage.setVar("actionurl", urlProvider->editPage(pagename));
 			templatePage.setVar("preview_content", parser.parse(pageDao, *this->urlProvider, newContent));

handlers/handlerpageview.cpp

@@ -21,7 +21,7 @@ SOFTWARE.
 #include "handlerpageview.h"
 #include "../database/exceptions.h"
 #include "../logger.h"
-#include "../parser.h"
+#include "../parserlegacy.h"
 #include "../htmllink.h"
 
 bool HandlerPageView::canAccess(std::string page)
@@ -130,7 +130,7 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 
 	TemplatePage &page = this->templ->getPage(templatepartname);
 
-	Parser parser;
+
 	Response result;
 	result.setStatus(200);
 	std::string indexcontent;
@@ -138,8 +138,8 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 
 	if(revisionid > 0)
 	{
-		indexcontent = createIndexContent(parser, revision->content);
+		indexcontent = createIndexContent(*parser, revision->content);
-		parsedcontent = parser.parse(pageDao, *this->urlProvider, revision->content);
+		parsedcontent = parser->parse(pageDao, *this->urlProvider, revision->content);
 	}
 	else
 	{
@@ -153,7 +153,7 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 		}
 		else
 		{
-			indexcontent = createIndexContent(parser, revision->content);
+			indexcontent = createIndexContent(*parser, revision->content);
 			this->cache->put(cachekeyindexcontent, indexcontent);
 		}
 		if(cachedparsedcontent)
@@ -162,7 +162,7 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 		}
 		else
 		{
-			parsedcontent = parser.parse(pageDao, *this->urlProvider, revision->content);
+			parsedcontent = parser->parse(pageDao, *this->urlProvider, revision->content);
 			this->cache->put(cachekeyparsedcontent, parsedcontent);
 		}
 	}

iparser.h

@@ -5,6 +5,8 @@
 #include "headline.h"
 #include "database/pagedao.h"
 #include "urlprovider.h"
+
+
 class IParser
 {
   public:
@@ -16,4 +18,6 @@ class IParser
 	virtual ~IParser(){};
 };
 
+
+
 #endif // PARSER_H

parserlegacy.cpp

@@ -24,10 +24,10 @@ SOFTWARE.
 #include <vector>
 #include <algorithm>
 #include <iterator>
-#include "parser.h"
+#include "parserlegacy.h"
 #include "utils.h"
 #include "htmllink.h"
-std::vector<Headline> Parser::extractHeadlines(std::string content) const
+std::vector<Headline> ParserLegacy::extractHeadlines(std::string content) const
 {
 	std::vector<Headline> result;
 	utils::regex_callback_extractor(std::regex(R"(\[h(1|2|3)\](.*?)\[/h\1\])"), content, [&](std::smatch &smatch) {
@@ -39,7 +39,7 @@ std::vector<Headline> Parser::extractHeadlines(std::string content) const
 	return result;
 }
 
-std::vector<std::string> Parser::extractCategories(std::string content) const
+std::vector<std::string> ParserLegacy::extractCategories(std::string content) const
 {
 	std::vector<std::string> result;
 	std::string reg = R"(\[category\](.*?)\[/category\])";
@@ -55,7 +55,7 @@ std::vector<std::string> Parser::extractCategories(std::string content) const
 	return result;
 }
 
-std::string Parser::extractCommand(std::string cmdname, std::string content) const
+std::string ParserLegacy::extractCommand(std::string cmdname, std::string content) const
 {
 	std::string cmd = "[cmd:" + cmdname + "]";
 	std::string cmdend = "[/cmd:" + cmdname + "]";
@@ -74,7 +74,7 @@ std::string Parser::extractCommand(std::string cmdname, std::string content) con
 	}
 	return "";
 }
-std::string Parser::processLink(const PageDao &pageDao, UrlProvider &urlProvider, std::smatch &match) const
+std::string ParserLegacy::processLink(const PageDao &pageDao, UrlProvider &urlProvider, std::smatch &match) const
 {
 	std::string linktag = match.str(1);
 	std::string inside = match.str(2);
@@ -109,7 +109,7 @@ std::string Parser::processLink(const PageDao &pageDao, UrlProvider &urlProvider
 	return htmllink.render();
 }
 
-std::string Parser::parse(const PageDao &pagedao, UrlProvider &provider, std::string content) const
+std::string ParserLegacy::parse(const PageDao &pagedao, UrlProvider &provider, std::string content) const
 {
 	std::string result;
 	// we don't care about commands, but we nevertheless replace them with empty strings

parserlegacy.h

@@ -2,7 +2,7 @@
 #define PARSER_H
 #include "iparser.h"
 
-class Parser : public IParser
+class ParserLegacy : public IParser
 {
   private:
 	std::string processLink(const PageDao &pageDao, UrlProvider &urlProvider, std::smatch &match) const;
@@ -13,7 +13,7 @@ class Parser : public IParser
 	std::vector<std::string> extractCategories(std::string content) const override;
 	std::string parse(const PageDao &pagedao, UrlProvider &provider, std::string content) const override;
 	using IParser::IParser;
-	~Parser(){};
+	~ParserLegacy(){};
 };
 
 #endif // PARSER_H

parsermarkdown.cpp

@@ -59,3 +59,13 @@ std::string ParserMarkdown::parse(const PageDao &pagedao, UrlProvider &provider,
 	std::string result = maddy->Parse(s);
 	return result;
 }
+
+std::string ParserMarkdown::extractCommand(std::string cmdname, std::string content) const
+{
+	return "";
+}
+
+std::vector<std::string> ParserMarkdown::extractCategories(std::string content) const
+{
+	return { };
+}

parsermarkdown.h

@@ -1,9 +1,10 @@
 #ifndef PARSER_MARKDOWN_H
 #define PARSER_MARKDOWN_H
 
-#include "parser.h"
+#include "iparser.h"
 #include "maddy/parser.h"
-class ParserMarkdown : public Parser
+
+class ParserMarkdown : public IParser
 {
 private:
 	std::string processLink(const PageDao &pageDao, UrlProvider &urlProvider, std::smatch &match) const;
@@ -12,6 +13,9 @@ public:
 	ParserMarkdown();
 	std::vector<Headline> extractHeadlines(std::string content) const;
 	std::string parse(const PageDao &pagedao, UrlProvider &provider, std::string content) const;
+
+	std::string extractCommand(std::string cmdname, std::string content) const;
+	std::vector<std::string> extractCategories(std::string content) const;
 };
 
 #endif // PARSER_MARKDOWN_H

qswiki.cpp

@@ -37,6 +37,10 @@ SOFTWARE.
 #include "requestworker.h"
 #include "cache/fscache.h"
 #include "sandbox/sandboxfactory.h"
+#include "iparser.h"
+#include "parserlegacy.h"
+#include "parsermarkdown.h"
+
 void sigterm_handler(int arg)
 {
 	// TODO: proper shutdown.
@@ -63,6 +67,17 @@ std::unique_ptr<ICache> createCache(const ConfigVariableResolver &resolver)
 
 	return std::make_unique<FsCache>(path);
 }
+
+std::unique_ptr<IParser> createParser(const ConfigVariableResolver &resolver)
+{
+	std::string parser = resolver.getConfig("parser");
+	if(parser == "legacy")
+	{
+		return std::make_unique<ParserLegacy>();
+	}
+	return std::make_unique<ParserMarkdown>();
+}
+
 int main(int argc, char **argv)
 {
 	if(geteuid() == 0)
@@ -135,7 +150,10 @@ int main(int argc, char **argv)
 		auto cache = createCache(config.configVarResolver);
 		cache->clear();
 
-		HandlerFactory handlerFactory{config.handlersConfig, siteTemplate, *database.get(), urlProvider, *cache.get()};
+		auto parser = createParser(config.configVarResolver);
+
+
+		HandlerFactory handlerFactory{config.handlersConfig, siteTemplate, *database.get(), urlProvider, *cache.get(), *parser.get()};
 		RequestWorker requestWorker{handlerFactory, database->createSessionDao(), siteTemplate};
 
 		auto interface = createGateway(config);