/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "prefs_account.h"
#include "codeconv.h"
#include "md5.h"
-#include "base64.h"
#include "utils.h"
#include "prefs_common.h"
#include "inputdialog.h"
return cnt;
}
-static void imap_remove_cached_msg(Folder *folder, FolderItem *item, MsgInfo *msginfo)
+static gchar *imap_get_cached_filename(FolderItem *item, guint msgnum)
{
gchar *path, *filename;
+ cm_return_val_if_fail(item != NULL, NULL);
+
path = folder_item_get_path(item);
if (!is_dir_exist(path)) {
g_free(path);
- return;
+ return NULL;
}
- filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msginfo->msgnum), NULL);
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msgnum), NULL);
+
+ if (is_dir_exist(filename)) {
+ g_free(filename);
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, ".", itos(msgnum), NULL);
+ }
g_free(path);
+ return filename;
+}
+
+static void imap_remove_cached_msg(Folder *folder, FolderItem *item, MsgInfo *msginfo)
+{
+ gchar *filename;
+
+ filename = imap_get_cached_filename(item, msginfo->msgnum);
+
+ cm_return_if_fail(filename != NULL);
+
if (is_file_exist(filename)) {
claws_unlink(filename);
}
return NULL;
path = folder_item_get_path(item);
- if (!is_dir_exist(path))
+ if (!is_dir_exist(path)) {
+ if(is_file_exist(path))
+ claws_unlink(path);
make_dir_hier(path);
- filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL);
+ }
g_free(path);
+
+ filename = imap_get_cached_filename(item, uid);
debug_print("trying to fetch cached %s\n", filename);
+
if (is_file_exist(filename)) {
/* see whether the local file represents the whole message
* or not. As the IMAP server reports size with \r chars,
static gboolean imap_is_msg_fully_cached(Folder *folder, FolderItem *item, gint uid)
{
- gchar *path, *filename;
+ gchar *filename;
guint size = 0;
MsgInfo *cached = msgcache_get_msg(item->cache,uid);
procmsg_msginfo_free(cached);
return TRUE;
}
- path = folder_item_get_path(item);
- if (!is_dir_exist(path)) {
- g_free(path);
- return FALSE;
- }
- filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL);
- g_free(path);
+ filename = imap_get_cached_filename(item, uid);
+
if (is_file_exist(filename)) {
if (cached && cached->total_size == cached->size) {
/* fast path */
return ret;
}
-static gboolean imap_renumber_msg(MsgInfo *info)
-{
- GSList msglist;
- int ret;
-
- g_return_val_if_fail(info != NULL, -1);
-
- msglist.data = info;
- msglist.next = NULL;
-
- ret = imap_do_copy_msgs(info->folder->folder, info->folder, &msglist,
- NULL, TRUE);
- if (ret == 0)
- ret = imap_do_remove_msgs(info->folder->folder, info->folder,
- &msglist, NULL);
-
- if (ret == 0)
- ret = folder_item_scan_full(info->folder, FALSE);
-
- return ret == 0;
-}
-
static gboolean imap_matcher_type_is_local(gint matchertype)
{
switch (matchertype) {
case MATCHCRITERIA_NOT_HEADER: invert = TRUE; matchertype = MATCHCRITERIA_HEADER; break;
case MATCHCRITERIA_NOT_TAG: invert = TRUE; matchertype = MATCHCRITERIA_TAG; break;
case MATCHCRITERIA_NOT_HEADERS_PART: invert = TRUE; matchertype = MATCHCRITERIA_HEADERS_PART; break;
+ case MATCHCRITERIA_NOT_HEADERS_CONT: invert = TRUE; matchertype = MATCHCRITERIA_HEADERS_CONT; break;
case MATCHCRITERIA_NOT_MESSAGE: invert = TRUE; matchertype = MATCHCRITERIA_MESSAGE; break;
case MATCHCRITERIA_NOT_BODY_PART: invert = TRUE; matchertype = MATCHCRITERIA_BODY_PART; break;
case MATCHCRITERIA_NOT_TO_AND_NOT_CC: invert = TRUE; matchertype = MATCHCRITERIA_TO_OR_CC; break;
break;
case MATCHCRITERIA_HEADERS_PART:
+ case MATCHCRITERIA_HEADERS_CONT:
result = imap_search_and(
imap_search_not(imap_search_new(IMAP_SEARCH_CRITERIA_BODY, NULL, match->expr, 0)),
imap_search_new(IMAP_SEARCH_CRITERIA_MESSAGE, NULL, match->expr, 0)
}
}
if (!new_item) {
- if (old_item && old_item->path && !strcmp(old_item->path, "INBOX")) {
+ if (old_item && old_item->path && !strcasecmp(old_item->path, "INBOX")) {
debug_print("not removing INBOX\n");
} else {
debug_print("folder '%s' not found. removing...\n",
folder_item_append(item, new_item);
}
- if (!strcmp(new_item->path, "INBOX")) {
+ if (!strcasecmp(new_item->path, "INBOX")) {
new_item->stype = F_INBOX;
folder->inbox = new_item;
} else if (!folder_item_parent(item) || item->stype == F_INBOX) {
if (!folder->outbox && !g_ascii_strcasecmp(base, "Sent")) {
new_item->stype = F_OUTBOX;
folder->outbox = new_item;
- } else if (!folder->draft && !g_ascii_strcasecmp(base, "Drafts")) {
+ } else if (!folder->draft && (!g_ascii_strcasecmp(base, "Drafts") || !g_ascii_strcasecmp(base, "Draft"))) {
new_item->stype = F_DRAFT;
folder->draft = new_item;
} else if (!folder->queue && !g_ascii_strcasecmp(base, "Queue")) {
g_return_val_if_fail(name != NULL, NULL);
if (to_number(name) > 0) {
- MsgInfo *info = folder_item_get_msginfo(parent, to_number(name));
- if (info != NULL) {
- gboolean ok = imap_renumber_msg(info);
- procmsg_msginfo_free(info);
- if (!ok) {
+ gchar *cached_msg = imap_get_cached_filename(parent, to_number(name));
+ if (is_file_exist(cached_msg)) {
+ if (claws_unlink(cached_msg) != 0) {
return NULL;
}
}
return NULL;
}
- if (!folder_item_parent(parent) && strcmp(name, "INBOX") == 0) {
+ if (!folder_item_parent(parent) && strcasecmp(name, "INBOX") == 0) {
dirpath = g_strdup(name);
}else if (parent->path)
dirpath = g_strconcat(parent->path, "/", name, NULL);
/* remove trailing / for display */
strtailchomp(new_name, '/');
- if (strcmp(dirpath, "INBOX") != 0) {
+ if (strcasecmp(dirpath, "INBOX") != 0) {
GPtrArray *argbuf;
int r;
clist * lep_list;
g_free(path);
return -1;
}
- if (!strcmp(path, "INBOX") && sub == FALSE) {
+ if (!strcasecmp(path, "INBOX") && sub == FALSE) {
g_free(path);
return -1;
}
GSList *uidlist = NULL;
gchar *dir;
gint known_list_len = 0;
+ gchar *path;
+
debug_print("get_num_list\n");
g_return_val_if_fail(folder != NULL, -1);
return -1;
}
+ path = folder_item_get_path(_item);
+ if (!is_dir_exist(path)) {
+ if(is_file_exist(path))
+ claws_unlink(path);
+ make_dir_hier(path);
+ }
+ g_free(path);
+
debug_print("getting session...\n");
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, -1);
return FALSE;
}
- debug_print("exists %d, item->item.total_msgs %d\n",
- exists, item->item.total_msgs);
+ debug_print("exists %d, item->item.total_msgs %d\n"
+ "\tunseen %d, item->item.unread_msgs %d\n"
+ "\tuid_next %d, item->uid_next %d\n"
+ "\tuid_val %d, item->item.mtime %d\n",
+ exists, item->item.total_msgs,unseen, item->item.unread_msgs,
+ uid_next, item->uid_next,uid_val, item->item.mtime);
if (exists != item->item.total_msgs
|| unseen != item->item.unread_msgs
|| uid_next != item->uid_next
new_item = folder_item_new(FOLDER(folder), loc_name, loc_path);
if ((flags & ETPAN_IMAP_MB_NOINFERIORS) != 0)
new_item->no_sub = TRUE;
- if (strcmp(dup_name, "INBOX") != 0 &&
+ if (strcasecmp(dup_name, "INBOX") != 0 &&
((flags & ETPAN_IMAP_MB_NOSELECT) != 0))
new_item->no_select = TRUE;
projects / claws.git / blobdiff