patch by Satoshi Nagayasu: allows appending / saving multiple

selected files (closes "[ 612279 ] save multiple mesg(s) in
'Save as ...'")

* AUTHORS
	add Satoshi Nagayasu
* src/summaryview.c
	summary_save_as(): allow saving selected files to
	one file
	summary_set_menu_sensitive: enable "Save As..." when
	multiple files are selected
* src/utils.[ch]
	append_file(): new function

diff --git a/AUTHORS b/AUTHORS
index 400612381da587b530a1a43c91e766006210ed70..c67c22f60a1d34cfd0cf70e96f80363465081cf7 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -156,3 +156,4 @@ contributors (beside the above; based on Changelog)
        Urosevic Aleksandar
        Martin Kluge
        George Danchev
+       Satoshi Nagayasu

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 98d71d9bd6fbdd62a9c109fdeb13184ffacdfcfb..b395d740a6f8a5225719d376aa8eaf5c8c698402 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,19 @@
+2002-09-24 [alfons]    0.8.3claws21
+
+       patch by Satoshi Nagayasu: allows appending / saving multiple 
+       selected files (closes "[ 612279 ] save multiple mesg(s) in 
+       'Save as ...'")
+
+       * AUTHORS
+               add Satoshi Nagayasu
+       * src/summaryview.c
+               summary_save_as(): allow saving selected files to
+               one file
+               summary_set_menu_sensitive: enable "Save As..." when
+               multiple files are selected
+       * src/utils.[ch]
+               append_file(): new function
+
 2002-09-24 [colin]     0.8.3claws20
 
        * src/procmime.c

diff --git a/configure.in b/configure.in
index 594666b867db369ec52849c1543f8622d7635f4f..13c9a15bc4901afe152cb8e83409c8f0fb6c9baf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/summaryview.c b/src/summaryview.c
index fe116ea237918f84138461a83b02046dc3d1c428..826a3bed03b9c79a05c6104b6d6690757bc67a91 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1174,7 +1174,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        else
                menu_set_sensitive(ifactory, "/Re-edit", FALSE);
 
-       menu_set_sensitive(ifactory, "/Save as...", sens);
+       menu_set_sensitive(ifactory, "/Save as...", TRUE);
        menu_set_sensitive(ifactory, "/Print...",   TRUE);
 
        menu_set_sensitive(ifactory, "/Select all", TRUE);
@@ -3271,6 +3271,8 @@ void summary_save_as(SummaryView *summaryview)
        gchar *filename = NULL;
        gchar *src, *dest;
 
+       AlertValue aval;
+
        if (!summaryview->selected) return;
        msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
        if (!msginfo) return;
@@ -3282,20 +3284,41 @@ void summary_save_as(SummaryView *summaryview)
        dest = filesel_select_file(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
-               AlertValue aval;
-
-               aval = alertpanel(_("Overwrite"),
-                                 _("Overwrite existing file?"),
-                                 _("OK"), _("Cancel"), NULL);
-               if (G_ALERTDEFAULT != aval) return;
+               aval = alertpanel(_("Append or Overwrite"),
+                                 _("Append or overwrite existing file?"),
+                                 _("Append"), _("Overwrite"), _("Cancel"));
+               if (aval!=0 && aval!=1) return;
        }
 
        src = procmsg_get_message_file(msginfo);
-       if (copy_file(src, dest, TRUE) < 0) {
-               alertpanel_error(_("Can't save the file `%s'."),
-                                g_basename(dest));
+       if ( aval==0 ) { /* append */
+               if (append_file(src, dest, TRUE) < 0) 
+                       alertpanel_error(_("Can't save the file `%s'."),
+                                        g_basename(dest));
+       } else { /* overwrite */
+               if (copy_file(src, dest, TRUE) < 0)
+                       alertpanel_error(_("Can't save the file `%s'."),
+                                        g_basename(dest));
        }
        g_free(src);
+
+       
+       /*
+        * If two or more msgs are selected,
+        * append them to the output file.
+        */
+       if (GTK_CLIST(ctree)->selection->next) {
+               GList *item;
+               for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) {
+                       msginfo = gtk_ctree_node_get_row_data(ctree, (GtkCTreeNode*)item->data);
+                       if (!msginfo) break;
+                       src = procmsg_get_message_file(msginfo);
+                       if (append_file(src, dest, TRUE) < 0)
+                               alertpanel_error(_("Can't save the file `%s'."),
+                                                g_basename(dest));
+               }
+               g_free(src);
+       }
 }
 
 void summary_print(SummaryView *summaryview)

diff --git a/src/utils.c b/src/utils.c
index ae249671532c7d61a7b9c5305e514ad2a3776e86..df158ecab0f5d868b27b5529aba1b709eff883c6 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -2000,6 +2000,65 @@ gint copy_file(const gchar *src, const gchar *dest)
 }
 #endif
 
+
+/*
+ * Append src file body to the tail of dest file.
+ * Now keep_backup has no effects.
+ */
+gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
+{
+       FILE *src_fp, *dest_fp;
+       gint n_read;
+       gchar buf[BUFSIZ];
+
+       gboolean err = FALSE;
+
+       if ((src_fp = fopen(src, "rb")) == NULL) {
+               FILE_OP_ERROR(src, "fopen");
+               return -1;
+       }
+       
+       if ((dest_fp = fopen(dest, "ab")) == NULL) {
+               FILE_OP_ERROR(dest, "fopen");
+               fclose(src_fp);
+               return -1;
+       }
+
+       if (change_file_mode_rw(dest_fp, dest) < 0) {
+               FILE_OP_ERROR(dest, "chmod");
+               g_warning(_("can't change file mode\n"));
+       }
+
+       while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), src_fp)) > 0) {
+               if (n_read < sizeof(buf) && ferror(src_fp))
+                       break;
+               if (fwrite(buf, n_read, 1, dest_fp) < 1) {
+                       g_warning(_("writing to %s failed.\n"), dest);
+                       fclose(dest_fp);
+                       fclose(src_fp);
+                       unlink(dest);
+                       return -1;
+               }
+       }
+
+       if (ferror(src_fp)) {
+               FILE_OP_ERROR(src, "fread");
+               err = TRUE;
+       }
+       fclose(src_fp);
+       if (fclose(dest_fp) == EOF) {
+               FILE_OP_ERROR(dest, "fclose");
+               err = TRUE;
+       }
+
+       if (err) {
+               unlink(dest);
+               return -1;
+       }
+
+       return 0;
+}
+
 gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
 {
        FILE *src_fp, *dest_fp;

diff --git a/src/utils.h b/src/utils.h
index fa7ee023b037f731c843793b1e6d7bf3dcd00bcb..d2344d5ba97d5dd78dad5f731b40e35e1f8197e0 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -330,6 +330,9 @@ gint remove_all_numbered_files      (const gchar    *dir);
 gint remove_expired_files      (const gchar    *dir,
                                 guint           hours);
 gint remove_dir_recursive      (const gchar    *dir);
+gint append_file               (const gchar    *src,
+                                const gchar    *dest,
+                                gboolean        keep_backup);
 gint copy_file                 (const gchar    *src,
                                 const gchar    *dest,
                                 gboolean        keep_backup);