diff --git a/debian/changelog b/debian/changelog index 4c200e9..348c8c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ukui-search (0.2.0+0306) v101; urgency=medium + + * Feature: Add support for 'doc' file in file content search. + - 文本索引增加了对doc格式文件的支持。 + * Fix: There is no web search result when there is no local result. + - 修复没有本地搜索结果时不显示网页搜索列表的问题。 + * Fix:Files with special charactors can not be opened successfully. + - 修复带有特殊字符的文件无法正常打开的问题。 + * Fix:Occasional crash during the first boot of system. + - 修复了在系统首次启动时偶现的崩溃问题。 + + -- zhangpengfei Sat, 06 Mar 2021 11:03:20 +0800 + ukui-search (0.2.0+0301) v101; urgency=medium * Fix: New result won't be added to expanded list. diff --git a/libsearch/index/file-searcher.h b/libsearch/index/file-searcher.h index c7c3a40..6fe3520 100644 --- a/libsearch/index/file-searcher.h +++ b/libsearch/index/file-searcher.h @@ -28,8 +28,8 @@ #include #include #include -#define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/index_data").toStdString() -#define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/content_index_data").toStdString() +#define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString() +#define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/content_index_data").toStdString() class FileSearcher : public QObject diff --git a/libsearch/index/index-generator.cpp b/libsearch/index/index-generator.cpp index 5105058..b5ab7a6 100644 --- a/libsearch/index/index-generator.cpp +++ b/libsearch/index/index-generator.cpp @@ -33,8 +33,8 @@ #include -#define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/index_data").toStdString() -#define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/content_index_data").toStdString() +#define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString() +#define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/content_index_data").toStdString() static IndexGenerator *global_instance = nullptr; QMutex IndexGenerator::m_mutex; @@ -144,15 +144,28 @@ bool IndexGenerator::creatAllIndex(QQueue *messageList) IndexGenerator::IndexGenerator(bool rebuild, QObject *parent) : QObject(parent) { - if(rebuild) + QDir database(QString::fromStdString(INDEX_PATH)); + + if(database.exists()) { - QDir database(QString::fromStdString(INDEX_PATH)); - if(database.exists()) - qDebug()<<"remove"<