Merge lp:~voluntatefaber/slingshot/bug919587 into lp:~elementary-pantheon/slingshot/trunk

[Andrea Basso]

[lp:~voluntatefaber/slingshot/bug919587]

170. By Andrea Basso on 2012-04-25

Slingshot now doesn't show duplicates in search as well

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/Backend/AppSystem.vala'
--- src/Backend/AppSystem.vala	2012-03-11 17:15:45 +0000
+++ src/Backend/AppSystem.vala	2012-04-25 19:37:18 +0000
@@ -163,10 +163,14 @@
         public SList<App> get_apps_by_name () {
 
             var sorted_apps = new SList<App> ();
+            string[] sorted_apps_execs = {};
 
             foreach (ArrayList<App> category in apps.values) {
                 foreach (App app in category) {
-                    sorted_apps.insert_sorted_with_data (app, Utils.sort_apps_by_name);
+                    if (!(app.exec in sorted_apps_execs)) {
+                        sorted_apps.insert_sorted_with_data (app, Utils.sort_apps_by_name);
+                        sorted_apps_execs += app.exec;
+                    }
                 }
             }
 
@@ -188,27 +192,29 @@
              * I've added a small multiplier when matching to a exec name, to give
              * more priority to app.name
             **/
+            string[] sorted_apps_execs = {};
             foreach (ArrayList<App> category in apps.values) {
                 foreach (App app in category) {
-                    
-                    if (search in app.name.down ()) {
-                        if (search == app.name.down ()[0:search.length])
-                            app.relevancy = 0.5 - app.popularity; // It must be minor than 1.0
-                        else
-                            app.relevancy = app.name.length / search.length - app.popularity;
-                        filtered.add (app);
-                    }
-
-                    else if (search in app.exec.down ()) {
-                        app.relevancy = app.exec.length / search.length * 10.0 - app.popularity;
-                        filtered.add (app);
-                    }
-
-                    else if (search in app.description.down ()) {
-                        app.relevancy = app.description.length / search.length - app.popularity;
-                        filtered.add (app);
-                    }
-
+                    if (!(app.exec in sorted_apps_execs)) {
+                        sorted_apps_execs += app.exec;
+                        if (search in app.name.down ()) {
+                            if (search == app.name.down ()[0:search.length])
+                                app.relevancy = 0.5 - app.popularity; // It must be minor than 1.0
+                            else
+                                app.relevancy = app.name.length / search.length - app.popularity;
+                            filtered.add (app);
+                        }
+    
+                        else if (search in app.exec.down ()) {
+                            app.relevancy = app.exec.length / search.length * 10.0 - app.popularity;
+                            filtered.add (app);
+                        }
+    
+                        else if (search in app.description.down ()) {
+                            app.relevancy = app.description.length / search.length - app.popularity;
+                            filtered.add (app);
+                        }
+                    }
                 }
             }