jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some tests.

Browse source
This commit is contained in:
James Grogan 2022-12-01 10:52:48 +00:00
parent b17ba8b3a7
commit c102ebb6da
64 changed files with 615 additions and 541 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/web/DocumentConverter.cpp
View file

@ -2,6 +2,7 @@
#include "MarkdownParser.h"
#include "HtmlWriter.h"
#include "FileLogger.h"
#include "File.h"
#include <fstream>
DocumentConverter::DocumentConverter()
@ -9,19 +10,19 @@ DocumentConverter::DocumentConverter()
}
void DocumentConverter::Convert(File* input, File* output)
void DocumentConverter::convert(File* input, File* output)
{
if(!input || !output)
{
return;
}
const auto input_format = input->InferFormat();
const auto input_format = input->inferFormat();
switch (input_format)
{
case FileFormat::Format::Markdown:
{
ConvertMarkdown(input, output);
convertMarkdown(input, output);
break;
}
default:
@ -31,14 +32,14 @@ void DocumentConverter::Convert(File* input, File* output)
}
}
void DocumentConverter::ConvertMarkdown(File* input, File* output)
void DocumentConverter::convertMarkdown(File* input, File* output)
{
const auto output_format = output->InferFormat();
const auto output_format = output->inferFormat();
switch (output_format)
{
case FileFormat::Format::Html:
{
MarkdownToHtml(input, output);
markdownToHtml(input, output);
break;
}
default:
@ -48,29 +49,27 @@ void DocumentConverter::ConvertMarkdown(File* input, File* output)
}
}
void DocumentConverter::MarkdownToHtml(File* input, File* output)
void DocumentConverter::markdownToHtml(File* input, File* output)
{
MLOG_INFO("Converting Markdown to Html");
input->SetAccessMode(File::AccessMode::Read);
input->Open();
input->open(File::AccessMode::Read);
MarkdownParser parser;
auto handle = input->GetInHandle();
auto handle = input->getInHandle();
while(handle->good())
{
std::string line;
std::getline(*handle, line);
parser.ProcessLine(line);
parser.processLine(line);
};
input->Close();
input->close();
auto html_document = parser.GetHtml();
auto html_document = parser.getHtml();
HtmlWriter writer;
std::string html_string = writer.ToString(html_document);
output->SetAccessMode(File::AccessMode::Write);
output->Open();
*(output->GetOutHandle()) << html_string;
output->Close();
output->open(File::AccessMode::Write);
*(output->getOutHandle()) << html_string;
output->close();
}

9
src/web/DocumentConverter.h
View file

@ -1,16 +1,17 @@
#pragma once
#include <string>
#include "File.h"
class File;
class DocumentConverter
{
public:
DocumentConverter();
void Convert(File* input, File* output);
void convert(File* input, File* output);
void ConvertMarkdown(File* input, File* output);
void convertMarkdown(File* input, File* output);
void MarkdownToHtml(File* input, File* output);
void markdownToHtml(File* input, File* output);
};

8
src/web/markdown/MarkdownParser.cpp
View file

@ -9,22 +9,22 @@ MarkdownParser::MarkdownParser()
}
void MarkdownParser::ProcessLine(const std::string& line)
void MarkdownParser::processLine(const std::string& line)
{
}
void MarkdownParser::Run(const std::string& content)
void MarkdownParser::run(const std::string& content)
{
std::stringstream ss(content);
std::string line;
while (std::getline(ss, line, '\n'))
{
ProcessLine(line);
processLine(line);
}
}
HtmlDocumentPtr MarkdownParser::GetHtml()
HtmlDocumentPtr MarkdownParser::getHtml()
{
return mHtmlDocument;
}

15
src/web/markdown/MarkdownParser.h
View file

@ -14,17 +14,16 @@ class MarkdownParser
None
};
DocumentState mDocumentState {DocumentState::None};
HtmlDocumentPtr mHtmlDocument;
public:
MarkdownParser();
HtmlDocumentPtr GetHtml();
HtmlDocumentPtr getHtml();
void ProcessLine(const std::string& line);
void processLine(const std::string& line);
void Run(const std::string& content);
void run(const std::string& content);
private:
DocumentState mDocumentState {DocumentState::None};
HtmlDocumentPtr mHtmlDocument;
};