mirror of
https://github.com/kiwix/kiwix-desktop.git
synced 2025-09-22 11:37:56 -04:00
Code deduplication in error page generation
This commit is contained in:
parent
9d6705f580
commit
26d3891fa1
@ -191,13 +191,24 @@ QString completeHtml(const QString& htmlBodyContent)
|
|||||||
return fullHtml;
|
return fullHtml;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sendHtmlResponse(QWebEngineUrlRequestJob *request, const QString& htmlBodyContent)
|
||||||
|
{
|
||||||
|
QBuffer *buffer = new QBuffer;
|
||||||
|
buffer->open(QIODevice::WriteOnly);
|
||||||
|
buffer->write(completeHtml(htmlBodyContent).toStdString().c_str());
|
||||||
|
buffer->close();
|
||||||
|
|
||||||
|
QObject::connect(request, SIGNAL(destroyed()), buffer, SLOT(deleteLater()));
|
||||||
|
request->reply("text/html", buffer);
|
||||||
|
}
|
||||||
|
|
||||||
} // unnamed namespace
|
} // unnamed namespace
|
||||||
|
|
||||||
void
|
void
|
||||||
UrlSchemeHandler::replyZimNotFoundPage(QWebEngineUrlRequestJob *request,
|
UrlSchemeHandler::replyZimNotFoundPage(QWebEngineUrlRequestJob *request,
|
||||||
const QString &zimId)
|
const QString &zimId)
|
||||||
{
|
{
|
||||||
QBuffer *buffer = new QBuffer;
|
|
||||||
QString path = "N/A", name = "N/A";
|
QString path = "N/A", name = "N/A";
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -225,19 +236,13 @@ UrlSchemeHandler::replyZimNotFoundPage(QWebEngineUrlRequestJob *request,
|
|||||||
"</b></p>"
|
"</b></p>"
|
||||||
"</div></section>";
|
"</div></section>";
|
||||||
|
|
||||||
buffer->open(QIODevice::WriteOnly);
|
sendHtmlResponse(request, contentHtml);
|
||||||
buffer->write(completeHtml(contentHtml).toStdString().c_str());
|
|
||||||
buffer->close();
|
|
||||||
|
|
||||||
connect(request, SIGNAL(destroyed()), buffer, SLOT(deleteLater()));
|
|
||||||
request->reply("text/html", buffer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
UrlSchemeHandler::replyBadZimFilePage(QWebEngineUrlRequestJob *request,
|
UrlSchemeHandler::replyBadZimFilePage(QWebEngineUrlRequestJob *request,
|
||||||
const QString &zimId)
|
const QString &zimId)
|
||||||
{
|
{
|
||||||
QBuffer *buffer = new QBuffer;
|
|
||||||
const auto& book = KiwixApp::instance()->getLibrary()->getBookById(zimId);
|
const auto& book = KiwixApp::instance()->getLibrary()->getBookById(zimId);
|
||||||
const QString path = QString::fromStdString(book.getPath());
|
const QString path = QString::fromStdString(book.getPath());
|
||||||
const QString name = QString::fromStdString(book.getName());
|
const QString name = QString::fromStdString(book.getName());
|
||||||
@ -252,12 +257,7 @@ UrlSchemeHandler::replyBadZimFilePage(QWebEngineUrlRequestJob *request,
|
|||||||
"<p>" + gt("zim-entry-path") + ": <b>" + zimEntryPath + "</b></p>"
|
"<p>" + gt("zim-entry-path") + ": <b>" + zimEntryPath + "</b></p>"
|
||||||
"</div></section>";
|
"</div></section>";
|
||||||
|
|
||||||
buffer->open(QIODevice::WriteOnly);
|
sendHtmlResponse(request, contentHtml);
|
||||||
buffer->write(completeHtml(contentHtml).toStdString().c_str());
|
|
||||||
buffer->close();
|
|
||||||
|
|
||||||
connect(request, SIGNAL(destroyed()), buffer, SLOT(deleteLater()));
|
|
||||||
request->reply("text/html", buffer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
x
Reference in New Issue
Block a user