Merge lp:~unity-api-team/unity-scope-click/remove_accents_from_search into lp:unity-scope-click

[Antti Kaijanmäki]

libclickscope/click/interface.cpp: remove accents and use QString::compare() to find matches

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:419
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/710/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/110/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/710/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/unity-scope-click/remove_accents_from_search]

420. By Antti Kaijanmäki on 2016-03-03

Add test.

421. By Antti Kaijanmäki on 2016-03-03

Accended -> Accented

422. By Antti Kaijanmäki on 2016-03-03

add second test

[dobey (dobey)]

Looks ok.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:422
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/727/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/127/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/727/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2016-01-04 20:56:17 +0000
+++ libclickscope/click/interface.cpp	2016-03-03 14:30:59 +0000
@@ -31,6 +31,7 @@
 #include <QDir>
 #include <QProcess>
 #include <QStandardPaths>
+#include <QString>
 #include <QTimer>
 
 #include <cstdio>
@@ -56,6 +57,34 @@
 
 #include <click/click-i18n.h>
 
+namespace {
+
+/* Thanks to
+ *   - http://stackoverflow.com/a/14031349
+ *   - http://stackoverflow.com/questions/12278448/removing-accents-from-a-qstring
+ */
+QString unaccent(const QString &str)
+{
+    QString tmp = str.normalized(QString::NormalizationForm_KD,
+                                 QChar::currentUnicodeVersion());
+    QString ret;
+    for (int i = 0, j = tmp.length();
+         i < j;
+         i++) {
+
+        // strip diacritic marks
+        if (tmp.at(i).category() != QChar::Mark_NonSpacing       &&
+            tmp.at(i).category() != QChar::Mark_SpacingCombining &&
+            tmp.at(i).category() != QChar::Mark_Enclosing) {
+            ret.append(tmp.at(i));
+        }
+    }
+
+    return ret;
+}
+
+}
+
 namespace click {
 
 const std::unordered_set<std::string>& nonClickDesktopFiles()
@@ -343,26 +372,22 @@
             if (search_query.empty()) {
                 result.push_back(app);
             } else {
-                std::string lquery = search_query;
-                std::transform(lquery.begin(), lquery.end(),
-                               lquery.begin(), ::tolower);
+                QString lquery = ::unaccent(QString::fromStdString(search_query));
+
                 // Check keywords for the search query as well.
-                for (auto keyword: app.keywords) {
-                    std::transform(keyword.begin(), keyword.end(),
-                                   keyword.begin(), ::tolower);
-                    if (!keyword.empty()
-                        && keyword.find(lquery) != std::string::npos) {
+                for (auto kwd: app.keywords) {
+                    QString keyword = ::unaccent(QString::fromStdString(kwd));
+                    if (!keyword.isEmpty()
+                        && keyword.contains(lquery, Qt::CaseInsensitive)) {
                         result.push_back(app);
                         return;
                     }
                 }
 
-                std::string search_title = app.title;
-                std::transform(search_title.begin(), search_title.end(),
-                               search_title.begin(), ::tolower);
+                QString search_title = ::unaccent(QString::fromStdString(app.title));
                 // check the app title for the search query.
-                if (!search_title.empty()
-                    && search_title.find(lquery) != std::string::npos) {
+                if (!search_title.isEmpty()
+                    && search_title.contains(lquery, Qt::CaseInsensitive)) {
                     result.push_back(app);
                 }
             }
 
=== added file 'libclickscope/tests/applications/user/com.ubuntu.accented_accented_0.5.29.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.accented_accented_0.5.29.desktop	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.accented_accented_0.5.29.desktop	2016-03-03 14:30:59 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Exec=aa-exec-click -p com.ubuntu.accented_accented_0.5.29 -- qmlscene ./ubuntu-accented-app.qml -I ./plugins
+Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.accented/./accented64.png
+Name=Cámara
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage
+
+Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.accented
+X-Ubuntu-Old-Icon=./accented64.png
+X-Ubuntu-Application-ID=com.ubuntu.accented_accented_0.5.29
 
=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2016-01-04 20:56:17 +0000
+++ libclickscope/tests/test_interface.cpp	2016-03-03 14:30:59 +0000
@@ -365,6 +365,35 @@
     EXPECT_EQ(1, results.size());
 }
 
+TEST(ClickInterface, testFindAppAccented)
+{
+    QSharedPointer<click::KeyFileLocator> keyFileLocator(
+                new click::KeyFileLocator(
+                    testing::systemApplicationsDirectoryForTesting(),
+                    testing::userApplicationsDirectoryForTesting()));
+
+    click::Interface iface(keyFileLocator);
+
+    auto results = iface.find_installed_apps("Cámara");
+
+    EXPECT_EQ(1, results.size());
+}
+
+TEST(ClickInterface, testFindAppAccented2)
+{
+    QSharedPointer<click::KeyFileLocator> keyFileLocator(
+                new click::KeyFileLocator(
+                    testing::systemApplicationsDirectoryForTesting(),
+                    testing::userApplicationsDirectoryForTesting()));
+
+    click::Interface iface(keyFileLocator);
+
+    auto results = iface.find_installed_apps("Camara");
+
+    EXPECT_EQ(1, results.size());
+}
+
+
 TEST(ClickInterface, testIsIconIdentifier)
 {
     EXPECT_TRUE(Interface::is_icon_identifier("contacts-app"));