Merge lp:~mhr3/unity-lens-applications/ascii-fold-app-data into lp:unity-lens-applications

[Michal Hruby]

Ascii fold application data to make it easier to search.

[Gord Allott (gordallott)]

+1 looks good here

review: Approve

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2012-01-24 15:48:18 +0000
+++ src/unity-package-search.cc	2012-02-15 14:56:48 +0000
@@ -54,7 +54,7 @@
 
 extern "C"
 {
-extern gchar* unity_applications_lens_utils_uncamelcase (const gchar* input);
+extern gchar* unity_applications_lens_utils_preprocess_string (const gchar* input);
 }
 
 struct _UnityPackageSearcher
@@ -175,15 +175,25 @@
 	    indexer->set_document(doc);
       if (gmenu_tree_entry_get_display_name (entry))
       {
-        dum1 = unity_applications_lens_utils_uncamelcase (
+        dum1 = unity_applications_lens_utils_preprocess_string (
             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);
+      {
+        dum1 = unity_applications_lens_utils_preprocess_string (
+            gmenu_tree_entry_get_name (entry));
+        indexer->index_text(dum1, 5);
+        g_free (dum1);
+      }
       if (gmenu_tree_entry_get_comment (entry))
-        indexer->index_text(gmenu_tree_entry_get_comment (entry), 0);
+      {
+        dum1 = unity_applications_lens_utils_preprocess_string (
+            gmenu_tree_entry_get_comment (entry));
+        indexer->index_text (dum1, 0);
+        g_free (dum1);
+      }
 	    
 	    /* Index the XDG categories */
 	    appman = unity_app_info_manager_get_default ();
@@ -209,8 +219,10 @@
 	                                                    &len);
 	    for (i = 0; i < len; i++)
 	      {
-	        indexer->index_text (keywords[i], 3);
-	        indexer->index_text (keywords[i], 3, "KW");
+          dum1 = unity_applications_lens_utils_preprocess_string (keywords[i]);
+	        indexer->index_text (dum1, 3);
+	        indexer->index_text (dum1, 3, "KW");
+          g_free (dum1);
 	      }
 	    
 	    
 
=== modified file 'src/utils.vala'
--- src/utils.vala	2012-01-24 15:48:18 +0000
+++ src/utils.vala	2012-02-15 14:56:48 +0000
@@ -69,13 +69,30 @@
      * .desktop file */
     return actor;
   }
-  
+
   public bool is_search_empty (Unity.LensSearch search)
   {
     if (search.search_string == null) return true;
     return search.search_string == "";
   }
 
+  private static Dee.ICUTermFilter icu_filter;
+
+  public string preprocess_string (string text)
+  {
+    if (icu_filter == null)
+    {
+      icu_filter = new Dee.ICUTermFilter.ascii_folder ();
+    }
+
+    var uncamelcased = uncamelcase (text);
+    var folded = icu_filter.apply (uncamelcased);
+
+    if (uncamelcased == folded) return uncamelcased;
+    
+    return "%s\n%s".printf (uncamelcased, folded);
+  }
+
   private static Regex camelcase_matcher;
 
   public string uncamelcase (string text)
@@ -86,7 +103,7 @@
       {
         // 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:]]+",
+        camelcase_matcher = new Regex ("(?<=^|[^[:upper:]\\s])[[:upper:]]+[^[:upper:]]+",
                                        RegexCompileFlags.OPTIMIZE);
       }
       catch (Error e) { warning ("%s", e.message); }