Re: [Fwd: Added progress information to get_headers_async ... and more :-)]

[Philip Van Hoof <spam pvanhoof be>]

Approved

On Wed, 2008-07-23 at 13:41 +0200, Sergio Villar Senin wrote:
> Seems that the list is not forwarding mails, if you want to review in
> the meantime :)
> 
> -------- Mensaxe orixinal --------
> Message-ID: <48870F05 10907 igalia com>
> Date: Wed, 23 Jul 2008 12:59:17 +0200
> From: Sergio Villar Senin <svillar igalia com>
> User-Agent: Mozilla-Thunderbird 2.0.0.14 (X11/20080509)
> MIME-Version: 1.0
> To: tinymail-devel-list <tinymail-devel-list gnome org>
> Subject: Added progress information to get_headers_async ... and more :-)
> X-Enigmail-Version: 0.95.0
> Content-Type: multipart/mixed;
> boundary="------------080503010203010706080503"
> 
> Hi,
> 
> I've just realized that after switching to the async queue system we
> lost the progress information when retrieving headers, that is, we're
> not getting the "retrieving x of y".
> 
> The problem was basically that we're not calling the
> start_camel_operation in the get_headers_async_thread function and that
> this function was not registering the camel operation.
> 
> Br
> 
> PS: as a positive side effect, it seems it also allows to cancel some
> operations that were not canceled properly :-)

-- 
Philip Van Hoof, freelance software developer
home: me at pvanhoof dot be 
gnome: pvanhoof at gnome dot org 
http://pvanhoof.be/blog
http://codeminded.be

--- Begin Message ---

• From: Sergio Villar Senin <svillar igalia com>
• To: me pvanhoof be
• Subject: [Fwd: Added progress information to get_headers_async ... and more :-)]
• Date: Wed, 23 Jul 2008 13:41:26 +0200

Seems that the list is not forwarding mails, if you want to review in
the meantime :)

-------- Mensaxe orixinal --------
Message-ID: <48870F05 10907 igalia com>
Date: Wed, 23 Jul 2008 12:59:17 +0200
From: Sergio Villar Senin <svillar igalia com>
User-Agent: Mozilla-Thunderbird 2.0.0.14 (X11/20080509)
MIME-Version: 1.0
To: tinymail-devel-list <tinymail-devel-list gnome org>
Subject: Added progress information to get_headers_async ... and more :-)
X-Enigmail-Version: 0.95.0
Content-Type: multipart/mixed;
boundary="------------080503010203010706080503"

Hi,

I've just realized that after switching to the async queue system we
lost the progress information when retrieving headers, that is, we're
not getting the "retrieving x of y".

The problem was basically that we're not calling the
start_camel_operation in the get_headers_async_thread function and that
this function was not registering the camel operation.

Br

PS: as a positive side effect, it seems it also allows to cancel some
operations that were not canceled properly :-)

Index: libtinymail-camel/tny-camel-folder.c
===================================================================
--- libtinymail-camel/tny-camel-folder.c	(revision 3725)
+++ libtinymail-camel/tny-camel-folder.c	(working copy)
@@ -2188,9 +2188,11 @@
 	TnyList *headers;
 	gboolean refresh;
 	TnyGetHeadersCallback callback;
+	TnyStatusCallback status_callback;
 	gpointer user_data;
 	TnySessionCamel *session;
 	gboolean cancelled;
+	TnyIdleStopper *stopper;
 
 } GetHeadersInfo;
 
@@ -2209,6 +2211,9 @@
 	if (info->err)
 		g_error_free (info->err);
 
+	tny_idle_stopper_destroy (info->stopper);
+	info->stopper = NULL;
+
 	/**/
 
 	camel_object_unref (info->session);
@@ -2225,22 +2230,55 @@
 		info->callback (info->self, info->cancelled, info->headers, info->err, info->user_data);
 		tny_lockable_unlock (info->session->priv->ui_lock);
 	}
+	tny_idle_stopper_stop (info->stopper);
+
 	return FALSE;
 }
 
+static void
+tny_camel_folder_get_headers_async_status (struct _CamelOperation *op, const char *what, int sofar, int oftotal, void *thr_user_data)
+{
+	GetHeadersInfo *oinfo = thr_user_data;
+	TnyProgressInfo *info = NULL;
+
+	info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback, 
+				      TNY_FOLDER_STATUS, TNY_FOLDER_STATUS_CODE_GET_MSG, what, sofar, 
+				      oftotal, oinfo->stopper, oinfo->session->priv->ui_lock, oinfo->user_data);
+	
+	g_idle_add_full (TNY_PRIORITY_LOWER_THAN_GTK_REDRAWS, 
+			 tny_progress_info_idle_func, info, 
+			 tny_progress_info_destroy);
+	
+	return;
+}
+
+
 static gpointer 
 tny_camel_folder_get_headers_async_thread (gpointer thr_user_data)
 {
 	GetHeadersInfo *info = (GetHeadersInfo*) thr_user_data;
+	TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
+
 	info->err = NULL;
-	tny_folder_get_headers (info->self, info->headers, info->refresh, &info->err);
 	info->cancelled = FALSE;
 
+	g_static_rec_mutex_lock (priv->folder_lock);
+
+	_tny_camel_account_start_camel_operation (TNY_CAMEL_ACCOUNT (priv->account),
+						  tny_camel_folder_get_headers_async_status, 
+						  info, "Getting headers");
+
+	tny_folder_get_headers (info->self, info->headers, info->refresh, &info->err);
+
+	_tny_camel_account_stop_camel_operation (TNY_CAMEL_ACCOUNT (priv->account));
+
 	if (info->err != NULL) {
 		if (camel_strstrcase (info->err->message, "cancel") != NULL)
 			info->cancelled = TRUE;
 	}
 
+	g_static_rec_mutex_unlock (priv->folder_lock);
+
 	return NULL;
 }
 
@@ -2256,7 +2294,8 @@
 	g_object_unref (info->self);
 	g_object_unref (info->headers);
 
-	/**/
+	tny_idle_stopper_destroy (info->stopper);
+	info->stopper = NULL;
 
 	camel_object_unref (info->session);
 
@@ -2297,8 +2336,10 @@
 	info->headers = headers;
 	info->refresh = refresh;
 	info->callback = callback;
+	info->status_callback = status_callback;
 	info->user_data = user_data;
 	info->err = NULL;
+	info->stopper = tny_idle_stopper_new();
 
 	/* thread reference */
 	g_object_ref (info->self);
@@ -2318,7 +2359,7 @@
 		&info->cancelled,
 		info, sizeof (GetHeadersInfo),
 		TNY_CAMEL_QUEUE_PRIORITY_ITEM/*|TNY_CAMEL_QUEUE_CANCELLABLE_ITEM*/|
-			TNY_CAMEL_QUEUE_GET_HEADERS_ITEM, 
+		TNY_CAMEL_QUEUE_GET_HEADERS_ITEM, 
 		__FUNCTION__);
 
 	return;
Index: libtinymail-camel/tny-camel-account.c
===================================================================
--- libtinymail-camel/tny-camel-account.c	(revision 3725)
+++ libtinymail-camel/tny-camel-account.c	(working copy)
@@ -781,6 +781,7 @@
 
 	priv->cancel = camel_operation_new (func, user_data);
 
+	camel_operation_register (priv->cancel);
 	camel_operation_start (priv->cancel, (char*)what);
 
 	g_static_rec_mutex_unlock (priv->cancel_lock);

--- End Message ---