Changeset 2000

Timestamp:

05/17/07 16:30:45

Author:

pvanhoof

Message:

Recursively removing folders

Files:

• trunk/docs/building.txt (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (3 diffs)

trunk/docs/building.txt

@@ -128 +128 @@
-Read requirements.txt
-
+For debugging
+-------------
+CFLAGS="-D_GNU_SOURCE -O0 -Wstrict-prototypes -Wall -g -ggdb" PKG_CONFIG_PATH=/opt/asyncworker/lib/pkgconfig \
+        ./autogen.sh --prefix=/opt/tinymail --enable-asyncworker --enable-tests && make && sudo make install
+

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c

@@ -112 +112 @@
-
-                store->current_folder = folder;
+                //store->current_folder = NULL;
-                if (store->capabilities & IMAP_CAPABILITY_CONDSTORE) 
-                        cmd = imap_command_strdup_printf (store, "SELECT %F (CONDSTORE)", folder->full_name);
@@ -275 +276 @@
-        len = strlen (full_cmd);
-
-
-
+
-        nwritten = camel_stream_write (store->ostream, full_cmd, len);
+
+        imap_debug ("(%d, %d) -> %s\n", len, nwritten, full_cmd);
-
-        /* g_mutex_unlock (store->stream_lock); */

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.h

@@ -26 +26 @@
-#define CAMEL_IMAP_STORE_H 1
-
-
-
+
+
+
+
-
-#ifdef IDLE_DEBUG
-(o)  printf ("%s\n", o)
+     g_print 
-#else
-
+, ...
-#endif
-
-#ifdef IMAP_DEBUG
-(o)  printf ("%s\n", o)
+     g_print 
-#else
-
+, ...
-#endif
-

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

@@ -1550 +1550 @@
-        TnyFolderStore *a_store=NULL;
-        TnyFolder *retval = NULL;
-, *acc_from
+
-        TnyCamelFolderPriv *fpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder);
-        TnyList *headers;
@@ -2766 +2766 @@
-
-static void 
-
-
-
-
-
-
-
-
+
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
@@ -2782 +2775 @@
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-        gboolean changed = FALSE;
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err, 
-                        TNY_FOLDER_STORE_ERROR, TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER))
-                return;
-
-        if (!cpriv->folder_name || !priv->folder_name)
-        {
-                _tny_session_stop_operation (TNY_FOLDER_PRIV_GET_SESSION (priv));
-                return;
-        }
-
-        g_static_rec_mutex_lock (priv->folder_lock);
@@ -2857 +2840 @@
-        }
-
+        return;
+}
+
+static void
+recurse_remove (TnyFolderStore *from, TnyFolder *folder, GError **err)
+{
+        TnyCamelFolderPriv *fpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (from);
+        GError *nerr = NULL;
+
+        g_static_rec_mutex_lock (fpriv->folder_lock);
+
+        if (TNY_IS_FOLDER_STORE (folder))
+        {
+                TnyList *folders = tny_simple_list_new ();
+                TnyIterator *iter;
+
+                tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), 
+                                folders, NULL, &nerr);
+
+                if (nerr != NULL)
+                {
+                        g_object_unref (folders);
+                        goto exception;
+                }
+
+                iter = tny_list_create_iterator (folders);
+                while (!tny_iterator_is_done (iter))
+                {
+                        TnyFolder *cur = TNY_FOLDER (tny_iterator_get_current (iter));
+
+                        recurse_remove (TNY_FOLDER_STORE (folder), cur, &nerr);
+
+                        if (nerr != NULL)
+                        {
+                                g_object_unref (cur);
+                                g_object_unref (iter);
+                                g_object_unref (folders);
+                                goto exception;
+                        }
+
+                        g_object_unref (cur);
+                        tny_iterator_next (iter);
+                }
+                g_object_unref (iter);
+                g_object_unref (folders);
+        }
+
+        tny_debug ("tny_folder_store_remove: actual removal of %s\n", 
+                        tny_folder_get_name (folder));
+
+        tny_camel_folder_remove_folder_actual (from, folder, &nerr);
+
+
+exception:
+
+        if (nerr != NULL)
+                g_propagate_error (err, nerr);
+
+        g_static_rec_mutex_unlock (fpriv->folder_lock);
+
+        return;
+}
+
+static void 
+tny_camel_folder_remove_folder (TnyFolderStore *self, TnyFolder *folder, GError **err)
+{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->remove_folder_func (self, folder, err);
+}
+
+static void 
+tny_camel_folder_remove_folder_default (TnyFolderStore *self, TnyFolder *folder, GError **err)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        GError *nerr = NULL;
+
+        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err, 
+                        TNY_FOLDER_STORE_ERROR, TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER))
+                return;
+
+        recurse_remove (self, folder, &nerr);
+
+        if (nerr != NULL)
+                g_propagate_error (err, nerr);
+
-        _tny_session_stop_operation (TNY_FOLDER_PRIV_GET_SESSION (priv));
-
-        return;
-}
+
-
-void

trunk/libtinymail-camel/tny-camel-store-account.c

@@ -396 +396 @@
-
-static void 
-default
+actual
-{
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -408 +408 @@
-
-        /* TNY TODO: Support non-TnyCamelFolder TnyFolder implementations too */
+
+
+        store = CAMEL_STORE (apriv->service);
+
+        if (camel_exception_is_set (&ex)) 
+        {
+                g_set_error (err, TNY_FOLDER_STORE_ERROR, 
+                                TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER,
+                                camel_exception_get_description (&ex));
+                camel_exception_clear (&ex);
+
+                if (store && CAMEL_IS_OBJECT (store))
+                                camel_object_unref (CAMEL_OBJECT (store));
+                _tny_session_stop_operation (apriv->session);
+
+                return;
+        }
+
+        g_assert (CAMEL_IS_STORE (store));
+        g_assert (cpriv->folder_name != NULL);
+
+        g_static_rec_mutex_lock (cpriv->obs_lock);
+        if (cpriv->observers) {
+                g_object_unref (G_OBJECT (cpriv->observers));
+                cpriv->observers = NULL;
+        }
+        if (cpriv->sobservers) {
+                g_object_unref (G_OBJECT (cpriv->sobservers));
+                cpriv->sobservers = NULL;
+        }
+        g_static_rec_mutex_unlock (cpriv->obs_lock);
+
+        if (camel_store_supports_subscriptions (store))
+                camel_store_subscribe_folder (store, cpriv->folder_name, &subex);
+
+        camel_store_delete_folder (store, cpriv->folder_name, &ex);
+
+        if (camel_exception_is_set (&ex)) 
+        {
+                g_set_error (err, TNY_FOLDER_STORE_ERROR, 
+                                TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER,
+                                camel_exception_get_description (&ex));
+                camel_exception_clear (&ex);
+        } else 
+        {
+                if (camel_store_supports_subscriptions (store))
+                        camel_store_unsubscribe_folder (store, cpriv->folder_name, &subex);
+
+                TnyFolderStoreChange *change;
+                change = tny_folder_store_change_new (self);
+                tny_folder_store_change_add_removed_folder (change, folder);
+                notify_folder_store_observers_about (self, change);
+                g_object_unref (G_OBJECT (change));
+        }
+
+        g_free (cpriv->folder_name); 
+        cpriv->folder_name = NULL;
+
+        camel_object_unref (CAMEL_OBJECT (store));
+
+        return;
+}
+
+
+static void
+recurse_remove (TnyFolderStore *from, TnyFolder *folder, GError **err)
+{
+        TnyCamelFolderPriv *fpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (from);
+        GError *nerr = NULL;
+
+        g_static_rec_mutex_lock (fpriv->folder_lock);
+
+        if (TNY_IS_FOLDER_STORE (folder))
+        {
+                TnyList *folders = tny_simple_list_new ();
+                TnyIterator *iter;
+
+                tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), 
+                                folders, NULL, &nerr);
+
+                if (nerr != NULL)
+                {
+                        g_object_unref (folders);
+                        goto exception;
+                }
+
+                iter = tny_list_create_iterator (folders);
+                while (!tny_iterator_is_done (iter))
+                {
+                        TnyFolder *cur = TNY_FOLDER (tny_iterator_get_current (iter));
+
+                        recurse_remove (TNY_FOLDER_STORE (folder), cur, &nerr);
+
+                        if (nerr != NULL)
+                        {
+                                g_object_unref (cur);
+                                g_object_unref (iter);
+                                g_object_unref (folders);
+                                goto exception;
+                        }
+
+                        g_object_unref (cur);
+                        tny_iterator_next (iter);
+                }
+                g_object_unref (iter);
+                g_object_unref (folders);
+        }
+
+        tny_debug ("tny_folder_store_remove: actual removal of %s\n", 
+                        tny_folder_get_name (folder));
+
+        tny_camel_store_account_remove_folder_actual (from, folder, &nerr);
+
+
+exception:
+
+        if (nerr != NULL)
+                g_propagate_error (err, nerr);
+
+        g_static_rec_mutex_unlock (fpriv->folder_lock);
+
+        return;
+}
+
+static void 
+tny_camel_store_account_remove_folder_default (TnyFolderStore *self, TnyFolder *folder, GError **err)
+{
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
+        GError *nerr = NULL;
-
-        if (!_tny_session_check_operation (apriv->session, err, 
@@ -424 +553 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        _tny_session_stop_operation (apriv->session);
+
-
-        return;