From 4b02fdbb34d2df2954420e35ce8fee59daa45bc6 Mon Sep 17 00:00:00 2001
From: rookie-J <jixiaoxu@kylinos.cn>
Date: Mon, 28 Jun 2021 19:38:27 +0800
Subject: [PATCH] Fix a bug for app match;

---
 libsearch/appsearch/app-match.cpp | 41 ++++++++++++++++++++++++++++---
 libsearch/appsearch/app-match.h   |  1 +
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/libsearch/appsearch/app-match.cpp b/libsearch/appsearch/app-match.cpp
index aca6503..4668447 100644
--- a/libsearch/appsearch/app-match.cpp
+++ b/libsearch/appsearch/app-match.cpp
@@ -228,10 +228,11 @@ void AppMatch::getDesktopFilePath() {
 }
 
 void AppMatch::getAppName(QMap<NameString, QStringList> &installed) {
-    QMap<NameString, QStringList>::const_iterator i;
-    for(i = m_installAppMap.constBegin(); i != m_installAppMap.constEnd(); ++i) {
-        appNameMatch(i.key().app_name, installed);
-    }
+//    QMap<NameString, QStringList>::const_iterator i;
+//    for(i = m_installAppMap.constBegin(); i != m_installAppMap.constEnd(); ++i) {
+//        appNameMatch(i.key().app_name, installed);
+//    }
+    appNameMatch(installed);
     qDebug() << "installed app match is successful!";
 }
 
@@ -276,6 +277,38 @@ void AppMatch::appNameMatch(QString appname, QMap<NameString, QStringList> &inst
         }
     }
 }
+void AppMatch::appNameMatch(QMap<NameString, QStringList> &installed) {
+    QStringList list;
+    NameString name;
+    QMapIterator<NameString, QStringList> iter(m_installAppMap);
+    while(iter.hasNext()) {
+        iter.next();
+        list = iter.value();
+        name.app_name = iter.key().app_name;
+        if(iter.key().app_name.contains(m_sourceText, Qt::CaseInsensitive)) {
+            installed.insert(name, list);
+            continue;
+        }
+
+        QStringList pinyinlist;
+        pinyinlist = FileUtils::findMultiToneWords(iter.key().app_name);
+
+        for(int i = 0; i < pinyinlist.size() / 2; i++) {
+            QString shouzimu = pinyinlist.at(2 * i + 1); // 中文转首字母
+            if(shouzimu.contains(m_sourceText, Qt::CaseInsensitive)) {
+                installed.insert(name, list);
+                continue;
+            }
+            if(m_sourceText.size() < 2)
+                continue;
+            QString pinyin = pinyinlist.at(2 * i); // 中文转拼音
+            if(pinyin.contains(m_sourceText, Qt::CaseInsensitive)) {
+                installed.insert(name, list);
+                continue;
+            }
+        }
+    }
+}
 
 void AppMatch::softWareCenterSearch(QMap<NameString, QStringList> &softwarereturn) {
 //    if(m_interFace->timeout() != -1) {
diff --git a/libsearch/appsearch/app-match.h b/libsearch/appsearch/app-match.h
index 253992e..6f51d15 100644
--- a/libsearch/appsearch/app-match.h
+++ b/libsearch/appsearch/app-match.h
@@ -65,6 +65,7 @@ private:
     void getAppName(QMap<NameString, QStringList> &installed);
 //    void appNameMatch(QString appname,QString desktoppath,QString appicon);
     void appNameMatch(QString appname, QMap<NameString, QStringList> &installed);
+    void appNameMatch(QMap<NameString, QStringList> &installed);
 
     void softWareCenterSearch(QMap<NameString, QStringList> &softwarereturn);