kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-23 12:07:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix urlschemehandle to adapt to new kiwix-lib.

Browse Source 
New kiwix-lib forbid to create a "empty" `kiwix::Entry`.
This commit is contained in:
Matthieu Gautier 2020-12-07 12:17:48 +01:00
parent bd54ad9d79
commit f240ea78a1
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/urlschemehandler.cpp
View File

@ -30,35 +30,25 @@ UrlSchemeHandler::handleContentRequest(QWebEngineUrlRequestJob *request)
request->fail(QWebEngineUrlRequestJob::UrlNotFound); request->fail(QWebEngineUrlRequestJob::UrlNotFound);
return; return;
} }
kiwix::Entry entry;
try { try {
entry = reader->getEntryFromPath(url); kiwix::Entry entry = reader->getEntryFromPath(url);
} catch (kiwix::NoEntry&) { if (entry.isRedirect()) {
url = "A/" + url;
try {
entry = reader->getEntryFromPath(url);
} catch (kiwix::NoEntry&) {
request->fail(QWebEngineUrlRequestJob::UrlNotFound);
return;
}
}
if (entry.isRedirect()) {
try {
entry = entry.getFinalEntry(); entry = entry.getFinalEntry();
} catch (kiwix::NoEntry&) { auto path = QString("/") + QString::fromStdString(entry.getPath());
request->fail(QWebEngineUrlRequestJob::UrlNotFound); qurl.setPath(path);
request->redirect(qurl);
return; return;
} }
auto path = QString("/") + QString::fromStdString(entry.getPath());
qurl.setPath(path); BlobBuffer* buffer = new BlobBuffer(entry.getBlob());
request->redirect(qurl); auto mimeType = QByteArray::fromStdString(entry.getMimetype());
return; mimeType = mimeType.split(';')[0];
connect(request, &QObject::destroyed, buffer, &QObject::deleteLater);
request->reply(mimeType, buffer);
} catch (kiwix::NoEntry&) {
request->fail(QWebEngineUrlRequestJob::UrlNotFound);
} }
BlobBuffer* buffer = new BlobBuffer(entry.getBlob());
auto mimeType = QByteArray::fromStdString(entry.getMimetype());
mimeType = mimeType.split(';')[0];
connect(request, &QObject::destroyed, buffer, &QObject::deleteLater);
request->reply(mimeType, buffer);
} }
void void