X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=0677d6439efbe0b31f42fd1438af425a00b5f016;hb=a1c5614a3270623248b29148aa19c6e3a32c4a76;hp=ebdb823b24dfa8467729cc1471985863a6e0f2a2;hpb=e09178883670a35f44e64399066118bb190833f7;p=modest

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index ebdb823..0677d64 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -33,7 +33,14 @@
 #include <tny-iterator.h>
 #include <tny-folder.h>
 #include <tny-camel-msg.h>
+#include <tny-folder-change.h>
+#include <tny-folder-observer.h>
 #include <modest-tny-account.h>
+#include <modest-runtime.h>
+#include <modest-platform.h>
+#include <widgets/modest-window-mgr.h>
+#include <modest-marshal.h>
+#include <string.h> /* strcmp */
 
 /* 'private'/'protected' functions */
 static void modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass);
@@ -41,21 +48,34 @@ static void modest_tny_send_queue_finalize   (GObject *obj);
 static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class);
 
 /* Signal handlers */ 
-static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, guint processed, guint total);
-static void _on_msg_has_been_sent (TnySendQueue *self, TnyMsg *msg, guint processed, guint total);
+static void _on_msg_start_sending (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, gpointer user_data);
+static void _on_msg_has_been_sent (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, gpointer user_data);
+static void _on_msg_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data);
 
+static TnyFolder*modest_tny_send_queue_get_outbox (TnySendQueue *self);
+static TnyFolder*modest_tny_send_queue_get_sentbox (TnySendQueue *self);
 
 /* list my signals  */
 enum {
+	STATUS_CHANGED,
 	/* MY_SIGNAL_1, */
 	/* MY_SIGNAL_2, */
 	LAST_SIGNAL
 };
 
+typedef struct _SendInfo SendInfo;
+struct _SendInfo {
+	gchar* msg_id;
+	ModestTnySendQueueStatus status;
+};
+
 typedef struct _ModestTnySendQueuePrivate ModestTnySendQueuePrivate;
 struct _ModestTnySendQueuePrivate {
-	gchar *current_msg_id;
+	/* Queued infos */
+	GQueue* queue;
 
+	/* The info that is currently being sent */
+	GList* current;
 };
 
 #define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -66,28 +86,194 @@ struct _ModestTnySendQueuePrivate {
 static TnyCamelSendQueueClass *parent_class = NULL;
 
 /* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
+static guint signals[LAST_SIGNAL] = {0};
 
 /*
- * this thread actually tries to send all the mails in the outbox
+ * this thread actually tries to send all the mails in the outbox and keeps
+ * track of their state.
  */
 
+static int
+on_modest_tny_send_queue_compare_id(gconstpointer info, gconstpointer msg_id)
+{
+	g_return_val_if_fail (info && ((SendInfo*)info)->msg_id && msg_id, -1);
+	
+	return strcmp( ((SendInfo*)info)->msg_id, msg_id);
+}
+
+static void
+modest_tny_send_queue_info_free(SendInfo *info)
+{
+	g_free(info->msg_id);
+	g_slice_free(SendInfo, info);
+}
+
+static GList*
+modest_tny_send_queue_lookup_info (ModestTnySendQueue *self, const gchar *msg_id)
+{
+	ModestTnySendQueuePrivate *priv;
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+
+	return g_queue_find_custom (priv->queue, msg_id, on_modest_tny_send_queue_compare_id);
+}
 
 static void
 modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
-{	
+{
+	ModestTnySendQueuePrivate *priv;
+	SendInfo *info;
+	TnyIterator *iter = NULL;
+	TnyFolder *outbox = NULL;
+	TnyList *headers = tny_simple_list_new ();
+	TnyHeader *header = NULL;
+
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+	if(priv->current != NULL)
+	{
+		info = priv->current->data;
+		priv->current = NULL;
+
+		/* Keep in list until retry, so that we know that this was suspended
+		 * by the user and not by an error. */
+		info->status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
+
+		g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+	}
+
+	/* Set flags to supend sending operaiton (if removed, this is not necessary) */
+	if (!remove) {		
+		outbox = modest_tny_send_queue_get_outbox (TNY_SEND_QUEUE(self));
+		tny_folder_get_headers (outbox, headers, TRUE, err);
+		if (err != NULL) goto frees;
+		iter = tny_list_create_iterator (headers);
+		while (!tny_iterator_is_done (iter)) {
+			header = TNY_HEADER (tny_iterator_get_current (iter));
+			if (header) {	
+				tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
+				tny_header_set_flags (header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
+				tny_iterator_next (iter);
+				g_object_unref (header);
+			}
+		}
+		
+		g_queue_foreach (priv->queue, (GFunc)modest_tny_send_queue_info_free, NULL);
+		g_queue_free (priv->queue);
+		priv->queue = g_queue_new();
+	}
+		
+	/* Dont call super class implementaiton, becasue camel removes messages from outbox */
 	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel_func (self, remove, err); /* FIXME */
+
+ frees:
+	if (headers != NULL)
+		g_object_unref (G_OBJECT (headers));
+	if (outbox != NULL) 
+		g_object_unref (G_OBJECT (outbox));
+	if (iter != NULL) 
+		g_object_unref (iter);
 }
 
 static void
-modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
+_on_added_to_outbox (TnySendQueue *self, gboolean cancelled, TnyMsg *msg, GError *err, gpointer user_data) 
 {
+	ModestTnySendQueuePrivate *priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE(self);
+	TnyHeader *header = NULL;
+	SendInfo *info = NULL;
+	GList* existing = NULL;
+	const gchar* msg_id = NULL;
+
 	g_return_if_fail (TNY_IS_SEND_QUEUE(self));
 	g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
+
+	header = tny_msg_get_header (msg);
+	msg_id = modest_tny_send_queue_get_msg_id (header);
+/* 	msg_id = tny_header_get_message_id (header); */
+	g_return_if_fail(msg_id != NULL);
+
+	/* Put newly added message in WAITING state */
+	existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_id);
+	if(existing != NULL)
+	{
+		info = existing->data;
+		info->status = MODEST_TNY_SEND_QUEUE_WAITING;
+	}
+	else
+	{
+		
+		info = g_slice_new (SendInfo);
+
+		info->msg_id = strdup(msg_id);
+		info->status = MODEST_TNY_SEND_QUEUE_WAITING;
+		g_queue_push_tail (priv->queue, info);
+	}
+
+	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+
+	g_object_unref(G_OBJECT(header));
+}
+
+void
+modest_tny_send_queue_add (ModestTnySendQueue *self, TnyMsg *msg, GError **err)
+{
+	g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE(self));
+	g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
+
+	tny_camel_send_queue_add_async (TNY_CAMEL_SEND_QUEUE(self), 
+				  msg, 
+				  _on_added_to_outbox, 
+				  NULL, 
+				  NULL);
+}
+
+
+static void
+_add_message (ModestTnySendQueue *self, TnyHeader *header)
+{
+	ModestWindowMgr *mgr = NULL;
+	ModestTnySendQueuePrivate *priv;
+	SendInfo *info = NULL;
+	GList* existing = NULL;
+	gchar* msg_uid = NULL;
+	ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNONW;
+	gboolean editing = FALSE;
+
+	g_return_if_fail (TNY_IS_SEND_QUEUE(self));
+	g_return_if_fail (TNY_IS_HEADER(header));
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 	
-	/* FIXME: do something smart here... */
-	
-	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg, err); /* FIXME */
+	/* Check whether the mail is already in the queue */
+	msg_uid = modest_tny_send_queue_get_msg_id (header);
+	status = modest_tny_send_queue_get_msg_status (self, msg_uid);
+	switch (status) {
+	case MODEST_TNY_SEND_QUEUE_UNKNONW:
+	case MODEST_TNY_SEND_QUEUE_SUSPENDED:
+	case MODEST_TNY_SEND_QUEUE_FAILED:
+		if (status != MODEST_TNY_SEND_QUEUE_SUSPENDED)
+			tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
+		
+		/* Check if it already exists on queue */
+		existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_uid);
+		if(existing != NULL)
+			break;
+		
+		/* Check if its being edited */
+		mgr = modest_runtime_get_window_mgr ();
+		editing = modest_window_mgr_find_registered_header (mgr, header, NULL);
+		if (editing)
+			break;
+		
+		/* Add new meesage info */
+		info = g_slice_new (SendInfo);
+		info->msg_id = strdup(msg_uid);
+		info->status = MODEST_TNY_SEND_QUEUE_WAITING;
+		g_queue_push_tail (priv->queue, info);
+		break;
+	default:
+		break;
+	}
+
+	/* Free */
+	g_free(msg_uid);
 }
 
 static TnyFolder*
@@ -126,12 +312,17 @@ modest_tny_send_queue_get_outbox (TnySendQueue *self)
 	}
 	folder  = modest_tny_account_get_special_folder (TNY_ACCOUNT(account),
 							 TNY_FOLDER_TYPE_OUTBOX);
+
+	/* This vfunc's tinymail contract does not allow it to return NULL. */
+	if (!folder) {
+		g_warning("%s: Returning NULL.\n", __FUNCTION__);
+	}
+
 	g_object_unref (G_OBJECT(account));
 
 	return folder;
 }
 
-
 GType
 modest_tny_send_queue_get_type (void)
 {
@@ -150,6 +341,7 @@ modest_tny_send_queue_get_type (void)
 			(GInstanceInitFunc) modest_tny_send_queue_instance_init,
 			NULL
 		};
+		
 		my_type = g_type_register_static (TNY_TYPE_CAMEL_SEND_QUEUE,
 						  "ModestTnySendQueue",
 						  &my_info, 0);
@@ -168,10 +360,19 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass)
 	parent_class            = g_type_class_peek_parent (klass);
 	gobject_class->finalize = modest_tny_send_queue_finalize;
 
-	TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_func         = modest_tny_send_queue_add;
 	TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox_func  = modest_tny_send_queue_get_outbox;
         TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox_func = modest_tny_send_queue_get_sentbox;
         TNY_CAMEL_SEND_QUEUE_CLASS(klass)->cancel_func      = modest_tny_send_queue_cancel;
+	klass->status_changed   = NULL;
+
+	signals[STATUS_CHANGED] =
+		g_signal_new ("status_changed",
+		              G_TYPE_FROM_CLASS (gobject_class),
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (ModestTnySendQueueClass, status_changed),
+			      NULL, NULL,
+			      modest_marshal_VOID__STRING_INT,
+			      G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
 
 	g_type_class_add_private (gobject_class, sizeof(ModestTnySendQueuePrivate));
 }
@@ -180,10 +381,10 @@ static void
 modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class)
 {
 	ModestTnySendQueuePrivate *priv;
-		
+
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (instance);
-	priv->current_msg_id = NULL;
-	
+	priv->queue = g_queue_new();
+	priv->current = NULL;
 }
 
 static void
@@ -192,8 +393,9 @@ modest_tny_send_queue_finalize (GObject *obj)
 	ModestTnySendQueuePrivate *priv;
 		
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (obj);
-	if (priv->current_msg_id != NULL)
-		g_free(priv->current_msg_id);
+
+	g_queue_foreach (priv->queue, (GFunc)modest_tny_send_queue_info_free, NULL);
+	g_queue_free (priv->queue);
 
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -211,17 +413,15 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 						    account); 
 
 	/* Connect signals to control when a msg is being or has been sent */
-	/* TODO: this signal was implemented in tinymail camel send queue, but im
-	   waiting for implement some unit tests nbefore commited changes */
-	if (FALSE) {
-		g_signal_connect (G_OBJECT(self), "msg-sending",
-				  G_CALLBACK(_on_msg_start_sending), 
-				  NULL);
-	}
-			  
+	g_signal_connect (G_OBJECT(self), "msg-sending",
+			  G_CALLBACK(_on_msg_start_sending),
+			  NULL);			  
 	g_signal_connect (G_OBJECT(self), "msg-sent",
 			  G_CALLBACK(_on_msg_has_been_sent), 
 			  NULL);
+	g_signal_connect (G_OBJECT(self), "error-happened",
+	                  G_CALLBACK(_on_msg_error_happened),
+			  NULL);
 	return self;
 }
 
@@ -230,71 +430,201 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 void
 modest_tny_send_queue_try_to_send (ModestTnySendQueue* self)
 {
-	/* TODO: Rename this to tny_camel_send_queue_try_to_send() in tinymail 
-	and check that it works, without creating a second worker. */
-/* 	tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); */
+	TnyIterator *iter = NULL;
+	TnyFolder *outbox = NULL;
+	TnyList *headers = tny_simple_list_new ();
+	TnyHeader *header = NULL;
+	GError *err = NULL;
+
+	outbox = modest_tny_send_queue_get_outbox (TNY_SEND_QUEUE(self));
+	if (!outbox)
+		return;
+
+	tny_folder_get_headers (outbox, headers, TRUE, &err);
+	if (err != NULL) 
+		goto frees;
+
+	iter = tny_list_create_iterator (headers);
+	while (!tny_iterator_is_done (iter)) {
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		if (header) {	
+			_add_message (self, header); 
+			g_object_unref (header);
+		}
+
+		tny_iterator_next (iter);
+	}
+	
+	/* Flush send queue */
+	tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self));
+
+ frees:
+	if (headers != NULL)
+		g_object_unref (G_OBJECT (headers));
+	if (outbox != NULL) 
+		g_object_unref (G_OBJECT (outbox));
+	if (iter != NULL) 
+		g_object_unref (iter);
 }
 
 gboolean
 modest_tny_send_queue_msg_is_being_sent (ModestTnySendQueue* self,
 					 const gchar *msg_id)
 {	
-	ModestTnySendQueuePrivate *priv;
+	ModestTnySendQueueStatus status;
 	
 	g_return_val_if_fail (msg_id != NULL, FALSE); 
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 	
-	if (modest_tny_send_queue_sending_in_progress(self))
-		return g_ascii_strcasecmp(priv->current_msg_id, msg_id);
-	else 
-		return FALSE;
+	status = modest_tny_send_queue_get_msg_status (self, msg_id);
+	return status == MODEST_TNY_SEND_QUEUE_SENDING;
 }
 
 gboolean
 modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self)
 {	
 	ModestTnySendQueuePrivate *priv;
-	
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 	
-	return priv->current_msg_id != NULL;
+	return priv->current != NULL;
 }
 
+ModestTnySendQueueStatus
+modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg_id)
+{
+  GList *item;
+  item = modest_tny_send_queue_lookup_info (self, msg_id);
+  if(item == NULL) return MODEST_TNY_SEND_QUEUE_UNKNONW;
+  return ((SendInfo*)item->data)->status;
+}
 
-static void 
+gchar *
+modest_tny_send_queue_get_msg_id (TnyHeader *header)
+{
+	const gchar *uid = NULL;
+	gchar* msg_uid = NULL;
+	gchar **tmp = NULL;
+		
+	/* Get message uid */
+	uid = tny_header_get_uid (header);
+	if (uid)
+		tmp = g_strsplit (uid, "__", 2);
+	
+	if (tmp) {
+		if (tmp[1] != NULL) 
+			msg_uid = g_strconcat (tmp[0], "_", NULL);
+		else 
+			msg_uid = g_strdup(tmp[0]);
+
+		/* free */
+		g_strfreev(tmp);
+	}
+
+	return msg_uid;
+}
+
+
+static void
 _on_msg_start_sending (TnySendQueue *self,
-		       TnyMsg *msg, 
-		       guint processed,
-		       guint total)
+		       TnyHeader *header,
+		       TnyMsg *msg,
+		       int done, 
+		       int total,
+		       gpointer user_data)
 {
-	ModestTnySendQueuePrivate *priv;
-	TnyHeader *header = NULL;
+	ModestTnySendQueuePrivate *priv = NULL;
+	GList *item = NULL;
+	SendInfo *info = NULL;
+	gchar *msg_id = NULL;
 
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-
-	/* Delete previous msg_id */
-	if (priv->current_msg_id != NULL)
-		g_free(priv->current_msg_id);
 	
-	/* Set current msg_id */
-	header = tny_msg_get_header(msg);
-	priv->current_msg_id = g_strdup(tny_header_get_message_id (header));
+	/* Get message uid */
+	msg_id = modest_tny_send_queue_get_msg_id (header);
+
+	/* Get status info */
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+	if (!item) 
+		g_warning  ("%s: item should not be NULL", __FUNCTION__);
+	else {
+		info = item->data;
+		info->status = MODEST_TNY_SEND_QUEUE_SENDING;
+		
+		/* Set current status item */
+		g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+		priv->current = item;
+	}
+
+	/* free */
+	g_free (msg_id);
 }
 
 static void 
 _on_msg_has_been_sent (TnySendQueue *self,
+		       TnyHeader *header,
 		       TnyMsg *msg, 
-		       guint processed,
-		       guint total)
+		       int done, 
+		       int total,
+		       gpointer user_data)
 {
 	ModestTnySendQueuePrivate *priv;
+	GList *item;
+	gchar *msg_id = NULL;
+
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+
+	/* Get message uid */
+	msg_id = modest_tny_send_queue_get_msg_id (header);
+	
+	/* Get status info */
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+	if (!item)
+		g_warning ("%s: item should not be NULL", __FUNCTION__);
+	else {
+
+		/* Remove status info */
+		modest_tny_send_queue_info_free (item->data);
+		g_queue_delete_link (priv->queue, item);
+		priv->current = NULL;
+		
+		modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_sent"));
+	}
+
+	/* free */
+	g_free(msg_id);
+}
+
+static void 
+_on_msg_error_happened (TnySendQueue *self,
+			TnyHeader *header,
+			TnyMsg *msg,
+			GError *err,
+			gpointer user_data)
+{
+	ModestTnySendQueuePrivate *priv = NULL;
+	SendInfo *info = NULL;
+	GList *item = NULL;
+	gchar* msg_uid = NULL;
 	
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 	
-	/* Delete previous msg_id */
-	if (priv->current_msg_id != NULL)
-		g_free(priv->current_msg_id);
+	/* Get sending info (create new if it doesn not exist) */
+	msg_uid = modest_tny_send_queue_get_msg_id (header);
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), 
+						  msg_uid);	
+	if (item == NULL) {
+		info = g_slice_new (SendInfo);
+		info->msg_id = strdup(msg_uid);
+		g_queue_push_tail (priv->queue, info);
+	} else
+		info = item->data;
+
+	/* Keep in queue so that we remember that the opertion has failed */
+	/* and was not just cancelled */
+	info->status = MODEST_TNY_SEND_QUEUE_FAILED;
 	
-	/* Unset current msg_id */
-	priv->current_msg_id = NULL;
+	/* Notify status has changed */
+	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+
+	/* free */
+	g_free(msg_uid);
 }