} \
}
+struct _IMAPFolderItem
+{
+ FolderItem item;
+
+ guint lastuid;
+ GSList *uid_list;
+};
+
static GList *session_list = NULL;
static gint imap_cmd_count = 0;
const gchar *name,
const gchar *path);
+static FolderItem *imap_folder_item_new (Folder *folder);
+static void imap_folder_item_destroy (Folder *folder,
+ FolderItem *item);
+
static IMAPSession *imap_session_get (Folder *folder);
static gint imap_scan_tree_recursive (IMAPSession *session,
static gboolean imap_rename_folder_func (GNode *node,
gpointer data);
-GSList *imap_get_num_list (Folder *folder,
- FolderItem *item);
-MsgInfo *imap_fetch_msginfo (Folder *folder,
+gint imap_get_num_list (Folder *folder,
+ FolderItem *item,
+ GSList **list);
+MsgInfo *imap_get_msginfo (Folder *folder,
FolderItem *item,
gint num);
gboolean imap_check_msgnum_validity (Folder *folder,
/*
folder->get_msg_list = imap_get_msg_list;
*/
+ folder->item_new = imap_folder_item_new;
+ folder->item_destroy = imap_folder_item_destroy;
folder->fetch_msg = imap_fetch_msg;
folder->add_msg = imap_add_msg;
folder->move_msg = imap_move_msg;
folder->copy_msg = imap_copy_msg;
folder->copy_msgs_with_dest = imap_copy_msgs_with_dest;
folder->remove_msg = imap_remove_msg;
+ folder->remove_msgs = imap_remove_msgs;
folder->remove_all_msg = imap_remove_all_msg;
folder->is_msg_changed = imap_is_msg_changed;
/*
folder->check_msgnum_validity = imap_check_msgnum_validity;
folder->get_num_list = imap_get_num_list;
- folder->fetch_msginfo = imap_fetch_msginfo;
+ folder->get_msginfo = imap_get_msginfo;
((IMAPFolder *)folder)->selected_folder = NULL;
}
-FolderItem *imap_folder_item_new()
+static FolderItem *imap_folder_item_new(Folder *folder)
{
IMAPFolderItem *item;
return (FolderItem *)item;
}
-void imap_folder_item_destroy(FolderItem *_item)
+static void imap_folder_item_destroy(Folder *folder, FolderItem *_item)
{
IMAPFolderItem *item = (IMAPFolderItem *)_item;
g_return_if_fail(item != NULL);
g_slist_free(item->uid_list);
+
+ g_free(_item);
}
static gboolean imap_reset_uid_lists_func(GNode *node, gpointer data)
{
gchar *destdir;
IMAPSession *session;
- gint messages, recent, unseen;
+ gint messages, recent, unseen, exists;
guint32 uid_next, uid_validity;
gint ok;
-
+
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(folder->type == F_IMAP, -1);
g_return_val_if_fail(dest != NULL, -1);
destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
- if (remove_source)
+ /* ensure source folder selected */
+ if (strcmp(((IMAPFolder *)folder)->selected_folder,
+ msginfo->folder->path) != 0) {
+ ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+ &exists, &recent, &unseen, &uid_validity);
+ statusbar_pop_all();
+ if (ok != IMAP_SUCCESS)
+ return -1;
+ }
+
+ if (remove_source)
debug_print("Moving message %s%c%d to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, destdir);
MsgInfo *msginfo;
IMAPSession *session;
gint ok = IMAP_SUCCESS;
+ gint exists, recent, unseen;
+ guint32 uid_validity;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
continue;
}
+ /* ensure source folder selected */
+ if (strcmp(((IMAPFolder *)folder)->selected_folder,
+ msginfo->folder->path) != 0) {
+ ok = imap_select(session, IMAP_FOLDER(folder),
+ msginfo->folder->path, &exists, &recent, &unseen,
+ &uid_validity);
+ statusbar_pop_all();
+ if (ok != IMAP_SUCCESS)
+ return -1;
+ }
+
if (remove_source)
debug_print("Moving message %s%c%d to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
}
dir = folder_item_get_path(item);
- remove_numbered_files(dir, uid, uid);
+ if (is_dir_exist(dir))
+ remove_numbered_files(dir, uid, uid);
g_free(dir);
return IMAP_SUCCESS;
}
+gint imap_remove_msgs(Folder *folder, FolderItem *item, GSList *msglist)
+{
+ gint exists, recent, unseen;
+ guint32 uid_validity;
+ gint ok;
+ IMAPSession *session;
+ gchar *dir;
+ MsgInfo *msginfo;
+ GSList *cur;
+ guint32 uid;
+
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(folder->type == F_IMAP, -1);
+ g_return_val_if_fail(item != NULL, -1);
+ g_return_val_if_fail(msglist != NULL, -1);
+
+ session = imap_session_get(folder);
+ if (!session) return -1;
+
+ ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+ &exists, &recent, &unseen, &uid_validity);
+ statusbar_pop_all();
+ if (ok != IMAP_SUCCESS)
+ return ok;
+
+ for (cur = msglist; cur != NULL; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ uid = msginfo->msgnum;
+ ok = imap_set_message_flags
+ (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
+ uid, uid, IMAP_FLAG_DELETED, TRUE);
+ statusbar_pop_all();
+ if (ok != IMAP_SUCCESS) {
+ log_warning(_("can't set deleted flags: %d\n"), uid);
+ return ok;
+ }
+ }
+
+ ok = imap_cmd_expunge(SESSION(session)->sock);
+ statusbar_pop_all();
+ if (ok != IMAP_SUCCESS) {
+ log_warning(_("can't expunge\n"));
+ return ok;
+ }
+
+ dir = folder_item_get_path(item);
+ if (is_dir_exist(dir)) {
+ for (cur = msglist; cur != NULL; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ uid = msginfo->msgnum;
+ remove_numbered_files(dir, uid, uid);
+ }
+ }
+ g_free(dir);
+
+ return IMAP_SUCCESS;
+}
+
gint imap_remove_all_msg(Folder *folder, FolderItem *item)
{
gint exists, recent, unseen;
}
dir = folder_item_get_path(item);
- remove_all_numbered_files(dir);
+ if (is_dir_exist(dir))
+ remove_all_numbered_files(dir);
g_free(dir);
return IMAP_SUCCESS;
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);
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; ) {
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");
return FALSE;
}
-GSList *imap_get_num_list(Folder *folder, FolderItem *_item)
+gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
{
IMAPFolderItem *item = (IMAPFolderItem *)_item;
IMAPSession *session;
- GSList *msgnum_list = NULL;
- gint i, lastuid_old;
+ gint i, lastuid_old, nummsgs = 0;
gint ok, exists = 0, recent = 0, unseen = 0;
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);
- g_return_val_if_fail(item->item.path != NULL, NULL);
- g_return_val_if_fail(folder->type == F_IMAP, NULL);
- g_return_val_if_fail(folder->account != NULL, NULL);
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(item != NULL, -1);
+ g_return_val_if_fail(item->item.path != NULL, -1);
+ g_return_val_if_fail(folder->type == F_IMAP, -1);
+ g_return_val_if_fail(folder->account != NULL, -1);
session = imap_session_get(folder);
- g_return_val_if_fail(session != NULL, NULL);
+ g_return_val_if_fail(session != NULL, -1);
ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
&exists, &recent, &unseen, &uid_validity);
if (ok != IMAP_SUCCESS)
- return NULL;
+ return -1;
argbuf = g_ptr_array_new();
if(item->lastuid) {
if (ok != IMAP_SUCCESS) {
ptr_array_free_strings(argbuf);
g_ptr_array_free(argbuf, TRUE);
- return NULL;
+ return -1;
}
lastuid_old = item->lastuid;
- msgnum_list = g_slist_copy(item->uid_list);
- debug_print("Got %d uids from cache\n", g_slist_length(msgnum_list));
+ *msgnum_list = g_slist_copy(item->uid_list);
+ debug_print("Got %d uids from cache\n", g_slist_length(item->uid_list));
for(i = 0; i < argbuf->len; i++) {
int ret, msgidx, msgnum;
if((ret = sscanf(g_ptr_array_index(argbuf, i), "%d FETCH (UID %d)", &msgidx, &msgnum)) == 2) {
if(msgnum > lastuid_old) {
- msgnum_list = g_slist_prepend(msgnum_list, GINT_TO_POINTER(msgnum));
+ *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(msgnum));
item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
+ nummsgs++;
if(msgnum > item->lastuid)
item->lastuid = msgnum;
}
}
- return msgnum_list;
+ 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 nummsgs;
}
-MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
+MsgInfo *imap_get_msginfo(Folder *folder, FolderItem *item, gint uid)
{
- IMAPFolder *folder = (IMAPFolder *)_folder;
- gchar *tmp;
IMAPSession *session;
- GString *str;
- MsgInfo *msginfo;
- int same_folder;
-
+ GSList *list;
+ MsgInfo *msginfo = NULL;
+
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->folder != NULL, NULL);
- g_return_val_if_fail(item->folder->type == F_IMAP, NULL);
- session = imap_session_get(_folder);
+ session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, NULL);
- 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;
-
- ok = imap_select(session, IMAP_FOLDER(folder), item->path,
- &exists, &recent, &unseen, &uid_validity);
- if (ok != IMAP_SUCCESS)
- return NULL;
+ list = imap_get_uncached_messages(session, item, uid, uid);
+ if (list) {
+ msginfo = (MsgInfo *)list->data;
+ list->data = NULL;
}
-
- if (imap_cmd_envelope(SESSION(session)->sock, num, num)
- != IMAP_SUCCESS) {
- log_warning(_("can't get envelope\n"));
- return NULL;
- }
-
- str = g_string_new(NULL);
-
- if ((tmp = sock_getline(SESSION(session)->sock)) == NULL) {
- log_warning(_("error occurred while getting envelope.\n"));
- g_string_free(str, TRUE);
- return NULL;
- }
- strretchomp(tmp);
- log_print("IMAP4< %s\n", tmp);
- g_string_assign(str, tmp);
- g_free(tmp);
-
- /* 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);
-
- /* 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;
+ procmsg_msg_list_free(list);
return msginfo;
}
projects / claws.git / blobdiff