Merge lp:~julien-spautz/slingshot/remove-unused-functions into lp:~elementary-pantheon/slingshot/trunk

[Julien Spautz]

Removed some functions rendered useless by the new Synapse backend and minor code cleanup

Removed some functions rendered useless by the new synapse backend.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-12 09:36:00 +0000
+++ CMakeLists.txt	2014-08-16 15:16:33 +0000
@@ -127,4 +127,3 @@
 
 # Translations
 add_subdirectory (po)
-
 
=== modified file 'src/Backend/AppSystem.vala'
--- src/Backend/AppSystem.vala	2014-06-12 09:36:00 +0000
+++ src/Backend/AppSystem.vala	2014-08-16 15:16:33 +0000
@@ -32,7 +32,6 @@
     public signal void changed ();
 
     construct {
-
 #if HAVE_ZEITGEIST
         rl_service = new RelevancyService ();
         rl_service.update_complete.connect (update_popularity);
@@ -45,11 +44,9 @@
         categories = new Gee.ArrayList<GMenu.TreeDirectory> ();
 
         update_app_system ();
-
     }
 
     private void update_app_system () {
-
         debug ("Updating Applications menu tree...");
 #if HAVE_ZEITGEIST
         rl_service.refresh_popularity ();
@@ -64,11 +61,9 @@
         update_apps ();
 
         changed ();
-
     }
 
     private void update_categories_index () {
-
         categories.clear ();
 
         var iter = apps_menu.get_root_directory ().iter ();
@@ -80,12 +75,10 @@
                     categories.add (dir);
             }
         }
-
     }
 
 #if HAVE_ZEITGEIST
     private void update_popularity () {
-
         foreach (Gee.ArrayList<App> category in apps.values)
             foreach (App app in category)
                 app.popularity = rl_service.get_app_popularity (app.desktop_id);
@@ -93,23 +86,16 @@
 #endif
 
     private void update_apps () {
-
         apps.clear ();
-
-        foreach (var cat in categories) {
+        foreach (var cat in categories)
             apps.set (cat.get_name (), get_apps_by_category (cat));
-        }
-
     }
 
     public Gee.ArrayList<GMenu.TreeDirectory> get_categories () {
-
         return categories;
-
     }
 
     public Gee.ArrayList<App> get_apps_by_category (GMenu.TreeDirectory category) {
-
         var app_list = new Gee.ArrayList<App> ();
 
         var iter = category.iter ();
@@ -130,31 +116,13 @@
         }
 
         return app_list;
-
     }
 
     public Gee.HashMap<string, Gee.ArrayList<App>> get_apps () {
-
         return apps;
-
-    }
-
-    public SList<App> get_apps_by_popularity () {
-
-        var sorted_apps = new SList<App> ();
-
-        foreach (Gee.ArrayList<App> category in apps.values) {
-            foreach (App app in category) {
-                sorted_apps.insert_sorted_with_data (app, Utils.sort_apps_by_popularity);
-            }
-        }
-
-        return sorted_apps;
-
     }
 
     public SList<App> get_apps_by_name () {
-
         var sorted_apps = new SList<App> ();
         string[] sorted_apps_execs = {};
 
@@ -175,67 +143,5 @@
         }
 
         return sorted_apps;
-
-    }
-
-    public async Gee.ArrayList<App> search_results (string search) {
-
-        Idle.add (search_results.callback, Priority.HIGH);
-        yield;
-
-        var filtered = new Gee.ArrayList<App> ();
-
-        /** It's a bit stupid algorithm, simply check if the char is present
-         * some of the App values, then assign it a double. This is very simple:
-         * if an App name coincide with the search string they have obvious the
-         * same length, then the fraction will be 1.0.
-         * I've added a small multiplier when matching to a exec name, to give
-         * more priority to app.name
-        **/
-        string[] sorted_apps_execs = {};
-
-        foreach (Gee.ArrayList<App> category in apps.values) {
-            foreach (App app in category) {
-                if (!(app.exec in sorted_apps_execs)) {
-                    sorted_apps_execs += app.exec;
-                    if (app.name != null && 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 (app.exec != null && search in app.exec.down ()) {
-                        app.relevancy = app.exec.length / search.length * 10.0 - app.popularity;
-                        filtered.add (app);
-                    } else if (app.description != null && search in app.description.down ()) {
-                        app.relevancy = app.description.length / search.length - app.popularity;
-                        filtered.add (app);
-                    } else if (app.generic_name != null && search in app.generic_name.down ()) {
-                        app.relevancy = app.generic_name.length / search.length - app.popularity;
-                        filtered.add (app);
-                    }  else if (app.keywords != null) {
-                        app.relevancy = 0;
-                        foreach (string keyword in app.keywords) {
-                            foreach (string search_word in search.split (" ")) {
-                                if (search_word in keyword.down ()) {
-                                    app.relevancy += (keyword.length / search_word.length) * (app.keywords.length / search.split (" ").length) - app.popularity;
-                                    filtered.add (app);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        filtered.sort ((a, b) => Utils.sort_apps_by_relevancy ((App) a, (App) b));
-
-        if (filtered.size > 20) {
-            return (Gee.ArrayList<App>) filtered[0:20];
-        } else {
-            return filtered;
-        }
-
-    }
-
-}
+    }
+}
 \ No newline at end of file
 
=== modified file 'src/Utils.vala'
--- src/Utils.vala	2013-08-15 11:14:46 +0000
+++ src/Utils.vala	2014-08-16 15:16:33 +0000
@@ -29,16 +29,8 @@
             return widget;
         }
 
-        public static int sort_apps_by_popularity (Backend.App a, Backend.App b) {
-            return (int) (b.popularity*1000 - a.popularity*1000);
-        }
-
         public static int sort_apps_by_name (Backend.App a, Backend.App b) {
             return a.name.collate (b.name);
         }
-
-        public static int sort_apps_by_relevancy (Backend.App a, Backend.App b) {
-            return (int) (a.relevancy*1000 - b.relevancy*1000);
-        }
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2014-05-26 06:11:39 +0000
+++ src/Widgets/AppEntry.vala	2014-08-16 15:16:33 +0000
@@ -92,8 +92,6 @@
     }
 
     protected override bool draw (Cairo.Context cr) {
-
-
         Gtk.Allocation size;
         get_allocation (out size);