Restructure save_as/save_all
authorThorsten Maerz <torte@netztorte.de>
Thu, 26 Feb 2004 19:31:13 +0000 (19:31 +0000)
committerThorsten Maerz <torte@netztorte.de>
Thu, 26 Feb 2004 19:31:13 +0000 (19:31 +0000)
ChangeLog.claws
configure.ac
src/mimeview.c

index d9860e4..9e714d5 100644 (file)
@@ -1,3 +1,8 @@
+2004-02-26 [thorsten]  0.9.9claws31
+
+       * src/mimeview.c
+               Restructure save_as/save_all
+
 2004-02-26 [alfons]    0.9.9claws30
 
        * src/procmime.c
index 8e2e799..3753efd 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index e7eefc7..798f797 100644 (file)
@@ -84,6 +84,11 @@ static void mimeview_show_message_part               (MimeView       *mimeview,
                                                 MimeInfo       *partinfo);
 static void mimeview_change_view_type          (MimeView       *mimeview,
                                                 MimeViewType    type);
+static gchar *mimeview_get_filename_for_part   (MimeInfo       *partinfo, 
+                                                const gchar    *basedir, 
+                                                gint            number);
+static gboolean mimeview_write_part            (const gchar    *filename,
+                                                MimeInfo       *partinfo);
 
 static void mimeview_selected          (GtkCTree       *ctree,
                                         GtkCTreeNode   *node,
@@ -955,141 +960,162 @@ static void mimeview_drag_data_get(GtkWidget        *widget,
        g_free(filename);
 }
 
+/**
+ * Returns a filename (with path) for an attachment
+ * \param partinfo The attachment to save
+ * \param basedir The target directory
+ * \param number Used for dummy filename if attachment is unnamed
+ */
+static gchar *mimeview_get_filename_for_part(MimeInfo *partinfo, 
+                                            const gchar *basedir, 
+                                            gint number)
+{
+       static gchar *fullname;
+       gchar *filename;
+
+       filename = g_strdup(get_part_name(partinfo));
+       if (!filename || !*filename)
+               filename = g_strdup_printf("noname.%d", number);
+       subst_for_shellsafe_filename(filename);
+
+       fullname = g_strconcat
+               (basedir, G_DIR_SEPARATOR_S, (filename[0] == G_DIR_SEPARATOR)
+                ? &filename[1] : filename, NULL);
+       subst_chars(fullname, "/\\", G_DIR_SEPARATOR);
+
+       g_free(filename);
+       return fullname;
+}
+
+/**
+ * Write a single attachment to file
+ * \param filename Filename with path
+ * \param partinfo Attachment to save
+ */
+static gboolean mimeview_write_part(const gchar *filename,
+                                   MimeInfo *partinfo)
+{
+       gchar *dir;
+       
+       dir= g_dirname(filename);
+       if (!is_dir_exist(dir))
+               make_dir_hier(dir);
+       g_free(dir);
+
+       if (is_file_exist(filename)) {
+               AlertValue aval;
+               gchar *res;
+               
+               res = g_strdup_printf(_("Overwrite existing file '%s'?"),
+                                     filename);
+               aval = alertpanel(_("Overwrite"), res, _("OK"), 
+                                 _("Cancel"), NULL);
+               g_free(res);                                      
+               if (G_ALERTDEFAULT != aval) return FALSE;
+       }
+
+       if (procmime_get_part(filename, partinfo) < 0) {
+               alertpanel_error
+                       (_("Can't save the part of multipart message."));
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+/**
+ * Menu callback: Save all attached files
+ * \param mimeview Current display
+ */
 static void mimeview_save_all(MimeView *mimeview)
 {
+       MimeInfo *partinfo;
        gchar *dirname;
-       gchar *defname = NULL;
-       MimeInfo *attachment;
-       gchar buf[1024];
+       gint number = 1;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
+       if (!mimeview->mimeinfo) return;
 
-       attachment = mimeview->mimeinfo;
-       g_return_if_fail(attachment != NULL);
-
-       dirname = filesel_select_file(_("Save as"), defname);
+       partinfo = mimeview->mimeinfo;
+       dirname = filesel_select_file(_("Select destination folder"), NULL);
        if (!dirname) return;
 
        if (!is_dir_exist (dirname)) {
                alertpanel_error(_("`%s' is not a directory."),
                                 dirname);
-               g_free (dirname);
-               dirname = NULL;
                return;
        }
-       
-       { /* add a / after the dirname, in case the user didn't */
-               gchar *dirname_tmp = NULL;
-               int dirname_last_char = strlen (dirname) - 1;
-
-               if (dirname[dirname_last_char] != G_DIR_SEPARATOR) {
-                       dirname_tmp = g_strconcat (dirname, G_DIR_SEPARATOR_S, NULL);
-                       g_free (dirname);
-                       dirname = dirname_tmp;
-               }
-       }
 
-       /* for each attachment, extract it in the selected dir. */
-       while (attachment != NULL) {
-               if (attachment->type != MIMETYPE_MESSAGE &&
-                   attachment->type != MIMETYPE_MULTIPART &&
-                   attachment->disposition != DISPOSITIONTYPE_INLINE) {
-                       static guint subst_cnt = 1;
-                       gchar *attachdir;
-                       gchar *attachname = g_strdup(get_part_name(attachment));
-                       AlertValue aval = G_ALERTDEFAULT;
-                       gchar *res;
-
-                       if (!attachname || !strlen(attachname))
-                               attachname = g_strdup_printf("noname.%d",subst_cnt++);
-                       subst_chars(attachname, ":?*&|<>\t\r\n", '_');
-                       g_snprintf(buf, sizeof(buf), "%s%s",
-                                  dirname,
-                                  (attachname[0] == G_DIR_SEPARATOR)
-                                  ? &attachname[1]
-                                  : attachname);
-                       subst_chars(buf, "/\\", G_DIR_SEPARATOR);
-                       attachdir = g_dirname(buf);
-                       make_dir_hier(attachdir);
-                       g_free(attachdir);
-                       
-                       if (is_file_exist(buf)) {
-                               res = g_strdup_printf(_("Overwrite existing file '%s'?"),
-                                                     attachname);
-                               aval = alertpanel(_("Overwrite"), res, _("OK"), 
-                                                 _("Cancel"), NULL);
-                               g_free(res);                                      
-                       }
-                       g_free(attachname);
-                       
-                       if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, attachment) < 0))
-                               alertpanel_error(_("Can't save the part of multipart message."));
+       if (dirname[strlen(dirname)-1] == G_DIR_SEPARATOR)
+               dirname[strlen(dirname)-1] = '\0';
+
+       while (partinfo != NULL) {
+               if (partinfo->type != MIMETYPE_MESSAGE &&
+                   partinfo->type != MIMETYPE_MULTIPART &&
+                   partinfo->disposition != DISPOSITIONTYPE_INLINE) {
+                       gchar *filename = mimeview_get_filename_for_part
+                               (partinfo, dirname, number++);
+
+                       mimeview_write_part(filename, partinfo);
+                       g_free(filename);
                }
-               attachment = procmime_mimeinfo_next(attachment);
+               partinfo = procmime_mimeinfo_next(partinfo);
        }
 }
 
-static void mimeview_display_as_text(MimeView *mimeview)
+/**
+ * Menu callback: Save the selected attachment
+ * \param mimeview Current display
+ */
+static void mimeview_save_as(MimeView *mimeview)
 {
+       gchar *filename;
+       gchar *defname = NULL;
        MimeInfo *partinfo;
+       const gchar *partname = NULL;
 
        if (!mimeview->opened) return;
+       if (!mimeview->file) return;
 
        partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo)  {
+       if (!partinfo) 
                partinfo = (MimeInfo *) gtk_object_get_data
                        (GTK_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
                gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
                                    "pop_partinfo", NULL);
-       
        }                        
        g_return_if_fail(partinfo != NULL);
-       mimeview_show_message_part(mimeview, partinfo);
+       
+       if ((partname = get_part_name(partinfo)) != NULL) {
+               Xstrdup_a(defname, partname, return);
+               subst_for_shellsafe_filename(defname);
+       }
+
+       filename = filesel_select_file(_("Save as"), defname);
+       if (!filename) return;
+
+       mimeview_write_part(filename, partinfo);
 }
 
-static void mimeview_save_as(MimeView *mimeview)
+static void mimeview_display_as_text(MimeView *mimeview)
 {
-       gchar *filename;
-       gchar *defname = NULL;
        MimeInfo *partinfo;
-       gchar *res;
-       const gchar *partname = NULL;
 
        if (!mimeview->opened) return;
-       if (!mimeview->file) return;
 
        partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo) 
+       if (!partinfo)  {
                partinfo = (MimeInfo *) gtk_object_get_data
                        (GTK_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
                gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
                                    "pop_partinfo", NULL);
+       
        }                        
        g_return_if_fail(partinfo != NULL);
-       
-       if ((partname = get_part_name(partinfo)) != NULL) {
-               Xstrdup_a(defname, partname, return);
-               subst_for_filename(defname);
-       }
-
-       filename = filesel_select_file(_("Save as"), defname);
-       if (!filename) return;
-       if (is_file_exist(filename)) {
-               AlertValue aval;
-               res = g_strdup_printf(_("Overwrite existing file '%s'?"),
-                                     filename);
-               aval = alertpanel(_("Overwrite"), res, _("OK"), 
-                                 _("Cancel"), NULL);
-               g_free(res);                                      
-               if (G_ALERTDEFAULT != aval) return;
-       }
-
-       if (procmime_get_part(filename, partinfo) < 0)
-               alertpanel_error
-                       (_("Can't save the part of multipart message."));
+       mimeview_show_message_part(mimeview, partinfo);
 }
 
 static void mimeview_launch(MimeView *mimeview)