* src/imap.c

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index dded5c6ab94cf9303cf59eaaa475409dac820cbb..672e15ef93f0e842f06b6056596c73fb23f33a94 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -289,10 +289,15 @@ Folder *imap_folder_new(const gchar *name, const gchar *path)
        return folder;
 }
 
-void imap_folder_destroy(IMAPFolder *folder)
+void imap_folder_destroy(Folder *folder)
 {
-       g_free(folder->selected_folder);
-       
+       gchar *dir;
+
+       dir = folder_get_path(folder);
+       if (is_dir_exist(dir))
+               remove_dir_recursive(dir);
+       g_free(dir);
+
        folder_remote_folder_destroy(REMOTE_FOLDER(folder));
 }
 
@@ -323,6 +328,7 @@ static void imap_folder_init(Folder *folder, const gchar *name,
        folder->create_folder         = imap_create_folder;
        folder->rename_folder         = imap_rename_folder;
        folder->remove_folder         = imap_remove_folder;
+       folder->destroy               = imap_folder_destroy;
        folder->check_msgnum_validity = imap_check_msgnum_validity;
 
        folder->get_num_list          = imap_get_num_list;
@@ -510,6 +516,7 @@ Session *imap_session_new(const PrefsAccount *account)
        }
 
        session = g_new(IMAPSession, 1);
+
        SESSION(session)->type             = SESSION_IMAP;
        SESSION(session)->server           = g_strdup(account->recv_server);
        SESSION(session)->sock             = imap_sock;
@@ -517,6 +524,9 @@ Session *imap_session_new(const PrefsAccount *account)
        SESSION(session)->phase            = SESSION_READY;
        SESSION(session)->last_access_time = time(NULL);
        SESSION(session)->data             = NULL;
+
+       SESSION(session)->destroy          = imap_session_destroy;
+
        session->mbox = NULL;
 
        session_list = g_list_append(session_list, session);
@@ -524,12 +534,12 @@ Session *imap_session_new(const PrefsAccount *account)
        return SESSION(session);
 }
 
-void imap_session_destroy(IMAPSession *session)
+void imap_session_destroy(Session *session)
 {
-       sock_close(SESSION(session)->sock);
-       SESSION(session)->sock = NULL;
+       sock_close(session->sock);
+       session->sock = NULL;
 
-       g_free(session->mbox);
+       g_free(IMAP_SESSION(session)->mbox);
 
        session_list = g_list_remove(session_list, session);
 }
@@ -563,7 +573,7 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 
        if (!session) {
                mlist = procmsg_read_cache(item, FALSE);
-               item->last_num = procmsg_get_last_num_in_cache(mlist);
+               item->last_num = procmsg_get_last_num_in_msg_list(mlist);
                procmsg_set_flags(mlist, item);
                statusbar_pop_all();
                return mlist;
@@ -591,7 +601,7 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 
                mlist = procmsg_read_cache(item, FALSE);
                procmsg_set_flags(mlist, item);
-               cache_last = procmsg_get_last_num_in_cache(mlist);
+               cache_last = procmsg_get_last_num_in_msg_list(mlist);
 
                /* calculating the range of envelope to get */
                if (item->mtime != uid_validity) {
@@ -656,7 +666,7 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
        g_free(path);
  
        if (is_file_exist(filename)) {
-               debug_print(_("message %d has been already cached.\n"), uid);
+               debug_print("message %d has been already cached.\n", uid);
                return filename;
        }
 
@@ -675,7 +685,7 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
                return NULL;
        }
 
-       debug_print(_("getting message %d...\n"), uid);
+       debug_print("getting message %d...\n", uid);
        ok = imap_cmd_fetch(SESSION(session)->sock, (guint32)uid, filename);
 
        statusbar_pop_all();
@@ -763,11 +773,11 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
        destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
        if (remove_source)
-               debug_print(_("Moving message %s%c%d to %s ...\n"),
+               debug_print("Moving message %s%c%d to %s ...\n",
                            msginfo->folder->path, G_DIR_SEPARATOR,
                            msginfo->msgnum, destdir);
        else
-               debug_print(_("Copying message %s%c%d to %s ...\n"),
+               debug_print("Copying message %s%c%d to %s ...\n",
                            msginfo->folder->path, G_DIR_SEPARATOR,
                            msginfo->msgnum, destdir);
 
@@ -816,11 +826,11 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
                }
 
                if (remove_source)
-                       debug_print(_("Moving message %s%c%d to %s ...\n"),
+                       debug_print("Moving message %s%c%d to %s ...\n",
                                    msginfo->folder->path, G_DIR_SEPARATOR,
                                    msginfo->msgnum, destdir);
                else
-                       debug_print(_("Copying message %s%c%d to %s ...\n"),
+                       debug_print("Copying message %s%c%d to %s ...\n",
                                    msginfo->folder->path, G_DIR_SEPARATOR,
                                    msginfo->msgnum, destdir);
 
@@ -952,6 +962,7 @@ gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
        guint32 uid_validity;
        gint ok;
        IMAPSession *session;
+       gchar *dir;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(folder->type == F_IMAP, -1);
@@ -982,6 +993,11 @@ gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
                return ok;
        }
 
+       dir = folder_item_get_path(item);
+       if (is_dir_exist(dir))
+               remove_numbered_files(dir, uid, uid);
+       g_free(dir);
+
        return IMAP_SUCCESS;
 }
 
@@ -991,6 +1007,7 @@ gint imap_remove_all_msg(Folder *folder, FolderItem *item)
        guint32 uid_validity;
        gint ok;
        IMAPSession *session;
+       gchar *dir;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(item != NULL, -1);
@@ -1022,6 +1039,11 @@ gint imap_remove_all_msg(Folder *folder, FolderItem *item)
                return ok;
        }
 
+       dir = folder_item_get_path(item);
+       if (is_dir_exist(dir))
+               remove_all_numbered_files(dir);
+       g_free(dir);
+
        return IMAP_SUCCESS;
 }
 
@@ -1068,7 +1090,15 @@ void imap_scan_tree(Folder *folder)
        g_return_if_fail(folder->account != NULL);
 
        session = imap_session_get(folder);
-       if (!session) return;
+       if (!session) {
+               if (!folder->node) {
+                       folder_tree_destroy(folder);
+                       item = folder_item_new(folder, folder->name, NULL);
+                       item->folder = folder;
+                       folder->node = g_node_new(item);
+               }
+               return;
+       }
 
        if (folder->account->imap_dir && *folder->account->imap_dir) {
                Xstrdup_a(root_folder, folder->account->imap_dir, return);
@@ -1631,11 +1661,12 @@ static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
        g_return_val_if_fail(item->folder != NULL, mlist);
        g_return_val_if_fail(item->folder->type == F_IMAP, mlist);
 
-       debug_print(_("Deleting cached messages %u - %u ... "),
+       debug_print("Deleting cached messages %u - %u ... ",
                    first_uid, last_uid);
 
        dir = folder_item_get_path(item);
-       remove_numbered_files(dir, first_uid, last_uid);
+       if (is_dir_exist(dir))
+               remove_numbered_files(dir, first_uid, last_uid);
        g_free(dir);
 
        for (cur = mlist; cur != NULL; ) {
@@ -1651,7 +1682,7 @@ static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
                cur = next;
        }
 
-       debug_print(_("done.\n"));
+       debug_print("done.\n");
 
        return mlist;
 }
@@ -1664,13 +1695,14 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->type == F_IMAP);
 
-       debug_print(_("Deleting all cached messages... "));
+       debug_print("Deleting all cached messages...\n");
 
        dir = folder_item_get_path(item);
-       remove_all_numbered_files(dir);
+       if (is_dir_exist(dir))
+               remove_all_numbered_files(dir);
        g_free(dir);
 
-       debug_print(_("done.\n"));
+       debug_print("done.\n");
 }
 
 #if USE_SSL
@@ -3104,6 +3136,7 @@ GSList *imap_get_num_list(Folder *folder, FolderItem *_item)
        guint32 uid_validity = 0;
        GPtrArray *argbuf;
        gchar *cmdbuf = NULL;
+       gchar *dir;
        
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
@@ -3119,14 +3152,6 @@ GSList *imap_get_num_list(Folder *folder, FolderItem *_item)
        if (ok != IMAP_SUCCESS)
                return NULL;
 
-       if(item->item.mtime != uid_validity) {
-               item->lastuid = 0;
-               g_slist_free(item->uid_list);
-               item->uid_list = NULL;
-               
-               item->item.mtime = uid_validity;
-       }
-       
        argbuf = g_ptr_array_new();
        if(item->lastuid) {
                cmdbuf = g_strdup_printf("UID FETCH %d:* (UID)", (item->lastuid + 1));
@@ -3159,6 +3184,11 @@ GSList *imap_get_num_list(Folder *folder, FolderItem *_item)
                }
        }
 
+       dir = folder_item_get_path((FolderItem *)item);
+       debug_print("removing old messages from %s\n", dir);
+       remove_numbered_files_not_in_list(dir, msgnum_list);
+       g_free(dir);
+
        return msgnum_list;
 }
 
@@ -3169,6 +3199,7 @@ MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
        IMAPSession *session;
        GString *str;
        MsgInfo *msginfo;
+       int same_folder;
        
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
@@ -3178,7 +3209,12 @@ MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
        session = imap_session_get(_folder);
        g_return_val_if_fail(session != NULL, NULL);
 
-       if(strcmp(folder->selected_folder, item->path) != 0) {
+       same_folder = FALSE;
+       if (folder->selected_folder != NULL)
+               if (strcmp(folder->selected_folder, item->path) == 0)
+                       same_folder = TRUE;
+       
+       if (!same_folder) {
                gint ok, exists = 0, recent = 0, unseen = 0;
                guint32 uid_validity = 0;
 
@@ -3187,7 +3223,7 @@ MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
                if (ok != IMAP_SUCCESS)
                        return NULL;
        }
-               
+       
        if (imap_cmd_envelope(SESSION(session)->sock, num, num)
            != IMAP_SUCCESS) {
                log_warning(_("can't get envelope\n"));
@@ -3206,28 +3242,33 @@ MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
        g_string_assign(str, tmp);
        g_free(tmp);
 
-       if (str->str[0] == '*') {
-               msginfo = imap_parse_envelope(SESSION(session)->sock,
-                                             item, str);
-               if (!msginfo) {
-                       log_warning(_("can't parse envelope: %s\n"), str->str);
-               }
-       }
-       else {
+       /* if the server did not return a envelope */
+       if (str->str[0] != '*') {
                g_string_free(str, TRUE);
                return NULL;
        }
 
+       msginfo = imap_parse_envelope(SESSION(session)->sock,
+                                     item, str);
+
+       /* Read all data on the socket until the server is read for a new command */
        tmp = NULL;
        do {
                g_free(tmp);
                tmp = sock_getline(SESSION(session)->sock);
        } while (!(tmp == NULL || tmp[0] != '*' || tmp[1] != ' '));
+       g_free(tmp);
 
-       msginfo->folder = item;
+       /* if message header could not be parsed */
+       if (!msginfo) {
+               log_warning(_("can't parse envelope: %s\n"), str->str);
+               return NULL;
+       }
 
        g_string_free(str, TRUE);
-       
+
+       msginfo->folder = item;
+
        return msginfo;
 }
 
@@ -3251,5 +3292,17 @@ gboolean imap_check_msgnum_validity(Folder *folder, FolderItem *_item)
        if (ok != IMAP_SUCCESS)
                return FALSE;
 
-       return item->item.mtime == uid_validity;
+       if(item->item.mtime == uid_validity)
+               return TRUE;
+
+       debug_print("Freeing imap uid cache");
+       item->lastuid = 0;
+       g_slist_free(item->uid_list);
+       item->uid_list = NULL;
+               
+       item->item.mtime = uid_validity;
+
+       imap_delete_all_cached_messages((FolderItem *)item);
+
+       return FALSE;
 }