Changeset 3518

Timestamp:

03/24/08 14:13:57

Author:

pvanhoof

Message:

2008-03-24 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Rewrote tny_camel_folder_remove_msgs_default
        
      • Added tny_folder_remove_msgs_async
        

• • • • This was a minor API change
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-folder.h (modified) (1 diff)
• trunk/libtinymail/tny-folder.c (modified) (1 diff)
• trunk/libtinymail/tny-folder.h (modified) (2 diffs)
• trunk/libtinymail/tny-merge-folder.c (modified) (2 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Rewrote tny_camel_folder_remove_msgs_default
+        * Added tny_folder_remove_msgs_async
+
+        * This was a minor API change
-
-2008-03-20  Philip Van Hoof <pvanhoof@gnome.org>

trunk/libtinymail-camel/tny-camel-folder.c

@@ -1107 +1107 @@
-        return;
-}
+
+
+
+
+typedef struct 
+{
+        TnyCamelQueueable parent;
+
+        GError *err;
+        TnyFolder *self;
+        TnyList *headers;
+        TnyFolderCallback callback;
+        gpointer user_data;
+        TnySessionCamel *session;
+        gboolean cancelled;
+
+} RemMsgsInfo;
+
+
+static void
+tny_camel_folder_remove_msgs_async_destroyer (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = thr_user_data;
+
+        /* thread reference */
+        g_object_unref (info->self);
+        g_object_unref (info->headers);
+
+        if (info->err)
+                g_error_free (info->err);
+
+        return;
+}
+
+static gboolean
+tny_camel_folder_remove_msgs_async_callback (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = thr_user_data;
+        if (info->callback) {
+                tny_lockable_lock (info->session->priv->ui_lock);
+                info->callback (info->self, info->cancelled, info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
+        return FALSE;
+}
+
+static gpointer 
+tny_camel_folder_remove_msgs_async_thread (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = (RemMsgsInfo*) thr_user_data;
+        info->err = NULL;
+        tny_folder_remove_msgs (info->self, info->headers, &info->err);
+        info->cancelled = FALSE;
+
+        if (info->err != NULL) {
+                if (camel_strstrcase (info->err->message, "cancel") != NULL)
+                        info->cancelled = TRUE;
+        }
+
+        return NULL;
+}
+
+static void
+tny_camel_folder_remove_msgs_async_cancelled_destroyer (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = thr_user_data;
+        if (info->err)
+                g_error_free (info->err);
+        g_object_unref (info->self);
+        g_object_unref (info->headers);
+
+        return;
+}
+
+static gboolean
+tny_camel_folder_remove_msgs_async_cancelled_callback (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = thr_user_data;
+        if (info->callback) {
+                tny_lockable_lock (info->session->priv->ui_lock);
+                info->callback (info->self, TRUE, info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
+        return FALSE;
+}
+
+static void 
+tny_camel_folder_remove_msgs_async (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->remove_msgs_async(self, headers, callback, status_callback, user_data);
+        return;
+}
+
+
+static void 
+tny_camel_folder_remove_msgs_async_default (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+        RemMsgsInfo *info;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        
+        /* Idle info for the callbacks */
+        info = g_slice_new (RemMsgsInfo);
+        info->session = TNY_FOLDER_PRIV_GET_SESSION (priv);
+        info->self = self;
+        info->headers = headers;
+        info->callback = callback;
+        info->user_data = user_data;
+        info->err = NULL;
+
+        /* thread reference */
+        g_object_ref (info->self);
+        g_object_ref (info->headers);
+
+        _tny_camel_queue_launch (TNY_FOLDER_PRIV_GET_QUEUE (priv), 
+                tny_camel_folder_remove_msgs_async_thread, 
+                tny_camel_folder_remove_msgs_async_callback,
+                tny_camel_folder_remove_msgs_async_destroyer, 
+                tny_camel_folder_remove_msgs_async_cancelled_callback,
+                tny_camel_folder_remove_msgs_async_cancelled_destroyer, 
+                &info->cancelled,
+                info, sizeof (RemMsgsInfo), __FUNCTION__);
+
+        return;
+}
+
+
-
-static void 
@@ -5621 +5747 @@
-        klass->get_url_string= tny_camel_folder_get_url_string;
-        klass->get_caps= tny_camel_folder_get_caps;
+        klass->remove_msgs_async= tny_camel_folder_remove_msgs_async;
-
-        return;
@@ -5686 +5813 @@
-        class->get_url_string= tny_camel_folder_get_url_string_default;
-        class->get_caps= tny_camel_folder_get_caps_default;
+        class->remove_msgs_async= tny_camel_folder_remove_msgs_async_default;
-
-        class->get_folders_async= tny_camel_folder_get_folders_async_default;

trunk/libtinymail-camel/tny-camel-folder.h

@@ -90 +90 @@
-        gchar* (*get_url_string) (TnyFolder *self);
-        TnyFolderCaps (*get_caps) (TnyFolder *self);
+        void (*remove_msgs_async) (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-        void (*get_folders_async) (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, TnyGetFoldersCallback callback, TnyStatusCallback status_callback, gpointer user_data);

trunk/libtinymail/tny-folder.c

@@ -781 +781 @@
-}
-
+
+
+/**
+ * tny_folder_remove_msgs_async:
+ * @self: a #TnyFolder
+ * @headers: a #TnyList with #TnyHeader items of the messages to remove
+ * @callback: (null-ok): a #TnyFolderCallback or NULL
+ * @status_callback: (null-ok): a #TnyStatusCallback or NULL
+ * @user_data: (null-ok): user data that will be passed to the callbacks
+ *
+ * Remove messages from a folder. It will use the #TnyMsgRemoveStrategy of 
+ * @self to perform the removal itself. For more details, check out the 
+ * documentation of the used #TnyMsgRemoveStrategy type. The default 
+ * implementation for libtinymail-camel is the #TnyCamelMsgRemoveStrategy.
+ *
+ * Folder observers of @self will get only one header-removed trigger caused
+ * by this action (with all the removed headers in the #TnyFolderChange).
+ *
+ * since: 1.0
+ * audience: application-developer
+ **/
+void 
+tny_folder_remove_msgs_async (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+#ifdef DBC /* require */
+        g_assert (TNY_IS_FOLDER (self));
+        g_assert (headers);
+        g_assert (TNY_IS_LIST (headers));
+        g_assert (TNY_FOLDER_GET_IFACE (self)->remove_msgs_async!= NULL);
+#endif
+
+        TNY_FOLDER_GET_IFACE (self)->remove_msgs_async(self, headers, callback, status_callback, user_data);
+        return;
+}
+
-/**
- * tny_folder_refresh_async:

trunk/libtinymail/tny-folder.h

@@ -133 +133 @@
-        gchar* (*get_url_string) (TnyFolder *self);
-        TnyFolderCaps (*get_caps) (TnyFolder *self);
+        void (*remove_msgs_async) (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
+
-};
-
@@ -176 +178 @@
-TnyFolderCaps tny_folder_get_caps (TnyFolder *self);
-gchar* tny_folder_get_url_string (TnyFolder *self);
+void tny_folder_remove_msgs_async (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-G_END_DECLS

trunk/libtinymail/tny-merge-folder.c

@@ -102 +102 @@
-        return;
-}
+
+
+
+typedef struct 
+{
+        TnyFolder *self;
+        TnyList *headers;
+        TnyFolderCallback callback;
+        TnyStatusCallback status_callback;
+        gpointer user_data;
+        gboolean cancelled, refresh;
+        guint depth;
+        GError *err;
+} RemMsgsInfo;
+
+
+static void
+remove_msgs_async_destroyer (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = thr_user_data;
+
+        /* thread reference */
+        g_object_unref (info->self);
+        g_object_unref (info->headers);
+
+        if (info->err)
+                g_error_free (info->err);
+
+        g_slice_free (RemMsgsInfo, thr_user_data);
+
+        return;
+}
+
+static gboolean
+remove_msgs_async_callback (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = thr_user_data;
+        TnyMergeFolderPriv *priv = TNY_MERGE_FOLDER_GET_PRIVATE (info->self);
+
+        if (info->callback) {
+                tny_lockable_lock (priv->ui_locker);
+                info->callback (info->self, info->cancelled, info->err, info->user_data);
+                tny_lockable_unlock (priv->ui_locker);
+        }
+
+        return FALSE;
+}
+
+
+static gpointer 
+remove_msgs_async_thread (gpointer thr_user_data)
+{
+        RemMsgsInfo *info = thr_user_data;
+        TnyFolder *self = info->self;
+        TnyMergeFolderPriv *priv = TNY_MERGE_FOLDER_GET_PRIVATE (self);
+        TnyIterator *iter;
+        GError *err = NULL;
+        TnyList *copy;
+
+        g_static_rec_mutex_lock (priv->lock);
+        copy = tny_list_copy (priv->mothers);
+        g_static_rec_mutex_unlock (priv->lock);
+
+        info->cancelled = FALSE;
+
+        iter = tny_list_create_iterator (copy);
+        while (!tny_iterator_is_done (iter))
+        {
+                TnyFolder *cur = TNY_FOLDER (tny_iterator_get_current (iter));
+
+                tny_folder_remove_msgs (cur, info->headers, &err);
+
+                /* TODO: Handler err */
+
+                /* TODO: Handle progress status callbacks ( info->status_callback )
+                 * you might have to start using refresh_async for that (in a 
+                 * serialized way, else you'd launch a buch of concurrent threads
+                 * and ain't going to be nice, perhaps). */
+
+                g_object_unref (cur);
+                tny_iterator_next (iter);
+        }
+
+        g_object_unref (iter);
+        g_object_unref (copy);
+
+        info->err = NULL;
+
+        if (info->callback)
+        {
+                if (info->depth > 0)
+                {
+                        g_idle_add_full (G_PRIORITY_HIGH, 
+                                remove_msgs_async_callback, 
+                                info, remove_msgs_async_destroyer);
+                } else {
+                        remove_msgs_async_callback (info);
+                        remove_msgs_async_destroyer (info);
+                }
+        } else { /* Thread reference */
+                g_object_unref (info->self);
+                g_object_unref (info->headers);
+        }
+
+        g_thread_exit (NULL);
+
+        return NULL;
+}
+
+
+static void
+tny_merge_folder_remove_msgs_async (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+        RemMsgsInfo *info;
+        GThread *thread;
+
+        info = g_slice_new (RemMsgsInfo);
+        info->err = NULL;
+        info->self = self;
+        info->headers = headers;
+        info->callback = callback;
+        info->status_callback = status_callback;
+        info->user_data = user_data;
+        info->depth = g_main_depth ();
+
+        /* thread reference */
+        g_object_ref (self);
+        g_object_ref (headers);
+
+        thread = g_thread_create (remove_msgs_async_thread, info, FALSE, NULL);
+
+        return;
+}
+
-
-static void
@@ -1740 +1874 @@
-        klass->get_caps= tny_merge_folder_get_caps;
-        klass->remove_msgs= tny_merge_folder_remove_msgs;
+        klass->remove_msgs_async= tny_merge_folder_remove_msgs_async;
-}
-