Skip to content
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.

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

Added Custom File-Not-Found page for Tabs #1132

Merged
merged 3 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion resources/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,10 @@
"no-pictures": "No Pictures",
"no-videos": "No Videos",
"open-previous-tabs-at-startup": "Open previous tabs at startup",
"preview-book-in-web-browser": "Preview book in web browser"
"preview-book-in-web-browser": "Preview book in web browser",
"file-not-found-title": "ZIM File Not Found",
"file-not-found-text": "ZIM file doesn't exist or is not readable",
"zim-id": "Zim Id",
"zim-name": "Zim Name",
"zim-path": "Zim File Path"
}
7 changes: 6 additions & 1 deletion resources/i18n/qqq.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,5 +175,10 @@
"no-details": "A content type for Zim files representing it only has an introduction.",
"no-pictures": "A content type for Zim files that does not contain pictures.",
"no-videos": "A content type for Zim files that does not contain videos.",
"path-was-copied": "Tooltip confirming that the download path from settings was copied."
"path-was-copied": "Tooltip confirming that the download path from settings was copied.",
"file-not-found-title": "Error title text displayed when the desktop application cannot find the Zim file needed to display the web page.",
"file-not-found-text": "Error description text for when the desktop application cannot find the Zim file needed to display the web page.",
"zim-id": "The term for the unique identifier of a zim file.",
"zim-name": "The term for the name of a Zim file",
"zim-path": "The term for the path of a Zim file"
}
3 changes: 2 additions & 1 deletion src/contentmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -906,5 +906,6 @@ void ContentManager::updateLibraryFromDir(QString monitorDir)

void ContentManager::handleDisappearedZimFile(QString bookId)
{
mp_library->removeBookFromLibraryById(bookId);
if (!KiwixApp::instance()->getTabWidget()->getTabZimIds().contains(bookId))
mp_library->removeBookFromLibraryById(bookId);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@veloman-yunkan I checked that the book's isPathValid boolean was already set when we retrieved it. Don't think we need to make any modifications to the library.

}
4 changes: 2 additions & 2 deletions src/kiwixapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ void KiwixApp::init()
mp_manager->asyncUpdateLibraryFromDir(monitorDir);
});

setupDirectoryMonitoring();

/* Restore Tabs before directory monitoring to ensure we know what tabs user had. */
restoreTabs();
restoreWindowState();
setupDirectoryMonitoring();
}

void KiwixApp::setupDirectoryMonitoring()
Expand Down
9 changes: 9 additions & 0 deletions src/tabbar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,15 @@ QStringList TabBar::getTabUrls() const {
return idList;
}

QStringList TabBar::getTabZimIds() const
{
QStringList idList;
for (int index = 0; index <= mp_stackedWidget->count(); index++)
if (ZimView* zv = qobject_cast<ZimView*>(mp_stackedWidget->widget(index)))
idList.push_back(zv->getWebView()->zimId());
return idList;
}

void TabBar::closeTab(int index)
{
// The first and last tabs (i.e. the library tab and the + (new tab) button)
Expand Down
1 change: 1 addition & 0 deletions src/tabbar.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class TabBar : public QTabBar
void openFindInPageBar();
void closeTabsByZimId(const QString &id);
QStringList getTabUrls() const;
QStringList getTabZimIds() const;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function should be introduced in the next commit.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


protected:
void mousePressEvent(QMouseEvent *event);
Expand Down
42 changes: 41 additions & 1 deletion src/urlschemehandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ UrlSchemeHandler::handleContentRequest(QWebEngineUrlRequestJob *request)
try {
archive = library->getArchive(zim_id);
} catch (std::out_of_range& e) {
request->fail(QWebEngineUrlRequestJob::UrlNotFound);
replyZimNotFoundPage(request, zim_id);
return;
}
try {
Expand Down Expand Up @@ -176,6 +176,46 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request)
request->reply("text/html", buffer);
}

void
UrlSchemeHandler::replyZimNotFoundPage(QWebEngineUrlRequestJob *request,
const QString &zimId)
{
QBuffer *buffer = new QBuffer;
QString path = "N/A", name = "N/A";
try
{
auto& book = KiwixApp::instance()->getLibrary()->getBookById(zimId);
path = QString::fromStdString(book.getPath());
name = QString::fromStdString(book.getName());
}
catch (...) { /* Blank */ }

QString contentHtml = "<section><div>"
"<h1>" +
gt("file-not-found-title") +
"</h1>"
"<p>" +
gt("file-not-found-text") +
"</p>"
"<p>" +
gt("zim-id") + ": <b>" + zimId +
"</b></p>"
"<p>" +
gt("zim-name") + ": <b>" + name +
"</b></p>"
"<p>" +
gt("zim-path") + ": <b>" + path +
"</b></p>"
"</div></section>";

buffer->open(QIODevice::WriteOnly);
buffer->write(contentHtml.toStdString().c_str());
buffer->close();

connect(request, SIGNAL(destroyed()), buffer, SLOT(deleteLater()));
request->reply("text/html", buffer);
}

void
UrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
{
Expand Down
2 changes: 2 additions & 0 deletions src/urlschemehandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class UrlSchemeHandler : public QWebEngineUrlSchemeHandler
void handleMetaRequest(QWebEngineUrlRequestJob *request);
void handleContentRequest(QWebEngineUrlRequestJob *request);
void handleSearchRequest(QWebEngineUrlRequestJob *request);

void replyZimNotFoundPage(QWebEngineUrlRequestJob *request, const QString& zimId);
};

#endif // URLSCHEMEHANDLER_H
Loading