Skip to content

PageCompiler: Extracted page write from handleRequest #3919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fabio3rs wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

PageCompiler: Extracted page write from handleRequest #3919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions PageCompiler/src/CodeWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,14 @@ void CodeWriter::handlerClass(std::ostream& ostr, const std::string& base, const
ostr << "\t" << _class << "(" << ctorArg << ");\n";
ostr << "\n";
}
ostr << "\tvoid handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response);\n";
ostr << "\tvoid handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response) override;\n";

if (shouldWriteForm()) {
ostr << "\tvoid stringify(std::ostream &responseStream, Poco::Net::HTMLForm &form);\n";
} else {
ostr << "\tvoid stringify(std::ostream &responseStream);\n";
}

writeHandlerMembers(ostr);

std::string path = _page.get("page.path", "");
Expand Down Expand Up @@ -195,6 +202,11 @@ void CodeWriter::factoryImpl(std::ostream& ostr, const std::string& arg)
void CodeWriter::writeHeaderIncludes(std::ostream& ostr)
{
ostr << "#include \"Poco/Net/HTTPRequestHandler.h\"\n";
ostr << "namespace Poco {\n"
"namespace Net {\n"
"class HTMLForm;\n"
"}\n"
"}\n";
}


Expand Down Expand Up @@ -272,8 +284,18 @@ void CodeWriter::writeHandler(std::ostream& ostr)
ostr << "\tif (!(" << _page.get("page.precondition") << ")) return;\n\n";
}
writeForm(ostr);
ostr << _page.preHandler().str();
writeContent(ostr);
ostr << "}\n\n";

if (shouldWriteForm()) {
ostr << "void " << _class << "::stringify(std::ostream &responseStream, [[maybe_unused]] Poco::Net::HTMLForm &form)\n";
ostr << "{\n";
} else {
ostr << "void " << _class << "::stringify(std::ostream &responseStream)\n";
ostr << "{\n";
}
ostr << _page.preHandler().str();
ostr << cleanupHandler(_page.handler().str());
ostr << "}\n";
}

Expand All @@ -287,6 +309,10 @@ void CodeWriter::writeManifest(std::ostream& ostr)
{
}

bool CodeWriter::shouldWriteForm() const
{
return _page.getBool("page.form", true);
}

void CodeWriter::writeSession(std::ostream& ostr)
{
Expand All @@ -295,7 +321,7 @@ void CodeWriter::writeSession(std::ostream& ostr)

void CodeWriter::writeForm(std::ostream& ostr)
{
if (_page.getBool("page.form", true))
if (shouldWriteForm())
{
std::string partHandler(_page.get("page.formPartHandler", ""));
if (!partHandler.empty())
Expand Down Expand Up @@ -362,14 +388,16 @@ void CodeWriter::writeContent(std::ostream& ostr)
if (buffered) compressed = false;
if (compressed) chunked = true;

std::string stringifyCall = shouldWriteForm() ? "\tstringify(responseStream, form);\n" : "\tstringify(responseStream);\n";

if (buffered)
{
ostr << "\tstd::stringstream responseStream;\n";
if (escape)
{
ostr << "\tPoco::Net::EscapeHTMLOutputStream _escapeStream(responseStream);\n";
}
ostr << cleanupHandler(_page.handler().str());
ostr << stringifyCall;
if (!chunked)
{
ostr << "\tresponse.setContentLength(static_cast<int>(responseStream.tellp()));\n";
Expand All @@ -385,7 +413,7 @@ void CodeWriter::writeContent(std::ostream& ostr)
{
ostr << "\tPoco::Net::EscapeHTMLOutputStream _escapeStream(responseStream);\n";
}
ostr << cleanupHandler(_page.handler().str());
ostr << stringifyCall;
ostr << "\tif (_compressResponse) _gzipStream.close();\n";
}
else
Expand All @@ -395,7 +423,7 @@ void CodeWriter::writeContent(std::ostream& ostr)
{
ostr << "\tPoco::Net::EscapeHTMLOutputStream _escapeStream(responseStream);\n";
}
ostr << cleanupHandler(_page.handler().str());
ostr << stringifyCall;
}
}

Expand Down
2 changes: 2 additions & 0 deletions PageCompiler/src/CodeWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ class CodeWriter
virtual void writeContent(std::ostream& ostr);
virtual void writeManifest(std::ostream& ostr);

virtual bool shouldWriteForm() const;

void beginGuard(std::ostream& ostr, const std::string& headerFileName);
void endGuard(std::ostream& ostr, const std::string& headerFileName);
void beginNamespace(std::ostream& ostr);
Expand Down