Merge lp:~voldyman/switchboard-plug-default-applications/rework into lp:switchboard-plug-default-applications

[Akshay Shekher]

the new branch updated the license year to 2013 and

switches form creating new threads to using a thread pool, which forces reuse of threads (making new threads is expensive)

[Julián Unrrein (junrrein)]

Diff line 125, 128: Insert a space before the opening parenthesis.

Diff line 114: Insert a colon inside the warning, after "ocurred".

Diff line 128: Would it be better to use "message" or "warning"?

review: Needs Fixing (code style)

Unmerged revisions

65. By Akshay Shekher on 2013-11-04

Updated License year & Switched to thread pool instead of making new threads for each change.

=== modified file 'LICENSE'
--- LICENSE	2013-02-12 20:07:40 +0000
+++ LICENSE	2013-11-04 07:13:22 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2011-2012 elementary Developers
+Copyright (C) 2011-2013 elementary Developers
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License version 3, as published
 by the Free Software Foundation.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-02-16 05:53:32 +0000
+++ src/CMakeLists.txt	2013-11-04 07:13:22 +0000
@@ -9,13 +9,14 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.16.0" MINIMUM)
+ensure_vala_version ("0.18.0" MINIMUM)
 
 include (ValaPrecompile)
 # Add all your vala files and requires packages to the List below to include them in the build
 vala_precompile (VALA_C
     default-plug.vala
-    utils.vala
+    Utils.vala
+    Worker.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     pantheon

=== renamed file 'src/utils.vala' => 'src/Utils.vala'
--- src/utils.vala	2013-02-16 05:35:14 +0000
+++ src/Utils.vala	2013-11-04 07:13:22 +0000
@@ -1,7 +1,7 @@
 /***
     BEGIN LICENSE
 
-    Copyright (C) 2011-2012 elementary Developers
+    Copyright (C) 2011-2013 elementary Developers
     This program is free software: you can redistribute it and/or modify it
     under the terms of the GNU Lesser General Public License version 3, as published
     by the Free Software Foundation.

=== added file 'src/Worker.vala'
--- src/Worker.vala	1970-01-01 00:00:00 +0000
+++ src/Worker.vala	2013-11-04 07:13:22 +0000
@@ -0,0 +1,84 @@
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2011-2013 elementary Developers
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+
+    END LICENSE
+    Written By: Akshay Shekher <[e-mail]>
+
+***/
+
+public class Worker {
+	
+	GLib.AppInfo app_from;
+	GLib.AppInfo app_to;
+	string app_type;
+	
+	public Worker (GLib.AppInfo change_from, GLib.AppInfo change_to,
+				   string item_type) {
+		
+		this.app_from = change_from;
+		this.app_to = change_to;
+		app_type = item_type;
+	}
+
+	public void run () {
+		change_default ();
+	}
+	
+    private void change_default () {
+
+        map_types_to_app (get_types_for_app (app_type), app_to);
+
+        /*  the code below implements ->
+            string[] old_types = app_from.get_supported_types ();
+            map_types_to_app (old_types, app_to);
+			
+            The function AppInfo.get_supported_types () is not present in the current glib
+            and will be used when we switch to the newer version.
+        */
+        var old_app_keyfile = new KeyFile ();
+		
+        try {
+            old_app_keyfile.load_from_file (((DesktopAppInfo) app_from).filename,
+                                            KeyFileFlags.NONE);
+        } catch (Error e) {
+            warning ("An error occured %s".printf (e.message));
+        }
+
+        string oldapp_types;
+
+        try {
+            oldapp_types = old_app_keyfile.get_string (KeyFileDesktop.GROUP,
+                                                       KeyFileDesktop.KEY_MIME_TYPE);
+        } catch (Error e) {
+            warning ("An error occured %s".printf (e.message));
+            oldapp_types = "";
+        }
+        // end block
+
+        map_types_to_app (oldapp_types.split (","), app_to);
+    }
+
+    private static void map_types_to_app (string[] types, GLib.AppInfo app) {
+        try {
+            for (int i=0; i < types.length; i++) {
+                app.set_as_default_for_type(types[i]);
+            }
+        } catch (GLib.Error e) {
+            stdout.printf("Error: %s\n", e.message);
+        }
+
+    }
+}
\ No newline at end of file

=== modified file 'src/default-plug.vala'
--- src/default-plug.vala	2013-04-28 09:16:45 +0000
+++ src/default-plug.vala	2013-11-04 07:13:22 +0000
@@ -1,7 +1,7 @@
 /***
     BEGIN LICENSE
 
-    Copyright (C) 2011-2012 elementary Developers
+    Copyright (C) 2011-2013 elementary Developers
     This program is free software: you can redistribute it and/or modify it
     under the terms of the GNU Lesser General Public License version 3, as published
     by the Free Software Foundation.
@@ -65,14 +65,29 @@
     GLib.AppInfo te_old;
     GLib.AppInfo fb_old;
 
+    /* make a thread pool to avoid blocking the UI when processing */
+    GLib.ThreadPool<Worker> pool;
+
     public DefaultPlug () {
 
+        try {
+            pool = new ThreadPool<Worker>.with_owned_data (worker_func, 3, false);
+        } catch (ThreadError e) {
+            critical ("Unable to create a thread pool: %s", e.message);
+        }
+
+        setup_ui ();
+        cache_apps ();
+        connect_signals ();
+    }
+
+    private void setup_ui () {
         var grid = new Gtk.Grid ();
         grid.halign = Gtk.Align.CENTER;
         grid.set_column_homogeneous (false);
         grid.set_row_spacing (6);
         grid.set_column_spacing (10);
-        
+
         //space between the two columns
         int margin_columns = 40;
         grid.margin_left = margin_columns;
@@ -132,77 +147,56 @@
         grid.attach (fb_label, 2, 3, 1, 1);
         grid.attach (fb_chooser, 3, 3, 1, 1);
 
-        cache_apps ();
-
-        wb_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default(wb_old, wb_chooser.get_app_info (), "web_browser");
-            return null;
-        }));
-
-        ec_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default(ec_old, ec_chooser.get_app_info (), "email_client");
-            return null;
-        }));
-
-        c_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default(c_old, c_chooser.get_app_info (), "calendar");
-            return null;
-        }));
-
-        vp_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default(vp_old, vp_chooser.get_app_info (), "video_player");
-            return null;
-        }));
-
-        mp_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default(mp_old, mp_chooser.get_app_info (), "music_player");
-            return null;
-        }));
-
-        iv_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default (iv_old, iv_chooser.get_app_info (), "image_viewer");
-            return null;
-        }));
-        te_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default(te_old, te_chooser.get_app_info (), "text_editor");
-            return null;
-        }));
-        fb_chooser.changed.connect ( () => run_in_thread ( () => {
-            change_default(fb_old, fb_chooser.get_app_info (), "file_browser");
-            return null;
-        }));
-
         add (grid);
-
-    }
-    private void run_in_thread (ThreadFunc<void*> func) {
-            new Thread<void*> (null, func);
-    }
-    public void change_default (GLib.AppInfo old_app, GLib.AppInfo new_app, string item_type) {
-        map_types_to_app (get_types_for_app (item_type), new_app);
-
-        /*  the code below implements ->
-            string[] old_types = old_app.get_supported_types ();
-            map_types_to_app (old_types, new_app);
-            The function AppInfo.get_supported_types () is not present in the current glib
-            and will be used when we switch to the newer version.
-        */
-        var old_app_keyfile = new KeyFile ();
-        try {
-            old_app_keyfile.load_from_file (((DesktopAppInfo) old_app).filename, KeyFileFlags.NONE);
-        } catch (Error e) {
-            warning ("An error occured %s".printf (e.message));
-        }
-        string oldapp_types;
-        try {
-            oldapp_types = old_app_keyfile.get_string (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_MIME_TYPE);
-        } catch (Error e) {
-            warning ("An error occured %s".printf (e.message));
-            oldapp_types = "";
-        }
-        //end block
-        map_types_to_app (oldapp_types.split (","), new_app);
-
+    }
+
+
+    private void connect_signals () {
+
+        wb_chooser.changed.connect ( () => {
+            add_task (wb_old, wb_chooser.get_app_info (), "web_browser");
+        });
+
+        ec_chooser.changed.connect ( () => {
+            add_task (ec_old, ec_chooser.get_app_info (), "email_client");
+        });
+
+        c_chooser.changed.connect ( () => {
+            add_task (c_old, c_chooser.get_app_info (), "calendar");
+        });
+
+        vp_chooser.changed.connect ( () => {
+            add_task (vp_old, vp_chooser.get_app_info (), "video_player");
+        });
+
+        mp_chooser.changed.connect ( () => {
+            add_task (mp_old, mp_chooser.get_app_info (), "music_player");
+        });
+
+        iv_chooser.changed.connect ( () => {
+            add_task (iv_old, iv_chooser.get_app_info (), "image_viewer");
+        });
+
+        te_chooser.changed.connect ( () => {
+            add_task (te_old, te_chooser.get_app_info (), "text_editor");
+        });
+
+        fb_chooser.changed.connect ( () => {
+            add_task (fb_old, fb_chooser.get_app_info (), "file_browser");
+        });
+    }
+
+    private void add_task (GLib.AppInfo app_from, GLib.AppInfo app_to,
+                           string item_type) {
+        try {
+            pool.add (new Worker (app_from, app_to, item_type));
+        } catch (ThreadError e) {
+            warning ("Could not add the worker to pool: %s", e.message);
+        }
+    }
+
+    private void worker_func (owned Worker task) {
+        task.run ();
         cache_apps ();
     }
 
@@ -210,7 +204,7 @@
         /* Cache the AppInfo of the old default apps */
         wb_old = wb_chooser.get_app_info ();
         ec_old = ec_chooser.get_app_info ();
-        c_old = c_chooser.get_app_info ();
+        c_old  = c_chooser.get_app_info ();
         vp_old = vp_chooser.get_app_info ();
         mp_old = mp_chooser.get_app_info ();
         iv_old = iv_chooser.get_app_info ();