crtxcr/qswiki
1
0
Fork 0
Code Issues 21 Pull Requests 1 Releases Activity

feature/markdown #23

Open
crtxcr wants to merge 9 commits from feature/markdown into master
pull from: feature/markdown
merge into: crtxcr:master
Conversation 0 Commits 9 Files Changed 17 +15 -15
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cec56d5a73 - Show all commits

6
handlers/handlerpageedit.cpp
View File

@ -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));

4
handlers/handlerpageview.cpp
View File

@ -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;
ParserLegacy parser;
Response result;
result.setStatus(200);
std::string indexcontent;

12
parser.cpp → parserlegacy.cpp
View File

@ -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

4
parser.h → parserlegacy.h
View File

@ -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

4
parsermarkdown.h
View File

@ -1,9 +1,9 @@
#ifndef PARSER_MARKDOWN_H
#define PARSER_MARKDOWN_H
#include "parser.h"
#include "parserlegacy.h"
#include "maddy/parser.h"
class ParserMarkdown : public Parser
class ParserMarkdown : public ParserLegacy
{
private:
std::string processLink(const PageDao &pageDao, UrlProvider &urlProvider, std::smatch &match) const;