diff --git a/libsearch/appsearch/app-match.cpp b/libsearch/appsearch/app-match.cpp index 0e0269e..5301bcb 100644 --- a/libsearch/appsearch/app-match.cpp +++ b/libsearch/appsearch/app-match.cpp @@ -349,7 +349,7 @@ void AppMatch::run() { QDir androidPath(QDir::homePath() + "/.local/share/applications/"); if(androidPath.exists()) this->getAllDesktopFilePath(QDir::homePath() + "/.local/share/applications/"); - connect(m_watchAppDir, &QFileSystemWatcher::directoryChanged, this, [ = ](const QString & path) { + connect(m_watchAppDir, &QFileSystemWatcher::directoryChanged, this, [ = ](const QString & path) { this->getDesktopFilePath(); if(path == "/usr/share/applications/") { this->getAllDesktopFilePath("/usr/share/applications/"); diff --git a/libsearch/pluginmanage/search-plugin-manager.cpp b/libsearch/pluginmanage/search-plugin-manager.cpp index 54a943b..0eaf131 100644 --- a/libsearch/pluginmanage/search-plugin-manager.cpp +++ b/libsearch/pluginmanage/search-plugin-manager.cpp @@ -2,6 +2,7 @@ #include "search-plugin-manager.h" #include "file-search-plugin.h" #include "app-search-plugin.h"- +#include "settings-search-plugin.h" using namespace Zeeker; @@ -12,6 +13,7 @@ SearchPluginManager::SearchPluginManager(QObject *parent) registerPlugin(new DirSearchPlugin(this)); registerPlugin(new FileContengSearchPlugin(this)); registerPlugin(new AppSearchPlugin(this)); + registerPlugin(new SettingsSearchPlugin(this)); } bool SearchPluginManager::registerPlugin(Zeeker::SearchPluginIface *plugin) diff --git a/libsearch/settingsearch/setting-match.cpp b/libsearch/settingsearch/setting-match.cpp index 89b3c9e..69b86fd 100644 --- a/libsearch/settingsearch/setting-match.cpp +++ b/libsearch/settingsearch/setting-match.cpp @@ -59,7 +59,7 @@ void SettingsMatch::xmlElement() { while(!node.isNull()) { QDomElement element = node.toElement(); - QString key = element.attribute("name");; + QString key = element.attribute("name"); m_chine_searchResult = m_chine_searchList.value(key); m_English_searchResult = m_English_searchList.value(key); QDomNodeList list = element.childNodes(); diff --git a/libsearch/settingsearch/settings-search-plugin.cpp b/libsearch/settingsearch/settings-search-plugin.cpp new file mode 100644 index 0000000..7cde228 --- /dev/null +++ b/libsearch/settingsearch/settings-search-plugin.cpp @@ -0,0 +1,192 @@ +#include +#include +#include +#include "settings-search-plugin.h" +#include "file-utils.h" +using namespace Zeeker; + +SettingsSearchPlugin::SettingsSearchPlugin(QObject *parent) : QObject(parent) +{ + SearchPluginIface::Actioninfo open { 0, tr("Open")}; + m_actionInfo << open; + m_pool.setMaxThreadCount(1); + m_pool.setExpiryTimeout(1000); + xmlElement(); +} + +const QString SettingsSearchPlugin::name() +{ + return tr("Settings Search"); +} + +const QString SettingsSearchPlugin::description() +{ + return tr("Settings search."); +} + +QString SettingsSearchPlugin::getPluginName() +{ + return tr("Settings Search"); +} + +void Zeeker::SettingsSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) +{ + QStringList pinyinlist; + ResultInfo resultInfo; + resultInfo.type = 0; + QLocale ql; + if (ql.language() == QLocale::Chinese) { + for (auto i = m_chineseSearchList.constBegin(); i != m_chineseSearchList.constEnd(); ++i) { + QStringList regmatch = *i; + QString key = i.key(); + for (int t = 0; t < regmatch.size(); t++) { + if (keyword == "/") + continue; + QString str = regmatch.at(t); + if (str.contains(keyword)) { + resultInfo.name = str;//中文名 + str = key + "/" + str; + resultInfo.icon = FileUtils::getSettingIcon(str, true); + resultInfo.actionKey = str; + searchResult->append(resultInfo); + continue; + } + + pinyinlist = FileUtils::findMultiToneWords(str); + for (int i = 0; i < pinyinlist.size() / 2; i++) { + str = regmatch.at(t); + QString shouzimu = pinyinlist.at(2 * i + 1); // 中文转首字母 + if (shouzimu.contains(keyword, Qt::CaseInsensitive)) { + resultInfo.name = str; + str = key + "/" + str; + resultInfo.icon = FileUtils::getSettingIcon(str, true); + resultInfo.actionKey = str; + searchResult->append(resultInfo); + break; + } + if (keyword.size() < 2) + break; + QString pinyin = pinyinlist.at(2 * i); // 中文转拼音 + if (pinyin.contains(keyword, Qt::CaseInsensitive)) { + resultInfo.name = str; + str = key + "/" + str; + resultInfo.icon = FileUtils::getSettingIcon(str, true); + resultInfo.actionKey = str; + searchResult->append(resultInfo); + break; + } + } + } + } + } + if (ql.language() == QLocale::English) { + for (auto i = m_englishSearchList.constBegin(); i != m_englishSearchList.constEnd(); ++i) { + QStringList regmatch = *i; + QString key = i.key(); + for (int t = 0; t < regmatch.size(); t++) { + if (keyword == "/") + continue; + QString str = regmatch.at(t); + if (str.contains(keyword, Qt::CaseInsensitive)) { + resultInfo.name = str; + str = key + "/" + str; + resultInfo.icon = FileUtils::getSettingIcon(str, true); + resultInfo.actionKey = str; + searchResult->append(resultInfo); + } + } + } + } +} + +QList SettingsSearchPlugin::getActioninfo(int type) +{ + return m_actionInfo; +} + +void SettingsSearchPlugin::openAction(int actionkey, QString key, int type) +{ + //TODO add some return message here. + QProcess process; + switch (actionkey) { + case 0: + //打开控制面板对应页面 + if (key.left(key.indexOf("/")).toLower() == "wallpaper") + process.startDetached(QString("ukui-control-center --background")); + else + process.startDetached(QString("ukui-control-center --%1").arg(key.left(key.indexOf("/")).toLower())); + break; + + default: + break; + } +} + +/** + * @brief SettingsSearchPlugin::xmlElement + * 将xml文件内容读到内存 + */ +void SettingsSearchPlugin::xmlElement() { + + QString environment = QProcessEnvironment::systemEnvironment().value("XDG_SESSION_TYPE"); + QString version; + QFile file(QString::fromLocal8Bit("/usr/share/ukui-control-center/shell/res/search.xml")); + if(!file.open(QIODevice::ReadOnly)) { + return; + } + QDomDocument doc; + doc.setContent(&file); + QDomElement root = doc.documentElement(); + QDomNode node = root.previousSibling(); + node = root.firstChild(); + + QString chineseIndex; + QString englishIndex; + QStringList chineSearchResult; + QStringList englishSearchResult; + while (!node.isNull()) { + QDomElement element = node.toElement(); + QString key = element.attribute("name"); + chineSearchResult = m_chineseSearchList.value(key); + englishSearchResult = m_englishSearchList.value(key); + QDomNodeList list = element.childNodes(); + for (int i = 0; i < list.count(); ++i) { + QDomNode n = list.at(i); + + if (n.nodeName() == QString::fromLocal8Bit("Environment")) { + version=n.toElement().text(); + if ((version == "v101" && environment == "wayland") + || (version == "hw990" && environment == "x11")) { + break; + } + continue; + } + + if (n.nodeName() == QString::fromLocal8Bit("ChinesePlugin") + or n.nodeName() == QString::fromLocal8Bit("ChineseFunc")) { + chineseIndex = n.toElement().text(); + if (chineseIndex.isEmpty()) { + continue; + } + if (chineSearchResult.contains(chineseIndex)) { + continue; + } else { + chineSearchResult.append(chineseIndex); + } + } + + if (n.nodeName() == QString::fromLocal8Bit("EnglishFunc")) { + englishIndex = QString::fromLocal8Bit("/") + n.toElement().text(); + if (englishIndex.isEmpty()) { + continue; + } + englishSearchResult.append(englishIndex); + } + } + + m_chineseSearchList.insert(key, chineSearchResult); + m_englishSearchList.insert(key, englishSearchResult); + node = node.nextSibling(); + } + file.close(); +} diff --git a/libsearch/settingsearch/settings-search-plugin.h b/libsearch/settingsearch/settings-search-plugin.h new file mode 100644 index 0000000..d987398 --- /dev/null +++ b/libsearch/settingsearch/settings-search-plugin.h @@ -0,0 +1,37 @@ +#ifndef SETTINGSSEARCHPLUGIN_H +#define SETTINGSSEARCHPLUGIN_H + +#include +#include +#include "search-plugin-iface.h" + +namespace Zeeker { +class LIBSEARCH_EXPORT SettingsSearchPlugin : public QObject, public SearchPluginIface +{ + Q_OBJECT +public: + SettingsSearchPlugin(QObject *parent = nullptr); + PluginType pluginType() {return PluginType::SearchPlugin;} + const QString name(); + const QString description(); + const QIcon icon() {return QIcon::fromTheme("folder");} + void setEnable(bool enable) {m_enable = enable;} + bool isEnable() {return m_enable;} + QString getPluginName(); + + void KeywordSearch(QString keyword,DataQueue *searchResult); + QList getActioninfo(int type); + void openAction(int actionkey, QString key, int type); + +private: + void xmlElement(); + + QMap m_chineseSearchList; + QMap m_englishSearchList; + + bool m_enable = true; + QList m_actionInfo; + QThreadPool m_pool; +}; +} +#endif // SETTINGSSEARCHPLUGIN_H diff --git a/libsearch/settingsearch/settingsearch.pri b/libsearch/settingsearch/settingsearch.pri index b57feb7..2ca2624 100644 --- a/libsearch/settingsearch/settingsearch.pri +++ b/libsearch/settingsearch/settingsearch.pri @@ -2,6 +2,8 @@ INCLUDEPATH += $$PWD HEADERS += \ $$PWD/setting-match.h \ + $$PWD/settings-search-plugin.h SOURCES += \ $$PWD/setting-match.cpp \ + $$PWD/settings-search-plugin.cpp diff --git a/translations/libukui-search/libukui-search_zh_CN.ts b/translations/libukui-search/libukui-search_zh_CN.ts index f2175a2..a7c6f64 100644 --- a/translations/libukui-search/libukui-search_zh_CN.ts +++ b/translations/libukui-search/libukui-search_zh_CN.ts @@ -147,4 +147,23 @@ 修改时间： + + Zeeker::SettingsSearchPlugin + + + Open + 打开 + + + + + Settings Search + 设置 + + + + Settings search. + 设置。 + +