dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Searcher: catch exception when loading node

Browse Source
This commit is contained in:
Le Tan 2021-08-12 21:49:06 +08:00
parent 0cf0da06f8
commit a0594dcc2b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/search/searcher.cpp
View File

@ -5,6 +5,7 @@
#include <buffer/buffer.h> #include <buffer/buffer.h>
#include <core/file.h> #include <core/file.h>
#include <core/exception.h>
#include <notebook/node.h> #include <notebook/node.h>
#include <notebook/notebook.h> #include <notebook/notebook.h>
@ -348,7 +349,15 @@ bool Searcher::firstPhaseSearchFolder(Node *p_node, QVector<SearchSecondPhaseIte
Q_ASSERT(p_node->isContainer()); Q_ASSERT(p_node->isContainer());
Q_ASSERT(testTarget(SearchTarget::SearchFile) || testTarget(SearchTarget::SearchFolder)); Q_ASSERT(testTarget(SearchTarget::SearchFile) || testTarget(SearchTarget::SearchFolder));
try {
p_node->load(); p_node->load();
} catch (Exception &p_e) {
QString msg = tr("Failed to load node to search (%1) (%2).")
.arg(p_node->getName(), p_e.what());
qCritical() << msg;
emit logRequested(msg);
return false;
}
if (testTarget(SearchTarget::SearchFolder)) { if (testTarget(SearchTarget::SearchFolder)) {
const auto name = p_node->getName(); const auto name = p_node->getName();

2
src/widgets/notebooknodeexplorer.cpp
View File

@ -10,7 +10,7 @@
#include <notebook/notebook.h> #include <notebook/notebook.h>
#include <notebook/node.h> #include <notebook/node.h>
#include <notebook/externalnode.h> #include <notebook/externalnode.h>
#include "exception.h" #include <core/exception.h>
#include "messageboxhelper.h" #include "messageboxhelper.h"
#include "vnotex.h" #include "vnotex.h"
#include "mainwindow.h" #include "mainwindow.h"