Changeset 3280

Timestamp:

01/20/08 15:12:13

Author:

pvanhoof

Message:

2008-01-20 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Refactoring of all error reporting situations, errors and handling
        

of connection failures, reconnecting and getting messages in case of a
previous connection failure.

• • • • Several bugfixes related to connection failures
        
      • Several bugfixes related to connection problems when fetching
        

messages

• • • • POP and IMAP now behave the same in case of connection problems
        

while fetching a message (they try to re-authenticate and re-connect)

• • • • More finegrained error reporting (IO errors, SERVICE errors, SYSTEM
        

errors and unknown errors).

• • • • This was a major API change for all modules
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-exception-list.def (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-store.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c (modified) (12 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (58 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-message-cache.c (modified) (7 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (29 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c (modified) (5 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-store.c (modified) (10 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-summary.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c (modified) (21 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c (modified) (18 diffs)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (6 diffs)
• trunk/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-common-priv.h (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-common.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (44 diffs)
• trunk/libtinymail-camel/tny-camel-full-msg-receive-strategy.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-nntp-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-nntp-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-pop-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-pop-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (18 diffs)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (7 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (3 diffs)
• trunk/libtinymail-maemo/tny-maemo-conic-device.c (modified) (3 diffs)
• trunk/libtinymail/tny-error.c (modified) (2 diffs)
• trunk/libtinymail/tny-error.h (modified) (4 diffs)
• trunk/libtinymail/tny-merge-folder.c (modified) (3 diffs)
• trunk/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-01-20  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Refactoring of all error reporting situations, errors and handling
+        of connection failures, reconnecting and getting messages in case of a
+        previous connection failure.
+        * Several bugfixes related to connection failures
+        * Several bugfixes related to connection problems when fetching
+        messages
+        * POP and IMAP now behave the same in case of connection problems
+        while fetching a message (they try to re-authenticate and re-connect)
+        * More finegrained error reporting (IO errors, SERVICE errors, SYSTEM
+        errors and unknown errors).
+
+        * This was a major API change for all modules
+
-2008-01-19  Philip Van Hoof <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/camel-exception-list.def

@@ -14 +14 @@
-CAMEL_EXCEPTION_USER_CANCEL,
-
+CAMEL_EXCEPTION_SYSTEM_IO_WRITE,
+CAMEL_EXCEPTION_SYSTEM_IO_READ,
+CAMEL_EXCEPTION_SYSTEM_MEMORY,
+
-/* CamelFolderException */
-CAMEL_EXCEPTION_FOLDER_NULL = 100,
@@ -21 +25 @@
-CAMEL_EXCEPTION_FOLDER_NON_UID,
-CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,
-
+
+
+
-CAMEL_EXCEPTION_FOLDER_INVALID_UID,
+CAMEL_EXCEPTION_FOLDER_UID_NOT_AVAILABLE,
-CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID,
+
-
-/* CamelStoreException */
@@ -37 +45 @@
-CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE, /* Authentication method not supported. */
-CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
-
+
+
+
+
+

trunk/libtinymail-camel/camel-lite/camel/camel-store.c

@@ -271 +271 @@
-                     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
-
-INVALID
+NO_FOLDER
-                              _("Cannot get folder: Invalid operation on this store"));
-
@@ -368 +368 @@
-                     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
-
-STORE_INVALID
+FOLDER_CREATE
-                              _("Cannot create folder: Invalid operation on this store"));
-
@@ -396 +396 @@
-            && (((store->flags & CAMEL_STORE_VTRASH) && strcmp(folder_name, CAMEL_VTRASH_NAME) == 0)
-                || ((store->flags & CAMEL_STORE_VJUNK) && strcmp(folder_name, CAMEL_VJUNK_NAME) == 0))) {
-STORE_INVALID
+FOLDER_CREATE
-                                     _("Cannot create folder: %s: folder exists"), folder_name);
-                return NULL;

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

@@ -366 +366 @@
-                                             _("Operation cancelled"));
-                } else
-UNAVAILABLE
+LOST_CONNECTION
-                                             g_strerror (errno));
-
@@ -418 +418 @@
-                        return NULL;
-                } else
-UNAVAILABLE
+LOST_CONNECTION
-                                             g_strerror (errno));
-                camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
@@ -471 +471 @@
-                        /* Connection was lost, no more data to fetch */
-                        camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-UNAVAILABLE
+LOST_CONNECTION
-                                              _("Server unexpectedly disconnected: %s"),
-                                              _("Unknown error")); /* g_strerror (104));  FIXME after 1.0 is released */
@@ -540 +540 @@
-                        /* Connection was lost, no more data to fetch */
-                        camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-UNAVAILABLE
+LOST_CONNECTION
-                                              _("Server unexpectedly disconnected: %s"),
-                                              _("Unknown error")); /* g_strerror (104));  FIXME after 1.0 is released */
@@ -635 +635 @@
-                g_warning ("Unexpected response from IMAP server: %s",
-                           respbuf);
-UNAVAILABLE
+PROTOCOL
-                                      _("Unexpected response from IMAP "
-                                        "server: %s"), respbuf);
@@ -645 +645 @@
-        if (!*p++)
-                p = NULL;
-INVALID
+PROTOCOL
-                              _("IMAP command failed: %s"),
-                              p ? p : _("Unknown error"));
@@ -715 +715 @@
-                                        camel_exception_clear (&mex);
-                                } else {
-UNAVAILABLE
+LOST_CONNECTION
-                                                             g_strerror (errno));
-                                        camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
@@ -735 +735 @@
-                                camel_exception_clear (&mex);
-                        } else {
-UNAVAILABLE
+LOST_CONNECTION
-                                             _("Server response ended too soon."));
-                                camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
@@ -880 +880 @@
-                                        camel_exception_clear (&mex);
-                                } else {
-UNAVAILABLE
+LOST_CONNECTION
-                                                             g_strerror (errno));
-                                        camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
@@ -900 +900 @@
-                                camel_exception_clear (&mex);
-                        } else {
-UNAVAILABLE
+LOST_CONNECTION
-                                             _("Server response ended too soon."));
-                                camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
@@ -1116 +1116 @@
-        } else {
-                resp = NULL;
-UNAVAILABLE
+PROTOCOL
-                                      _("IMAP server response did not contain "
-                                        "%s information"), type);
@@ -1152 +1152 @@
-        }
-
-UNAVAILABLE
+PROTOCOL
-                              _("Unexpected OK response from IMAP server: %s"),
-                              response->status);

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

@@ -297 +297 @@
-
-        if (e_util_mkdir_hier (folder_dir, S_IRWXU) != 0) {
-
+_IO_WRITE
-                                      _("Could not create directory %s: %s"),
-                                      folder_dir, g_strerror (errno));
@@ -320 +320 @@
-        if (!folder->summary) {
-                camel_object_unref (CAMEL_OBJECT (folder));
-
+_IO_READ
-                                      _("Could not load summary for %s"),
-                                      folder_name);
@@ -2685 +2685 @@
-        camel_object_unref (CAMEL_OBJECT (stream));
-        if (ret == -1) {
-ERVICE_UNAVAILABLE
+YSTEM_MEMORY
-                                      _("Unable to retrieve message: %s"),
-                                      g_strerror (errno));
@@ -2739 +2739 @@
-        if (camel_disco_store_status (CAMEL_DISCO_STORE (folder->parent_store)) == CAMEL_DISCO_STORE_OFFLINE)
-        {
-SERVICE_UN
+FOLDER_UID_NOT_
-                             _("This message is not currently available"));
-                goto fail;
@@ -2772 +2772 @@
-                                if (!camel_disco_store_check_online ((CamelDiscoStore*)store, ex)) {
-                                        CAMEL_SERVICE_REC_UNLOCK(store, connect_lock);
-SERVICE_UN
+FOLDER_UID_NOT_
-                                                             _("This message is not currently available"));
-                                        goto fail;
@@ -4343 +4343 @@
-                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-                else
-UNAVAILABLE
+LOST_CONNECTION
-                                              _("Server unexpectedly disconnected: %s"),
-                                              g_strerror (errno));
@@ -4388 +4388 @@
-        gboolean amcon = FALSE;
-
+
-        g_static_mutex_lock (&gmsgstore_lock); /* A */
-
@@ -4397 +4398 @@
-        } else
-        {
+
+                if (CAMEL_SERVICE (folder->parent_store)->status == CAMEL_SERVICE_DISCONNECTED) {
+                        CamelException tex = CAMEL_EXCEPTION_INITIALISER;
+                        camel_service_connect (CAMEL_SERVICE (folder->parent_store), &tex);
+                        if (camel_exception_is_set (&tex)) {
+                                camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_UID_NOT_AVAILABLE,
+                                                _("This message is not currently available"
+                                                " and can't go online to fetch it: %s"),
+                                                camel_exception_get_description (&tex));
+                                g_static_mutex_unlock (&gmsgstore_lock);
+                                camel_exception_clear (&tex);
+                                return NULL;
+                        }
+                }
+
-                store = CAMEL_IMAP_STORE (camel_object_new (CAMEL_IMAP_STORE_TYPE));
-                imap_debug ("Get-Message service created\n");
@@ -4416 +4432 @@
-                amcon = camel_service_connect (CAMEL_SERVICE (store), ex);
-
-
-
+
-                        camel_object_unref (store);
-                        if (!camel_exception_is_set (ex))
-SERVICE_UN
+FOLDER_UID_NOT_
-                                                _("This message is not currently available"
-(can't let a new connection go online)
+and can't go online to fetch it
-                        else if (camel_strstrcase (camel_exception_get_description (ex), "summary") != NULL)
-
-
-
-
+
+
-                                                " storage space resources."));
-                        }
-
-                        CAMEL_IMAP_FOLDER_REC_UNLOCK (imap_folder, cache_lock);
@@ -4507 +4519 @@
-  CamelImapFolder *imap_folder = (CamelImapFolder *) folder;
-  gchar *path = g_strdup_printf ("%s/%s_%s_CONVERTED", imap_folder->cache->path, uid, spec);
-
+ = CAMEL_EXCEPTION_SERVICE_PROTOCOL
-  gboolean err = FALSE, found = FALSE;
-  gchar *err_message;
@@ -4521 +4533 @@
-        if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (folder->parent_store), ex)) {
-
-SERVICE_UN
+FOLDER_UID_NOT_
-                                     _("This message is not currently available"));
-                g_free (path);
@@ -4540 +4552 @@
-                if (!fil || fd == -1) {
-                        err = TRUE;
-ERVICE_UNAVAILABL
-"Can't write %s", path
+YSTEM_IO_WRIT
+_("Write to cache failed: %s"), g_strerror (errno)
-                        goto convert_errorhandler;
-                }
@@ -4590 +4602 @@
-                                if (f > 1023 || nread <= 0) {
-                                        err = TRUE;
-UNAVAILABLE
-
-
+PROTOCOL
+_(
+)
-                                        goto convert_berrorhander;
-                                }
@@ -4602 +4614 @@
-                                                ptr += 3;
-                                        err = TRUE;
-UNAVAILABLE
+PROTOCOL
-                                        err_message = g_strdup_printf ("%s", 
-"BAD from IMAP server while CONVERT"
+_("BAD from IMAP server while CONVERT")
-                                        store->capabilities &= ~IMAP_CAPABILITY_CONVERT;
-                                        goto convert_errorhandler;
@@ -4612 +4624 @@
-                                {
-                                        err = TRUE;
-UNAVAILABLE
-
-
+PROTOCOL
+_(
+)
-                                        goto convert_berrorhander;
-                                }
@@ -4640 +4652 @@
-                        {
-                                err = TRUE;
-UNAVAILABLE
-
-
+PROTOCOL
+_(
+)
-                                goto convert_berrorhander;
-                        }
@@ -4659 +4671 @@
-                                        {
-                                                err = TRUE;
-
+
+
-                                                goto convert_berrorhander;
-                                        }
@@ -4667 +4680 @@
-                                        if (hread != 0) {
-                                                err = TRUE;
-UNAVAILABLE
-"Read from service failed, UID=%s"
+PROTOCOL
+_("Read from service failed, UID=%s")
-                                                goto convert_berrorhander;
-                                        }
@@ -4688 +4701 @@
-                } else {
-                        err = TRUE;
-UNAVAILABLE
-_printf ("CONVERT not supported on this server"
+PROTOCOL
+ (_("CONVERT not supported on this server")
-                        goto convert_errorhandler;
-                }
@@ -4712 +4725 @@
-
-        if (!err_message)
-"Could not find message body in response."
+_("Could not find message body in response")
-        else {
-                camel_exception_setv (ex, ex_id, err_message);
@@ -4732 +4745 @@
-  gchar *path = g_strdup_printf ("%s/%s_%s", imap_folder->cache->path, uid, spec);
-  gboolean retry = TRUE;
-
+ = CAMEL_EXCEPTION_SERVICE_PROTOCOL
-  gboolean err = FALSE, found = FALSE;
-  gchar *err_message;
@@ -4763 +4776 @@
-        if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (folder->parent_store), ex)) {
-
-SERVICE_UN
+FOLDER_UID_NOT_
-                                     _("This message is not currently available"));
-                g_free (path);
@@ -4787 +4800 @@
-                        if (!fil || fd == -1) {
-                                err = TRUE;
-ERVICE_UNAVAILABL
-"Can't write %s", path
+YSTEM_IO_WRIT
+_("Write to cache failed: %s"), g_strerror (errno)
-                                goto fetch_errorhandler;
-                        }
@@ -4840 +4853 @@
-                                        if (f > 1023 || nread <= 0) {
-                                                err = TRUE;
-UNAVAILABLE
-
-
+PROTOCOL
+_(
+)
-                                                goto fetch_berrorhander;
-                                        }
@@ -4864 +4877 @@
-                                        {
-                                                err = TRUE;
-UNAVAILABLE
-
-
+PROTOCOL
+_(
+)
-                                                goto fetch_berrorhander;
-                                        }
@@ -4892 +4905 @@
-                                {
-                                        err = TRUE;
-UNAVAILABLE
-
-
+PROTOCOL
+_(
+)
-                                        goto fetch_berrorhander;
-                                }
@@ -4911 +4924 @@
-                                                {
-                                                        err = TRUE;
-
+
+
-                                                        goto fetch_berrorhander;
-                                                }
@@ -4919 +4933 @@
-                                                if (hread != 0) {
-                                                        err = TRUE;
-UNAVAILABLE
-"Read from service failed, UID=%s"
+PROTOCOL
+_("Read from service failed, UID=%s")
-                                                        goto fetch_berrorhander;
-                                                }
@@ -4975 +4989 @@
-                                if (!server_stream) {
-                                        err = TRUE;
-UNAVAILABLE
-"Read from service failed: Service unavailable"
+PROTOCOL
+_("Read from service failed: Service unavailable")
-                                } else
-                                        store->command++;
@@ -5000 +5014 @@
-                                        if (linenum == 0 && (line [0] != '*' || line[1] != ' '))
-                                        {
-UNAVAILABLE
-"Read from service failed: Unexpected result from service"
+PROTOCOL
+_("Read from service failed: Unexpected result from service")
-                                                err=TRUE;
-                                                break;
@@ -5031 +5045 @@
-                                                        {
-                                                                err = TRUE;
-
+
+
-                                                                break;
-                                                        }
@@ -5038 +5053 @@
-                                                        {
-                                                                err = TRUE;
-
+
+
-                                                                break;
-                                                        }
@@ -5050 +5066 @@
-                                        if (write (fd, line, llen) != llen) {
-                                                err = TRUE;
-
+
+
-                                                break;
-                                        }
@@ -5067 +5084 @@
-                                if (nread <= 0) {
-                                        err = TRUE;
-UNAVAILABLE
-"Read from service failed: %s"
+PROTOCOL
+_("Read from service failed: %s")
-                                }
-
@@ -5107 +5124 @@
-
-        if (!err_message)
-"Could not find message body in response."
+_("Could not find message body in response")
-        else {
-                camel_exception_setv (ex, ex_id, err_message);
@@ -5170 +5187 @@
-
-                if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (folder->parent_store), ex)) {
-SERVICE_UN
+FOLDER_UID_NOT_
-                                             _("This message is not currently available"));
-                } else {
@@ -5193 +5210 @@
-                                "UID FETCH %s BODYSTRUCTURE", uid);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-                        camel_imap_response_free (store, response);
-
-                        retval = bodyst->str;
-                        g_string_free (bodyst, FALSE);
-
-                        stop_gmsgstore (imap_folder, ctchecker, FALSE);
@@ -5214 +5237 @@
-                                fputs (retval, file);
-                                fclose (file);
+                        } else {
+                                gchar *mss = g_strdup_printf (_("Write to cache failed: %s"), g_strerror (errno));
+                                camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM_IO_WRITE, mss);
+                                g_free (mss);
-                        }
-                }
@@ -5266 +5293 @@
-        if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (folder->paren