Merge lp:~vikoadi/switchboard-plug-notifications/async-load-applist into lp:~elementary-pantheon/switchboard-plug-notifications/trunk

[Viko Adi Rahmawan]

asynchronously load AppList

asynchronously load AppList

[lp:~vikoadi/switchboard-plug-notifications/async-load-applist]

122. By Viko Adi Rahmawan on 2015-09-12

remove first row selection

[xapantu (xapantu)]

Hey, thanks :) See inline comments below.

It works better here :) Maybe they could be loaded by groups of three (for instance) apps, but I am not sure.

review: Needs Fixing

[lp:~vikoadi/switchboard-plug-notifications/async-load-applist]

123. By Viko Adi Rahmawan on 2015-09-19

cache apps, use foreach

124. By Viko Adi Rahmawan on 2015-09-19

use cancellable just in case notifications updated frequently

125. By Viko Adi Rahmawan on 2015-09-19

rename list_app to queue_reload and make it private

[Viko Adi Rahmawan (vikoadi)]

- cache apps, use foreach
- use cancellable just in case notifications updated frequently
- rename list_app to queue_reload and make it private

[xapantu (xapantu)]

Looks fine, thanks :)

review: Approve

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2014-11-15 22:39:16 +0000
+++ src/Plug.vala	2015-09-19 06:12:01 +0000
@@ -57,11 +57,6 @@
 			}
 		});
 
-		appsview.applist.list_apps ();
-
-		if (NotifySettings.get_default ().do_not_disturb == false)
-			appsview.applist.select_first ();
-
 		stack.show_all ();
 
 		return stack;

=== modified file 'src/Widgets/AppList.vala'
--- src/Widgets/AppList.vala	2015-08-30 20:33:33 +0000
+++ src/Widgets/AppList.vala	2015-09-19 06:12:01 +0000
@@ -21,6 +21,7 @@
 
 public class Widgets.AppList : Gtk.ListBox {
 	private int item_count;
+	private Cancellable list_apps_cancellable;
 
 	public signal void item_changed (AppItem item);
 	public signal void list_loaded (int length);
@@ -36,25 +37,38 @@
 			}
 		});
 
+		list_apps_cancellable = new Cancellable ();
 		NotifySettings.get_default ().apps_changed.connect (() => {
 			if (NotifySettings.get_default ().apps.length != item_count) {
-				this.get_children ().foreach ((row) => {
-					this.remove (row);
-				});
-
-				list_apps ();
-
-				if (NotifySettings.get_default ().do_not_disturb == false)
-					select_first ();
+				queue_reload ();
 			}
 		});
-	}
-
-	public void list_apps () {
-		item_count = NotifySettings.get_default ().apps.length;
-
-		for (int i = 0; i < item_count; i++) {
-			var parameters = NotifySettings.get_default ().apps[i].split (":");
+
+		queue_reload ();
+	}
+
+	private void queue_reload () {
+		list_apps_cancellable.cancel ();
+		this.get_children ().foreach ((row) => {
+			this.remove (row);
+			});
+		list_apps_cancellable.reset ();
+		list_apps_async.begin ();
+	}
+
+	private async void list_apps_async () {
+		var apps = NotifySettings.get_default ().apps;
+		item_count = apps.length;
+
+		foreach (var app in apps) {
+			var idle_handler = Idle.add (list_apps_async.callback);
+			var cancellable_handler = list_apps_cancellable.connect (() => {
+				Source.remove(idle_handler);
+			});
+			yield;
+			list_apps_cancellable.disconnect (cancellable_handler);
+
+			var parameters = app.split (":");
 
 			if (parameters.length == 2) {
 				var properties = parameters[1].split (",");
@@ -64,11 +78,13 @@
 					this.add (item);
 				}
 			}
+
+			if (selected_row == null && NotifySettings.get_default ().do_not_disturb == false)
+				select_first ();
+
+			this.show_all ();
+			list_loaded (item_count);
 		}
-
-		this.show_all ();
-
-		list_loaded (item_count);
 	}
 
 	public void select_first () {

=== modified file 'src/Widgets/AppsView.vala'
--- src/Widgets/AppsView.vala	2014-12-11 16:30:53 +0000
+++ src/Widgets/AppsView.vala	2015-09-19 06:12:01 +0000
@@ -59,8 +59,6 @@
 		this.pack2 (content, true, false);
 		this.set_position (240);
 
-		select_app (applist.selected_row);
-
 		applist.item_changed.connect (select_app);
 
 		appsettings.bubbles_changed.connect ((bubbles) => {