forked from linuxdeepin/dde-file-manager
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add full-text search status widget
- Add CheckBoxWidthTextIndex widget for full-text search settings - Add TextIndexStatusBar to display indexing progress and status - Add task progress tracking and status persistence - Refactor settings dialog widget registration mechanism - Remove /root from index skip list This change improves the full-text search user experience by adding visual feedback for indexing status and progress. Log:
- Loading branch information
1 parent
7a60b1b
commit 763e8f9
Showing
16 changed files
with
356 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
195 changes: 195 additions & 0 deletions
195
src/plugins/filemanager/dfmplugin-search/utils/checkboxwidthtextindex.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| // SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. | ||
| // SPDX-License-Identifier: GPL-3.0-or-later | ||
| #include "checkboxwidthtextindex.h" | ||
|
|
||
| #include "utils/textindexclient.h" | ||
| #include "searchmanager/searchmanager.h" | ||
|
|
||
| #include <QVBoxLayout> | ||
| #include <QJsonDocument> | ||
| #include <QJsonObject> | ||
| #include <QFile> | ||
| #include <QStandardPaths> | ||
|
|
||
| namespace dfmplugin_search { | ||
|
|
||
| TextIndexStatusBar::TextIndexStatusBar(QWidget *parent) | ||
| : QWidget { parent } | ||
| { | ||
| setContentsMargins(4, 0, 0, 0); | ||
|
|
||
| // 创建水平布局 | ||
| QHBoxLayout *layout = new QHBoxLayout(this); | ||
| layout->setContentsMargins(0, 0, 0, 0); | ||
| layout->setSpacing(5); | ||
| setLayout(layout); | ||
|
|
||
| // 创建控件 | ||
| spinner = new DTK_NAMESPACE::Widget::DSpinner(this); | ||
| spinner->setFixedSize(16, 16); | ||
|
|
||
| iconLabel = new DTK_NAMESPACE::Widget::DTipLabel("", this); | ||
| iconLabel->setFixedSize(16, 16); | ||
| iconLabel->setPixmap(QIcon::fromTheme("dialog-ok").pixmap(16, 16)); | ||
|
|
||
| msgLabel = new DTK_NAMESPACE::Widget::DTipLabel("", this); | ||
| msgLabel->setAlignment(Qt::AlignLeft); | ||
| msgLabel->setWordWrap(true); | ||
|
|
||
| // 添加到布局 | ||
| layout->addWidget(spinner); | ||
| layout->addWidget(iconLabel); | ||
| layout->addWidget(msgLabel, 1); | ||
| layout->addStretch(); | ||
|
|
||
| // 初始状态 | ||
| spinner->hide(); | ||
| iconLabel->show(); | ||
| hide(); | ||
| } | ||
|
|
||
| void TextIndexStatusBar::setRunning(bool running) | ||
| { | ||
| if (running) { | ||
| spinner->show(); | ||
| spinner->start(); | ||
| iconLabel->hide(); | ||
| } else { | ||
| spinner->hide(); | ||
| spinner->stop(); | ||
| iconLabel->show(); | ||
| } | ||
| } | ||
|
|
||
| void TextIndexStatusBar::setStatus(Status status, const QVariant &data) | ||
| { | ||
| currentStatus = status; | ||
|
|
||
| switch (status) { | ||
| case Status::Indexing: | ||
| setRunning(true); | ||
| updateIndexingProgress(data.toLongLong()); | ||
| break; | ||
| case Status::Completed: { | ||
| setRunning(false); | ||
| QString lastTime = getLastUpdateTime(); | ||
| msgLabel->setText(tr("Index update completed, last update time: %1").arg(lastTime)); | ||
| iconLabel->setPixmap(QIcon::fromTheme("dialog-ok").pixmap(16, 16)); | ||
| break; | ||
| } | ||
| case Status::Failed: | ||
| setRunning(false); | ||
| msgLabel->setText(tr("Index update failed, please turn on the \"Full-Text search\" switch again")); | ||
| iconLabel->setPixmap(QIcon::fromTheme("dialog-error").pixmap(16, 16)); | ||
| break; | ||
| case Status::Hidden: | ||
| hide(); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| void TextIndexStatusBar::updateIndexingProgress(qlonglong count) | ||
| { | ||
| if (currentStatus == Status::Indexing) { | ||
| msgLabel->setText(tr("Building index, %1 files indexed").arg(count)); | ||
| } | ||
| } | ||
|
|
||
| QString TextIndexStatusBar::getLastUpdateTime() | ||
| { | ||
| static const QString kPath = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() | ||
| + "/deepin/dde-file-manager/index"; | ||
| // 读取 index_status.json | ||
| QFile file(kPath + "/index_status.json"); | ||
| if (!file.open(QIODevice::ReadOnly)) { | ||
| return QString(); | ||
| } | ||
|
|
||
| QJsonDocument doc = QJsonDocument::fromJson(file.readAll()); | ||
| file.close(); | ||
|
|
||
| if (doc.isObject()) { | ||
| QJsonObject obj = doc.object(); | ||
| if (obj.contains("lastUpdateTime")) { | ||
| QDateTime time = QDateTime::fromString(obj["lastUpdateTime"].toString(), Qt::ISODate); | ||
| return time.toString("yyyy-MM-dd hh:mm:ss"); | ||
| } | ||
| } | ||
| return QString(); | ||
| } | ||
|
|
||
| TextIndexStatusBar::Status TextIndexStatusBar::status() const | ||
| { | ||
| return currentStatus; | ||
| } | ||
|
|
||
| CheckBoxWidthTextIndex::CheckBoxWidthTextIndex(QWidget *parent) | ||
| : QWidget { parent } | ||
| { | ||
| setContentsMargins(0, 0, 0, 0); | ||
| QVBoxLayout *layout = new QVBoxLayout(this); | ||
| layout->setContentsMargins(0, 0, 0, 0); | ||
| setLayout(layout); | ||
|
|
||
| checkBox = new QCheckBox(this); | ||
| statusBar = new TextIndexStatusBar(this); | ||
| layout->addWidget(checkBox); | ||
| layout->addWidget(statusBar); | ||
|
|
||
| connect(checkBox, &QCheckBox::stateChanged, this, [this](int state) { | ||
| if (state == Qt::Checked) { | ||
| statusBar->show(); | ||
| auto client = TextIndexClient::instance(); | ||
| auto running = client->hasRunningRootTask(); | ||
| if (running.has_value()) { | ||
| if (running.value()) { | ||
| statusBar->setStatus(TextIndexStatusBar::Status::Indexing); | ||
| } else { | ||
| QString lastTime = statusBar->getLastUpdateTime(); | ||
| statusBar->setStatus(lastTime.isEmpty() ? TextIndexStatusBar::Status::Failed : TextIndexStatusBar::Status::Completed); | ||
| } | ||
| } | ||
| } else { | ||
| statusBar->setStatus(TextIndexStatusBar::Status::Hidden); | ||
| } | ||
| emit stateChanged(state); | ||
| }); | ||
|
|
||
| auto client = TextIndexClient::instance(); | ||
| connect(client, &TextIndexClient::taskProgressChanged, | ||
| this, [this](TextIndexClient::TaskType type, const QString &path, qlonglong count) { | ||
| fmDebug() << "Index task changed:" << type << path << count; | ||
| if (checkBox->isChecked() && path == "/") { | ||
| if (statusBar->status() != TextIndexStatusBar::Status::Indexing) { | ||
| statusBar->setStatus(TextIndexStatusBar::Status::Indexing); | ||
| } | ||
| statusBar->updateIndexingProgress(count); | ||
| } | ||
| }); | ||
|
|
||
| connect(client, &TextIndexClient::taskFinished, | ||
| this, [this](TextIndexClient::TaskType type, const QString &path, bool success) { | ||
| if (checkBox->isChecked() && path == "/") { | ||
| statusBar->setStatus(success ? TextIndexStatusBar::Status::Completed : TextIndexStatusBar::Status::Failed); | ||
| } | ||
| }); | ||
|
|
||
| connect(SearchManager::instance(), &SearchManager::enableFullTextSearchChanged, | ||
| this, [this](bool enable) { | ||
| setChecked(enable); | ||
| }); | ||
| } | ||
|
|
||
| void CheckBoxWidthTextIndex::setDisplayText(const QString &text) | ||
| { | ||
| if (checkBox) | ||
| checkBox->setText(text); | ||
| } | ||
|
|
||
| void CheckBoxWidthTextIndex::setChecked(bool checked) | ||
| { | ||
| if (checkBox) | ||
| checkBox->setChecked(checked); | ||
| } | ||
|
|
||
| } // namespace dfmplugin_search |
55 changes: 55 additions & 0 deletions
55
src/plugins/filemanager/dfmplugin-search/utils/checkboxwidthtextindex.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. | ||
| // SPDX-License-Identifier: GPL-3.0-or-later | ||
| #ifndef CHECKBOXWIDTHTEXTINDEX_H | ||
| #define CHECKBOXWIDTHTEXTINDEX_H | ||
|
|
||
| #include <DTipLabel> | ||
| #include <DSpinner> | ||
|
|
||
| #include <QCheckBox> | ||
|
|
||
| namespace dfmplugin_search { | ||
|
|
||
| class TextIndexStatusBar : public QWidget | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| enum class Status { | ||
| Indexing, // 正在更新 | ||
| Completed, // 更新完成 | ||
| Failed, // 更新失败 | ||
| Hidden // 隐藏状态 | ||
| }; | ||
|
|
||
| explicit TextIndexStatusBar(QWidget *parent = nullptr); | ||
| void setStatus(Status status, const QVariant &data = QVariant()); | ||
| void updateIndexingProgress(qlonglong count); | ||
| void setRunning(bool running); | ||
| QString getLastUpdateTime(); | ||
| Status status() const; | ||
|
|
||
| private: | ||
| Status currentStatus { Status::Hidden }; | ||
| DTK_NAMESPACE::Widget::DSpinner *spinner { nullptr }; | ||
| DTK_NAMESPACE::Widget::DTipLabel *iconLabel { nullptr }; | ||
| DTK_NAMESPACE::Widget::DTipLabel *msgLabel { nullptr }; | ||
| }; | ||
|
|
||
| class CheckBoxWidthTextIndex : public QWidget | ||
| { | ||
| Q_OBJECT | ||
| public: | ||
| explicit CheckBoxWidthTextIndex(QWidget *parent = nullptr); | ||
| void setDisplayText(const QString &text); | ||
| void setChecked(bool checked); | ||
|
|
||
| Q_SIGNALS: | ||
| void stateChanged(int); | ||
|
|
||
| private: | ||
| QCheckBox *checkBox { nullptr }; | ||
| TextIndexStatusBar *statusBar { nullptr }; | ||
| }; | ||
| } // namespace dfmplugin_search | ||
| #endif // CHECKBOXWIDTHTEXTINDEX_H |
Oops, something went wrong.