const gchar *name,
const gchar *path);
+GSList *mh_get_msg_list (Folder *folder,
+ FolderItem *item,
+ gboolean use_cache);
+gchar *mh_fetch_msg (Folder *folder,
+ FolderItem *item,
+ gint num);
+MsgInfo *mh_fetch_msginfo (Folder *folder,
+ FolderItem *item,
+ gint num);
+gint mh_add_msg (Folder *folder,
+ FolderItem *dest,
+ const gchar *file,
+ gboolean remove_source);
+gint mh_move_msg (Folder *folder,
+ FolderItem *dest,
+ MsgInfo *msginfo);
+gint mh_move_msgs_with_dest (Folder *folder,
+ FolderItem *dest,
+ GSList *msglist);
+gint mh_copy_msg (Folder *folder,
+ FolderItem *dest,
+ MsgInfo *msginfo);
+gint mh_copy_msgs_with_dest (Folder *folder,
+ FolderItem *dest,
+ GSList *msglist);
+gint mh_remove_msg (Folder *folder,
+ FolderItem *item,
+ gint num);
+gint mh_remove_all_msg (Folder *folder,
+ FolderItem *item);
+gboolean mh_is_msg_changed (Folder *folder,
+ FolderItem *item,
+ MsgInfo *msginfo);
+
+gint mh_scan_folder (Folder *folder,
+ FolderItem *item);
+GSList *mh_get_num_list (Folder *folder,
+ FolderItem *item);
+void mh_scan_tree (Folder *folder);
+
+gint mh_create_tree (Folder *folder);
+FolderItem *mh_create_folder (Folder *folder,
+ FolderItem *parent,
+ const gchar *name);
+gint mh_rename_folder (Folder *folder,
+ FolderItem *item,
+ const gchar *name);
+gint mh_remove_folder (Folder *folder,
+ FolderItem *item);
+
+gchar *mh_get_new_msg_filename (FolderItem *dest);
+
static GSList *mh_get_uncached_msgs (GHashTable *msg_table,
FolderItem *item);
static MsgInfo *mh_parse_msg (const gchar *file,
FolderItem *item);
-static void mh_scan_tree_recursive (FolderItem *item,
- GHashTable *pptable);
+static void mh_scan_tree_recursive (FolderItem *item);
static gboolean mh_rename_folder_func (GNode *node,
gpointer data);
static void mh_folder_init(Folder *folder, const gchar *name, const gchar *path)
{
- folder_local_folder_init(folder, name, path);
-
folder->type = F_MH;
+ folder_local_folder_init(folder, name, path);
+
+/*
folder->get_msg_list = mh_get_msg_list;
+*/
folder->fetch_msg = mh_fetch_msg;
+ folder->fetch_msginfo = mh_fetch_msginfo;
folder->add_msg = mh_add_msg;
folder->move_msg = mh_move_msg;
folder->move_msgs_with_dest = mh_move_msgs_with_dest;
folder->remove_msg = mh_remove_msg;
folder->remove_all_msg = mh_remove_all_msg;
folder->is_msg_changed = mh_is_msg_changed;
+/*
folder->scan = mh_scan_folder;
+*/
+ folder->get_num_list = mh_get_num_list;
folder->scan_tree = mh_scan_tree;
folder->create_tree = mh_create_tree;
folder->create_folder = mh_create_folder;
folder->remove_folder = mh_remove_folder;
}
+void mh_get_last_num(Folder *folder, FolderItem *item)
+{
+ gchar *path;
+ DIR *dp;
+ struct dirent *d;
+ struct stat s;
+ gint max = 0;
+ gint num;
+
+ g_return_if_fail(item != NULL);
+
+ debug_print("mh_get_last_num(): Scanning %s ...\n", item->path);
+
+ path = folder_item_get_path(item);
+ g_return_if_fail(path != NULL);
+ if (change_dir(path) < 0) {
+ g_free(path);
+ return;
+ }
+ g_free(path);
+
+ if ((dp = opendir(".")) == NULL) {
+ FILE_OP_ERROR(item->path, "opendir");
+ return;
+ }
+
+ while ((d = readdir(dp)) != NULL) {
+ if ((num = to_number(d->d_name)) >= 0 &&
+ stat(d->d_name, &s) == 0 &&
+ S_ISREG(s.st_mode)) {
+ if (max < num)
+ max = num;
+ }
+ }
+ closedir(dp);
+
+ debug_print(_("Last number in dir %s = %d\n"), item->path, max);
+ item->last_num = max;
+}
+
+GSList *mh_get_num_list(Folder *folder, FolderItem *item)
+{
+
+ gchar *path;
+ DIR *dp;
+ struct dirent *d;
+ struct stat s;
+ gint num;
+ GSList *list = NULL;
+
+ g_return_val_if_fail(item != NULL, NULL);
+
+ debug_print("mh_get_last_num(): Scanning %s ...\n", item->path);
+
+ path = folder_item_get_path(item);
+ g_return_val_if_fail(path != NULL, NULL);
+ if (change_dir(path) < 0) {
+ g_free(path);
+ return NULL;
+ }
+ g_free(path);
+
+ if ((dp = opendir(".")) == NULL) {
+ FILE_OP_ERROR(item->path, "opendir");
+ return NULL;
+ }
+
+ while ((d = readdir(dp)) != NULL) {
+ if ((num = to_number(d->d_name)) >= 0 &&
+ stat(d->d_name, &s) == 0 &&
+ S_ISREG(s.st_mode)) {
+ list = g_slist_prepend(list, GINT_TO_POINTER(num));
+ }
+ }
+ closedir(dp);
+
+ return list;
+}
+
GSList *mh_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
{
GSList *mlist;
gchar *file;
g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(num > 0 && num <= item->last_num, NULL);
+ g_return_val_if_fail(num > 0, NULL);
path = folder_item_get_path(item);
file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
return file;
}
-gchar *mh_get_newmsg_filename(FolderItem *dest)
+MsgInfo *mh_fetch_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+ gchar *path;
+ gchar *file;
+ MsgFlags flags;
+ MsgInfo *msginfo;
+ struct stat s;
+
+ g_return_val_if_fail(item != NULL, NULL);
+ g_return_val_if_fail(num > 0, NULL);
+
+ path = folder_item_get_path(item);
+ file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
+ g_free(path);
+ if (!is_file_exist(file)) {
+ g_free(file);
+ return NULL;
+ }
+
+ folder_item_set_default_flags(item, &flags);
+ msginfo = procheader_parse_file(file, flags, TRUE, FALSE);
+ if(!msginfo) {
+ g_free(file);
+ return NULL;
+ }
+
+ msginfo->msgnum = num;
+ msginfo->folder = item;
+
+ if (stat(file, &s) < 0) {
+ FILE_OP_ERROR(file, "stat");
+ msginfo->size = 0;
+ msginfo->mtime = 0;
+ } else {
+ msginfo->size = s.st_size;
+ msginfo->mtime = s.st_mtime;
+ }
+
+ g_free(file);
+
+ return msginfo;
+}
+
+gchar *mh_get_new_msg_filename(FolderItem *dest)
{
gchar *destfile;
gchar *destpath;
- gboolean found = FALSE;
destpath = folder_item_get_path(dest);
g_return_val_if_fail(destpath != NULL, NULL);
+
if (!is_dir_exist(destpath))
make_dir_hier(destpath);
- do {
+ for (;;) {
destfile = g_strdup_printf("%s%c%d", destpath, G_DIR_SEPARATOR,
dest->last_num + 1);
- if(is_file_exist(destfile)) {
+ if (is_file_entry_exist(destfile)) {
dest->last_num++;
g_free(destfile);
- } else {
- found = TRUE;
- }
- } while(!found);
+ } else
+ break;
+ }
+
g_free(destpath);
return destfile;
g_return_val_if_fail(file != NULL, -1);
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- destfile = mh_get_newmsg_filename(dest);
- if(!destfile) return -1;
+ destfile = mh_get_new_msg_filename(dest);
+ g_return_val_if_fail(destfile != NULL, -1);
if (link(file, destfile) < 0) {
if (copy_file(file, destfile) < 0) {
static gint mh_do_move(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
gint filemode = 0;
PrefsFolderItem *prefs;
}
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
prefs = dest->prefs;
- destdir = folder_item_get_path(dest);
+ destfile = mh_get_new_msg_filename(dest);
+ g_return_val_if_fail(destfile != NULL, -1);
debug_print(_("Moving message %s%c%d to %s ...\n"),
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, dest->path);
srcfile = procmsg_get_message_file(msginfo);
- destfile = mh_get_newmsg_filename(dest);
+ destfile = mh_get_new_msg_filename(dest);
if(!destfile) return -1;
+ srcfile = procmsg_get_message_file(msginfo);
if (move_file(srcfile, destfile) < 0) {
g_free(srcfile);
g_free(destfile);
- g_free(destdir);
return -1;
}
g_free(destfile);
dest->last_num++;
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
- else {
- SET_DEST_MSG_FLAGS(fp, dest, msginfo);
- if (filemode) {
-#if HAVE_FCHMOD
- fchmod(fileno(fp), filemode);
-#else
- gchar *markfile;
-
- markfile = folder_item_get_mark_file(dest);
- if (markfile) {
- chmod(markfile, filemode);
- g_free(markfile);
- }
-#endif
- }
-
- fclose(fp);
- }
- g_free(destdir);
-
return dest->last_num;
}
static gint mh_do_move_msgs_with_dest(Folder *folder, FolderItem *dest,
GSList *msglist)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
GSList *cur;
MsgInfo *msginfo;
PrefsFolderItem *prefs;
g_return_val_if_fail(msglist != NULL, -1);
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
prefs = dest->prefs;
- destdir = folder_item_get_path(dest);
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
-
for (cur = msglist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, dest->path);
+ destfile = mh_get_new_msg_filename(dest);
+ if (!destfile) break;
srcfile = procmsg_get_message_file(msginfo);
- destfile = mh_get_newmsg_filename(dest);
+ destfile = mh_get_new_msg_filename(dest);
if(!destfile) return -1;
if (move_file(srcfile, destfile) < 0) {
g_free(srcfile);
g_free(destfile);
dest->last_num++;
-
- if (fp) {
- SET_DEST_MSG_FLAGS(fp, dest, msginfo);
- }
}
- g_free(destdir);
- if (fp) fclose(fp);
-
return dest->last_num;
}
gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
gint filemode = 0;
PrefsFolderItem *prefs;
}
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
prefs = dest->prefs;
- destdir = folder_item_get_path(dest);
- if (!is_dir_exist(destdir))
- make_dir_hier(destdir);
+ destfile = mh_get_new_msg_filename(dest);
+ g_return_val_if_fail(destfile != NULL, -1);
debug_print(_("Copying message %s%c%d to %s ...\n"),
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, dest->path);
+
srcfile = procmsg_get_message_file(msginfo);
- destfile = mh_get_newmsg_filename(dest);
+ destfile = mh_get_new_msg_filename(dest);
if(!destfile) {
g_free(srcfile);
- if (fp) fclose(fp);
return -1;
}
- dest->op_count--;
-
if (copy_file(srcfile, destfile) < 0) {
FILE_OP_ERROR(srcfile, "copy");
g_free(srcfile);
g_free(destfile);
- g_free(destdir);
return -1;
}
g_free(destfile);
dest->last_num++;
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
- else {
- SET_DEST_MSG_FLAGS(fp, dest, msginfo);
-
- if (filemode) {
-#if HAVE_FCHMOD
- fchmod(fileno(fp), filemode);
-#else
- gchar *markfile;
-
- markfile = folder_item_get_mark_file(dest);
- if (markfile) {
- chmod(markfile, filemode);
- g_free(markfile);
- }
-#endif
- }
-
- fclose(fp);
- }
- g_free(destdir);
-
return dest->last_num;
}
gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
GSList *cur;
MsgInfo *msginfo;
g_return_val_if_fail(msglist != NULL, -1);
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- destdir = folder_item_get_path(dest);
- if (!is_dir_exist(destdir))
- make_dir_hier(destdir);
-
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
-
for (cur = msglist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, dest->path);
+ destfile = mh_get_new_msg_filename(dest);
+ if (!destfile) break;
srcfile = procmsg_get_message_file(msginfo);
- destfile = mh_get_newmsg_filename(dest);
- if(!destfile) {
- g_free(srcfile);
- break;
- }
if (copy_file(srcfile, destfile) < 0) {
FILE_OP_ERROR(srcfile, "copy");
g_free(srcfile);
g_free(destfile);
dest->last_num++;
-
- if (fp) {
- SET_DEST_MSG_FLAGS(fp, dest, msginfo);
- }
}
- g_free(destdir);
- if (fp) fclose(fp);
-
return dest->last_num;
}
return FALSE;
}
-void mh_scan_folder(Folder *folder, FolderItem *item)
+gint mh_scan_folder(Folder *folder, FolderItem *item)
{
gchar *path;
DIR *dp;
struct stat s;
gint max = 0;
gint num;
- gint n_msg = 0;
- g_return_if_fail(item != NULL);
+ g_return_val_if_fail(item != NULL, -1);
debug_print("mh_scan_folder(): Scanning %s ...\n", item->path);
path = folder_item_get_path(item);
- g_return_if_fail(path != NULL);
+ g_return_val_if_fail(path != NULL, -1);
if (change_dir(path) < 0) {
g_free(path);
- return;
+ return -1;
}
g_free(path);
if ((dp = opendir(".")) == NULL) {
FILE_OP_ERROR(item->path, "opendir");
- return;
+ return -1;
}
if (folder->ui_func)
if ((num = to_number(d->d_name)) >= 0 &&
stat(d->d_name, &s) == 0 &&
S_ISREG(s.st_mode)) {
+/*
n_msg++;
+*/
if (max < num)
max = num;
}
}
-
closedir(dp);
+/*
if (n_msg == 0)
item->new = item->unread = item->total = 0;
else {
item->unread = unread;
item->total = n_msg;
}
-
+*/
debug_print(_("Last number in dir %s = %d\n"), item->path, max);
item->last_num = max;
+
+ return 0;
}
void mh_scan_tree(Folder *folder)
{
FolderItem *item;
gchar *rootpath;
- GHashTable *pptable;
g_return_if_fail(folder != NULL);
- pptable = folder_persist_prefs_new(folder);
-
- folder_tree_destroy(folder);
- item = folder_item_new(folder->name, NULL);
+ item = folder_item_new(folder, folder->name, NULL);
item->folder = folder;
folder->node = g_node_new(item);
}
g_free(rootpath);
- mh_scan_tree_recursive(item, pptable);
-
- folder_persist_prefs_free(pptable);
+ mh_create_tree(folder);
+ mh_scan_tree_recursive(item);
}
#define MAKE_DIR_IF_NOT_EXIST(dir) \
"Can't create folder."), dir); \
return -1; \
} \
- if (mkdir(dir, S_IRWXU) < 0) { \
- FILE_OP_ERROR(dir, "mkdir"); \
+ if (make_dir(dir) < 0) \
return -1; \
- } \
- if (chmod(dir, S_IRWXU) < 0) \
- FILE_OP_ERROR(dir, "chmod"); \
} \
}
fullpath = g_strconcat(path, G_DIR_SEPARATOR_S, name, NULL);
g_free(path);
- if (mkdir(fullpath, S_IRWXU) < 0) {
- FILE_OP_ERROR(fullpath, "mkdir");
+ if (make_dir(fullpath) < 0) {
g_free(fullpath);
return NULL;
}
- if (chmod(fullpath, S_IRWXU) < 0)
- FILE_OP_ERROR(fullpath, "chmod");
g_free(fullpath);
NULL);
else
path = g_strdup(name);
- new_item = folder_item_new(name, path);
+ new_item = folder_item_new(folder, name, path);
folder_item_append(parent, new_item);
g_free(path);
MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
}
- msginfo = procheader_parse(file, flags, FALSE, FALSE);
+ msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
if (!msginfo) return NULL;
msginfo->msgnum = atoi(file);
mh_is_maildir_one(path, "tmp");
}
-static void mh_scan_tree_recursive(FolderItem *item, GHashTable *pptable)
+static void mh_scan_tree_recursive(FolderItem *item)
{
DIR *dp;
struct dirent *d;
continue;
}
- new_item = folder_item_new(d->d_name, entry);
+ new_item = folder_item_new(item->folder, d->d_name, entry);
folder_item_append(item, new_item);
if (!item->path) {
- if (!strcmp(d->d_name, "inbox")) {
+ if (!strcmp(d->d_name, INBOX_DIR)) {
new_item->stype = F_INBOX;
item->folder->inbox = new_item;
- } else if (!strcmp(d->d_name, "outbox")) {
+ } else if (!strcmp(d->d_name, OUTBOX_DIR)) {
new_item->stype = F_OUTBOX;
item->folder->outbox = new_item;
- } else if (!strcmp(d->d_name, "draft")) {
+ } else if (!strcmp(d->d_name, DRAFT_DIR)) {
new_item->stype = F_DRAFT;
item->folder->draft = new_item;
- } else if (!strcmp(d->d_name, "queue")) {
+ } else if (!strcmp(d->d_name, QUEUE_DIR)) {
new_item->stype = F_QUEUE;
item->folder->queue = new_item;
- } else if (!strcmp(d->d_name, "trash")) {
+ } else if (!strcmp(d->d_name, TRASH_DIR)) {
new_item->stype = F_TRASH;
item->folder->trash = new_item;
}
}
- folder_item_restore_persist_prefs(new_item, pptable);
- mh_scan_tree_recursive(new_item, pptable);
+ mh_scan_tree_recursive(new_item);
} else if (to_number(d->d_name) != -1) n_msg++;
g_free(entry);
closedir(dp);
+/*
if (item->path) {
gint new, unread, total, min, max;
item->unread = unread;
item->total = n_msg;
}
+*/
}
static gboolean mh_rename_folder_func(GNode *node, gpointer data)
projects / claws.git / blobdiff