Merge lp:~mhr3/unity-lens-applications/camelcase-friendly-index into lp:unity-lens-applications

[Michal Hruby]

Split CamelCase words from application names before feeding them to xapian, which allows us to search for any part of the name.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good and manual testing confirms that this works. Before I approve it can you queue a testcase in TESTS-TODO.txt?

review: Needs Fixing

[Michal Hruby (mhr3)]

Done.

[lp:~mhr3/unity-lens-applications/camelcase-friendly-index]

263. By Michal Hruby on 2012-01-25

Add test desciption

[Mikkel Kamstrup Erlandsen (kamstrup)]

review: Approve

=== modified file 'TESTS-TODO.txt'
--- TESTS-TODO.txt	2012-01-19 12:12:06 +0000
+++ TESTS-TODO.txt	2012-01-25 08:25:28 +0000
@@ -10,5 +10,8 @@
 2) Start a search with non-sensical string and check that it returns 0 results
    and that the "no-results-hint" is set in the method reply.
 
+3) Make sure it's possible to search for CamelCase apps by searching "case",
+   plus this should properly work with accented characters as well.
+
 More to come...
 

=== modified file 'configure.ac'
--- configure.ac	2012-01-12 15:29:22 +0000
+++ configure.ac	2012-01-25 08:25:28 +0000
@@ -18,6 +18,7 @@
 AM_PROG_VALAC([0.12.1])
 AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
 AC_PROG_CC
+AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_HEADER_STDC
 AC_LANG([C++])

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-01-18 17:02:52 +0000
+++ src/Makefile.am	2012-01-25 08:25:28 +0000
@@ -61,10 +61,10 @@
   $(NULL)
 
 unity-package-search.o : $(srcdir)/unity-package-search.cc $(srcdir)/unity-package-search.h
-	g++ -g $(unity_package_search_libs) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu unity gee-1.0` -c $(srcdir)/unity-package-search.cc
+	$(AM_V_GEN)$(CXX) -g $(unity_package_search_libs) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu unity gee-1.0` -c $(srcdir)/unity-package-search.cc
 
 unity-ratings-db.o : $(srcdir)/unity-ratings-db.c $(srcdir)/unity-ratings-db.h
-	gcc -g $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(srcdir)/unity-ratings-db.c
+	$(AM_V_CC)$(CC) -g $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(srcdir)/unity-ratings-db.c
 
 unity_applications_daemon_SOURCES = \
   $(unity_applications_daemon_VALASOURCES:.vala=.c) \

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-24 16:20:35 +0000
+++ src/daemon.vala	2012-01-25 08:25:28 +0000
@@ -357,16 +357,10 @@
       scope.queue_search_changed (SearchType.GLOBAL);
     }
 
-    private string prepare_zg_search_string (Unity.LensSearch? search,
+    private string prepare_zg_search_string (Unity.LensSearch search,
                                              string type_id="all")
     {
-      string s;
-      if (search != null)
-        s = search.search_string;
-      else
-        s = "";
-
-      s = s.strip ();
+      string s = search.search_string.strip ();
       
       if (!s.has_suffix ("*") && s != "")
         s = s + "*";
@@ -397,7 +391,7 @@
 
       string pkg_search_string = prepare_pkg_search_string (search, type_id);
 
-      bool has_search = !Utils.search_is_invalid (search);
+      bool has_search = !Utils.is_search_empty (search);
       
       Timer timer = new Timer ();
 
@@ -475,7 +469,7 @@
         else
         {
           timer.start ();
-          string? filter_query = prepare_pkg_search_string (null, type_id);
+          string? filter_query = prepare_pkg_search_string (search, type_id);
           var random_pkgresults = pkgsearcher.get_random_apps (filter_query, 12);
           add_pkg_search_result (random_pkgresults, installed_uris, available_uris,
                                  model, Category.AVAILABLE, 6);
@@ -502,7 +496,7 @@
        * hits under one Applications category
        */
       
-      if (Utils.search_is_invalid (search))
+      if (Utils.is_search_empty (search))
         {
           yield update_global_without_search (search, cancellable);
           return;
@@ -576,9 +570,9 @@
       search.finished ();
     }
     
-    private string prepare_pkg_search_string (Unity.LensSearch? search, string type_id="all")
+    private string prepare_pkg_search_string (Unity.LensSearch search, string type_id="all")
     {
-      if (Utils.search_is_invalid (search))
+      if (Utils.is_search_empty (search))
         {
           if (type_id == "all")
             return "type:Application";

=== modified file 'src/runner.vala'
--- src/runner.vala	2011-12-07 16:21:04 +0000
+++ src/runner.vala	2012-01-25 08:25:28 +0000
@@ -139,7 +139,7 @@
       model.clear ();
 
       var search_string = search.search_string;
-      bool has_search = !Utils.search_is_invalid (search);
+      bool has_search = !Utils.is_search_empty (search);
 
       string uri;      
       Icon icon;

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2011-09-27 12:22:51 +0000
+++ src/unity-package-search.cc	2012-01-25 08:25:28 +0000
@@ -52,6 +52,11 @@
 
 #include "unity-package-search.h"
 
+extern "C"
+{
+extern gchar* unity_applications_lens_utils_uncamelcase (const gchar* input);
+}
+
 struct _UnityPackageSearcher
 {
   Xapian::Database    *db;
@@ -169,14 +174,19 @@
 	    /* Index full text data */
 	    indexer->set_document(doc);
       if (gmenu_tree_entry_get_display_name (entry))
-        indexer->index_text(gmenu_tree_entry_get_display_name (entry), 5);
+      {
+        dum1 = unity_applications_lens_utils_uncamelcase (
+            gmenu_tree_entry_get_display_name (entry));
+        indexer->index_text(dum1, 5);
+        g_free (dum1);
+      }
       if (gmenu_tree_entry_get_name (entry))
         indexer->index_text(gmenu_tree_entry_get_name (entry), 5);
       if (gmenu_tree_entry_get_comment (entry))
         indexer->index_text(gmenu_tree_entry_get_comment (entry), 0);
 	    
 	    /* Index the XDG categories */
-	    appman = unity_app_info_manager_get_instance ();
+	    appman = unity_app_info_manager_get_default ();
 	    cats = unity_app_info_manager_get_categories (appman, // const return
 	                                                  gmenu_tree_entry_get_desktop_file_id (entry),
 	                                                  &len);

=== modified file 'src/unity-ratings-db.c'
--- src/unity-ratings-db.c	2011-09-23 12:49:07 +0000
+++ src/unity-ratings-db.c	2012-01-25 08:25:28 +0000
@@ -168,7 +168,7 @@
   if (data.size != 3*sizeof (gint32))
     {
       g_critical ("Unexpected datum size from ratings database %i bytes. "
-                  "Expected %i bytes", data.size, 3*sizeof (gint32));
+                  "Expected %lu bytes", data.size, 3*sizeof (gint32));
       goto not_found;
     }
   

=== modified file 'src/utils.vala'
--- src/utils.vala	2011-12-06 15:25:46 +0000
+++ src/utils.vala	2012-01-25 08:25:28 +0000
@@ -70,18 +70,52 @@
     return actor;
   }
   
-  public bool search_is_invalid (Unity.LensSearch? search)
+  public bool is_search_empty (Unity.LensSearch search)
   {
-    /* This boolean expression is unfolded as we seem to get
-    * some null dereference if we join them in a big || expression */
-    if (search == null)
-        return true;
-    else if (search.search_string == null)
-        return true;
-  
+    if (search.search_string == null) return true;
     return search.search_string == "";
   }
-  
+
+  private static Regex camelcase_matcher;
+
+  public string uncamelcase (string text)
+  {
+    if (camelcase_matcher == null)
+    {
+      try
+      {
+        // 1+ upper characters followed by 1+ non-upper 
+        // (but preceded by non-upper or start of the string)
+        camelcase_matcher = new Regex ("(?<=^|[^[:upper:]])[[:upper:]]+[^[:upper:]]+",
+                                       RegexCompileFlags.OPTIMIZE);
+      }
+      catch (Error e) { warning ("%s", e.message); }
+    }
+
+    /* we want to do "pyKaraoke" -> "py Karaoke",
+       "CompizConfig" -> "Compiz Config", but leave "System Monitor" alone
+     */
+    try
+    {
+      string result;
+      result = camelcase_matcher.replace_eval (text, -1, 0, 0,(mi, builder) =>
+      {
+        int start_pos;
+        mi.fetch_pos (0, out start_pos, null);
+        if (start_pos != 0) builder.append_c (' ');
+        builder.append (mi.fetch (0));
+
+        return false;
+      });
+      return result;
+    }
+    catch (Error e)
+    {
+      warning ("%s", e.message);
+      return text;
+    }
+  }
+
   /* Substitute tilde character in @s by the home directory.
    * Expansion of ~username also works if 'username' is found. */
   public string subst_tilde (string s)