} \
}
+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,
FolderItem *item);
-static GSList *imap_parse_list (IMAPSession *session,
+static GSList *imap_parse_list (Folder *folder,
+ IMAPSession *session,
const gchar *real_path);
static void imap_create_missing_folders (Folder *folder);
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,
+ FolderItem *item);
Folder *imap_folder_new(const gchar *name, const gchar *path)
{
return folder;
}
-void imap_folder_destroy(IMAPFolder *folder)
+void imap_folder_destroy(Folder *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));
}
static void imap_folder_init(Folder *folder, const gchar *name,
const gchar *path)
{
- folder_remote_folder_init(folder, name, path);
-
folder->type = F_IMAP;
+ folder_remote_folder_init((Folder *)folder, name, path);
+
/*
folder->get_msg_list = imap_get_msg_list;
*/
- folder->fetch_msg = imap_fetch_msg;
- folder->add_msg = imap_add_msg;
- folder->move_msg = imap_move_msg;
- folder->move_msgs_with_dest = imap_move_msgs_with_dest;
- folder->copy_msg = imap_copy_msg;
- folder->copy_msgs_with_dest = imap_copy_msgs_with_dest;
- folder->remove_msg = imap_remove_msg;
- folder->remove_all_msg = imap_remove_all_msg;
- folder->is_msg_changed = imap_is_msg_changed;
+ 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->move_msgs_with_dest = imap_move_msgs_with_dest;
+ 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->scan = imap_scan_folder;
*/
- folder->scan_tree = imap_scan_tree;
- folder->create_tree = imap_create_tree;
- folder->create_folder = imap_create_folder;
- folder->rename_folder = imap_rename_folder;
- folder->remove_folder = imap_remove_folder;
+ folder->scan_tree = imap_scan_tree;
+ folder->create_tree = imap_create_tree;
+ 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;
+ folder->get_msginfo = imap_get_msginfo;
+
+ ((IMAPFolder *)folder)->selected_folder = NULL;
+}
- folder->get_num_list = imap_get_num_list;
- folder->fetch_msginfo = imap_fetch_msginfo;
+static FolderItem *imap_folder_item_new(Folder *folder)
+{
+ IMAPFolderItem *item;
+
+ item = g_new0(IMAPFolderItem, 1);
+ item->lastuid = 0;
+ item->uid_list = NULL;
+
+ return (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)
+{
+ IMAPFolderItem *item = (IMAPFolderItem *)node->data;
+
+ item->lastuid = 0;
+ g_slist_free(item->uid_list);
+ item->uid_list = NULL;
+
+ return FALSE;
+}
+
+static void imap_reset_uid_lists(Folder *folder)
+{
+ if(folder->node == NULL)
+ return;
+
+ /* Destroy all uid lists and rest last uid */
+ g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, imap_reset_uid_lists_func, NULL);
}
static IMAPSession *imap_session_get(Folder *folder)
imap_parse_namespace(IMAP_SESSION(rfolder->session),
IMAP_FOLDER(folder));
rfolder->session->last_access_time = time(NULL);
+ g_free(((IMAPFolder *)folder)->selected_folder);
+ ((IMAPFolder *)folder)->selected_folder = NULL;
+ imap_reset_uid_lists(folder);
}
statusbar_pop_all();
return IMAP_SESSION(rfolder->session);
session_destroy(rfolder->session);
rfolder->session =
imap_session_new(folder->account);
- if (rfolder->session)
+ if (rfolder->session) {
imap_parse_namespace(IMAP_SESSION(rfolder->session),
IMAP_FOLDER(folder));
+ g_free(((IMAPFolder *)folder)->selected_folder);
+ ((IMAPFolder *)folder)->selected_folder = NULL;
+ imap_reset_uid_lists(folder);
+ }
}
if (rfolder->session)
}
session = g_new(IMAPSession, 1);
+
SESSION(session)->type = SESSION_IMAP;
SESSION(session)->server = g_strdup(account->recv_server);
SESSION(session)->sock = imap_sock;
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);
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);
}
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;
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) {
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;
}
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();
{
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)
- debug_print(_("Moving message %s%c%d to %s ...\n"),
+ /* 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);
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);
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"),
+ 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);
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);
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;
+}
+
+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;
}
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);
return ok;
}
+ dir = folder_item_get_path(item);
+ 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);
debug_print("IMAP root directory: %s\n", root_folder);
}
- folder_tree_destroy(folder);
- item = folder_item_new(folder->name, root_folder);
+ item = folder_item_new(folder, folder->name, root_folder);
item->folder = folder;
+ item->no_select = TRUE;
folder->node = g_node_new(item);
imap_scan_tree_recursive(session, item);
wildcard_path);
strtailchomp(real_path, separator);
- item_list = imap_parse_list(session, real_path);
+ item_list = imap_parse_list(folder, session, real_path);
g_free(real_path);
for (cur = item_list; cur != NULL; cur = cur->next) {
return IMAP_SUCCESS;
}
-static GSList *imap_parse_list(IMAPSession *session, const gchar *real_path)
+static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar *real_path)
{
gchar buf[IMAPBUFSIZE];
gchar flags[256];
loc_name = imap_modified_utf7_to_locale(name);
loc_path = imap_modified_utf7_to_locale(buf);
- new_item = folder_item_new(loc_name, loc_path);
+ new_item = folder_item_new(folder, loc_name, loc_path);
if (strcasestr(flags, "\\Noinferiors") != NULL)
new_item->no_sub = TRUE;
if (strcmp(buf, "INBOX") != 0 &&
}
}
- new_item = folder_item_new(new_name, dirpath);
+ new_item = folder_item_new(folder, new_name, dirpath);
folder_item_append(parent, new_item);
g_free(imap_path);
g_free(dirpath);
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; ) {
cur = next;
}
- debug_print(_("done.\n"));
+ debug_print("done.\n");
return mlist;
}
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
session->mbox = g_strdup(path);
g_free(real_path);
+ g_free(folder->selected_folder);
+ folder->selected_folder = g_strdup(path);
+
return ok;
}
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;
+ gint i, lastuid_old, nummsgs = 0;
gint ok, exists = 0, recent = 0, unseen = 0;
guint32 uid_validity = 0;
- guint32 uid = 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->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->path,
+ ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
&exists, &recent, &unseen, &uid_validity);
if (ok != IMAP_SUCCESS)
- return NULL;
+ return -1;
- for(i = 1; i <= exists; i++) {
- ok = imap_get_uid(session, i, &uid);
- if (ok != IMAP_SUCCESS)
- return msgnum_list;
- msgnum_list = g_slist_prepend(msgnum_list, GINT_TO_POINTER(uid));
+ argbuf = g_ptr_array_new();
+ if(item->lastuid) {
+ cmdbuf = g_strdup_printf("UID FETCH %d:* (UID)", (item->lastuid + 1));
+ } else {
+ cmdbuf = g_strdup("FETCH 1:* (UID)");
}
+ imap_cmd_gen_send(SESSION(session)->sock, cmdbuf);
+ g_free(cmdbuf);
+ ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+ if (ok != IMAP_SUCCESS) {
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+ 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(item->uid_list));
+ for(i = 0; i < argbuf->len; i++) {
+ int ret, msgidx, msgnum;
- return msgnum_list;
+ 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));
+ item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
+ nummsgs++;
+
+ if(msgnum > item->lastuid)
+ item->lastuid = msgnum;
+ }
+ }
+ }
+
+ 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)
{
- gchar *tmp;
IMAPSession *session;
- GString *str;
- MsgInfo *msginfo;
- gint ok, exists = 0, recent = 0, unseen = 0;
- guint32 uid_validity = 0;
- guint32 uid = 0;
-
+ 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);
g_return_val_if_fail(session != NULL, NULL);
- ok = imap_select(session, IMAP_FOLDER(folder), item->path,
- &exists, &recent, &unseen, &uid_validity);
- if (ok != IMAP_SUCCESS)
- return NULL;
-
- if (imap_cmd_envelope(SESSION(session)->sock, num, num)
- != IMAP_SUCCESS) {
- log_warning(_("can't get envelope\n"));
- return NULL;
+ list = imap_get_uncached_messages(session, item, uid, uid);
+ if (list) {
+ msginfo = (MsgInfo *)list->data;
+ list->data = NULL;
}
+ procmsg_msg_list_free(list);
- str = g_string_new(NULL);
+ return msginfo;
+}
- 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);
+gboolean imap_check_msgnum_validity(Folder *folder, FolderItem *_item)
+{
+ IMAPSession *session;
+ IMAPFolderItem *item = (IMAPFolderItem *)_item;
+ gint ok, exists = 0, recent = 0, unseen = 0;
+ guint32 uid_next, uid_validity = 0;
+
+ g_return_val_if_fail(folder != NULL, FALSE);
+ g_return_val_if_fail(item != NULL, FALSE);
+ g_return_val_if_fail(item->item.folder != NULL, FALSE);
+ g_return_val_if_fail(item->item.folder->type == F_IMAP, FALSE);
- msginfo = imap_parse_envelope(SESSION(session)->sock, item, str);
- if (!msginfo) {
- log_warning(_("can't parse envelope: %s\n"), str->str);
- }
+ session = imap_session_get(folder);
+ g_return_val_if_fail(session != NULL, FALSE);
- tmp = NULL;
- do {
- g_free(tmp);
- tmp = sock_getline(SESSION(session)->sock);
- } while (!(tmp == NULL || tmp[0] != '*' || tmp[1] != ' '));
-
- msginfo->folder = item;
+ ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
+ &exists, &recent, &uid_next, &uid_validity, &unseen);
+ if (ok != IMAP_SUCCESS)
+ return FALSE;
- g_string_free(str, TRUE);
-
- return msginfo;
+ 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;
}
projects / claws.git / blobdiff