Changeset 3495:14ec8eba0341

Timestamp:

2003-10-04 13:34:59 (5 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

This patch fixes various aspects of the attachment-saving
user interface. Changes include:

* When tagging and saving multiple attachments, you can now use the

same target directory for multiple attachments.

* When you can't save an attachment, you get an opportunity to enter

a new file name.

* The menu cursor will highlight the attachment that you are

currently discussing with mutt.

* Various bug fixes.

This does, in particular, address #1619 (Debian#208430).

Files:

• attach.h (modified) (1 diff)
• commands.c (modified) (1 diff)
• compose.c (modified) (5 diffs)
• keymap.h (modified) (1 diff)
• lib.c (modified) (1 diff)
• lib.h (modified) (1 diff)
• menu.c (modified) (2 diffs)
• mutt.h (modified) (1 diff)
• mutt_menu.h (modified) (1 diff)
• muttlib.c (modified) (10 diffs)
• pager.c (modified) (1 diff)
• protos.h (modified) (1 diff)
• recvattach.c (modified) (7 diffs)

attach.h

@@ -25 +25 @@
 
 
-void mutt_save_attachment_list (FILE *fp, int tag, BODY *top, HEADER *hdr);
+void mutt_save_attachment_list (FILE *fp, int tag, BODY *top, HEADER *hdr, MUTTMENU *menu);
 void mutt_pipe_attachment_list (FILE *fp, int tag, BODY *top, int filter);
 void mutt_print_attachment_list (FILE *fp, int tag, BODY *top);

commands.c

@@ -762 +762 @@
 
   /* check to make sure that this file is really the one the user wants */
-  if (!mutt_save_confirm (buf, &st))
+  if (mutt_save_confirm (buf, &st) != 0)
     return -1;
 

compose.c

@@ -484 +484 @@
   if (idxlen)
     idx[idxlen - 1]->content->next = idx[idxlen]->content;
+  idx[idxlen]->content->aptr = idx[idxlen];
   menu->current = idxlen++;
   mutt_update_tree (idx, idxlen);
@@ -761 +762 @@
         if ((idx[idxlen]->content = crypt_pgp_make_key_attachment(NULL)) != NULL)
         {
-          idx[idxlen]->level = (idxlen > 0) ? idx[idxlen-1]->level : 0;
-
-          if(idxlen)
-            idx[idxlen - 1]->content->next = idx[idxlen]->content;
-          
-          menu->current = idxlen++;
-          mutt_update_tree (idx, idxlen);
-          menu->max = idxlen;
+          update_idx (menu, idx, idxlen++);
           menu->redraw |= REDRAW_INDEX;
         }
@@ -1188 +1182 @@
             continue;
           }
-          
-          idx[idxlen]->level = (idxlen > 0) ? idx[idxlen-1]->level : 0;
-          if (idxlen)
-            idx[idxlen - 1]->content->next = idx[idxlen]->content;
-          
-          menu->current = idxlen++;
-          mutt_update_tree (idx, idxlen);
-          menu->max = idxlen;
+          update_idx (menu, idx, idxlen++);
 
           idx[menu->current]->content->type = itype;
@@ -1228 +1215 @@
       case OP_SAVE:
         CHECK_COUNT;
-        mutt_save_attachment_list (NULL, menu->tagprefix, menu->tagprefix ?  msg->content : idx[menu->current]->content, NULL);
+        mutt_save_attachment_list (NULL, menu->tagprefix, menu->tagprefix ?  msg->content : idx[menu->current]->content, NULL, menu);
         MAYBE_REDRAW (menu->redraw);
         break;
@@ -1393 +1380 @@
     msg->content = idx[0]->content;
     for (i = 0; i < idxlen; i++)
+    {
+      idx[i]->content->aptr = NULL;
       FREE (&idx[i]);
+    }
   }
   else

keymap.h

@@ -19 +19 @@
 #ifndef KEYMAP_H
 #define KEYMAP_H
+
+#include "mapping.h"
 
 /* maximal length of a key binding sequence used for buffer in km_bindkey */

lib.c

@@ -647 +647 @@
   return d;
 }
+
+const char *mutt_basename (const char *f)
+{
+  const char *p = strrchr (f, '/');
+  if (p) ++p;
+  return p;
+}

lib.h

@@ -119 +119 @@
 
 const char *mutt_stristr (const char *, const char *);
+const char *mutt_basename (const char *);
 
 int mutt_copy_stream (FILE *, FILE *);

menu.c

@@ -801 +801 @@
 }
 
+int menu_redraw (MUTTMENU *menu)
+{
+  /* See if all or part of the screen needs to be updated.  */
+  if (menu->redraw & REDRAW_FULL)
+  {
+    menu_redraw_full (menu);
+    /* allow the caller to do any local configuration */
+    return (OP_REDRAW);
+  }
+  
+  if (!menu->dialog)
+    menu_check_recenter (menu);
+  
+  if (menu->redraw & REDRAW_STATUS)
+    menu_redraw_status (menu);
+  if (menu->redraw & REDRAW_INDEX)
+    menu_redraw_index (menu);
+  else if (menu->redraw & (REDRAW_MOTION | REDRAW_MOTION_RESYNCH))
+    menu_redraw_motion (menu);
+  else if (menu->redraw == REDRAW_CURRENT)
+    menu_redraw_current (menu);
+  
+  if (menu->dialog)
+    menu_redraw_prompt (menu);
+  
+  return OP_NULL;
+}
+
 int mutt_menuLoop (MUTTMENU *menu)
 {
@@ -820 +848 @@
 #endif
 
-    /* See if all or part of the screen needs to be updated.  */
-    if (menu->redraw & REDRAW_FULL)
-    {
-      menu_redraw_full (menu);
-      /* allow the caller to do any local configuration */
-      return (OP_REDRAW);
-    }
-
-    if (!menu->dialog)
-      menu_check_recenter (menu);
-
-    if (menu->redraw & REDRAW_STATUS)
-      menu_redraw_status (menu);
-    if (menu->redraw & REDRAW_INDEX)
-      menu_redraw_index (menu);
-    else if (menu->redraw & (REDRAW_MOTION | REDRAW_MOTION_RESYNCH))
-      menu_redraw_motion (menu);
-    else if (menu->redraw == REDRAW_CURRENT)
-      menu_redraw_current (menu);
-
-    if (menu->dialog)
-      menu_redraw_prompt (menu);
+    if (menu_redraw (menu) == OP_REDRAW)
+      return OP_REDRAW;
     
     menu->oldcurrent = menu->current;

mutt.h

@@ -599 +599 @@
   struct header *hdr;           /* header information for message/rfc822 */
 
+  struct attachptr *aptr;       /* Menu information, used in recvattach.c */
+  
   time_t stamp;                 /* time stamp of last
                                  * encoding update.

mutt_menu.h

@@ -84 +84 @@
 void menu_redraw_motion (MUTTMENU *);
 void menu_redraw_current (MUTTMENU *);
+int  menu_redraw (MUTTMENU *);
 void menu_first_entry (MUTTMENU *);
 void menu_last_entry (MUTTMENU *);

muttlib.c

@@ -815 +815 @@
 }
 
-/* return 0 on success, -1 on error */
+/* return 0 on success, -1 on abort, 1 on error */
 int mutt_check_overwrite (const char *attname, const char *path,
-                                char *fname, size_t flen, int *append) 
-{
+                                char *fname, size_t flen, int *append, char **directory) 
+{
+  int rc = 0;
   char tmp[_POSIX_PATH_MAX];
   struct stat st;
@@ -829 +830 @@
   if (S_ISDIR (st.st_mode))
   {
-    if (mutt_yesorno (_("File is a directory, save under it?"), M_YES) != M_YES) 
-      return (-1);
+    if (directory)
+    {
+      switch (mutt_multi_choice
+              (_("File is a directory, save under it? [(y)es, (n)o, (a)ll]"), _("yna")))
+      {
+        case 3:         /* all */
+          mutt_str_replace (directory, fname);
+          break;
+        case 1:         /* yes */
+          FREE (directory);
+          break;
+        case -1:        /* abort */
+          FREE (directory); 
+          return -1;
+        case  2:        /* no */
+          FREE (directory);
+          return 1;
+      }
+    }
+    else if ((rc = mutt_yesorno (_("File is a directory, save under it?"), M_YES)) != M_YES)
+      return (rc == M_NO) ? 1 : -1;
+
     if (!attname || !attname[0])
     {
@@ -837 +858 @@
                                       M_FILE | M_CLEAR) != 0 || !tmp[0])
         return (-1);
-      snprintf (fname, flen, "%s/%s", path, tmp);
+      mutt_concat_path (fname, path, tmp, flen);
     }
     else
-      snprintf (fname, flen, "%s/%s", path, attname);
+      mutt_concat_path (fname, path, mutt_basename (attname), flen);
   }
   
@@ -849 +870 @@
     {
       case -1: /* abort */
+        return -1;
       case 3:  /* cancel */
-        return -1;
+        return 1;
 
       case 2: /* append */
@@ -1134 +1156 @@
 }
 
-/* returns 1 if OK to proceed, 0 to abort */
+/* returns 0 if OK to proceed, -1 to abort, 1 to retry */
 int mutt_save_confirm (const char *s, struct stat *st)
 {
   char tmp[_POSIX_PATH_MAX];
-  int ret = 1;
+  int ret = 0;
+  int rc;
   int magic = 0;
 
@@ -1147 +1170 @@
   {
     mutt_error _("Can't save message to POP mailbox.");
-    return 0;
+    return 1;
   }
 #endif
@@ -1156 +1179 @@
     {
       mutt_error (_("%s is not a mailbox!"), s);
-      return 0;
+      return 1;
     }
 
@@ -1162 +1185 @@
     {
       snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
-      if (mutt_yesorno (tmp, M_YES) != M_YES)
-        ret = 0;
+      if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
+        ret = 1;
+      else if (rc == -1)
+        ret = -1;
     }
   }
@@ -1180 +1205 @@
         {
           snprintf (tmp, sizeof (tmp), _("Create %s?"), s);
-          if (mutt_yesorno (tmp, M_YES) != M_YES)
-            ret = 0;
+          if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
+            ret = 1;
+          else if (rc == -1)
+            ret = -1;
         }
       }
@@ -1187 +1214 @@
       {
         mutt_perror (s);
-        return 0;
+        return 1;
       }
     }

pager.c

@@ -2439 +2439 @@
         if (IsAttach (extra))
         {
-          mutt_save_attachment_list (extra->fp, 0, extra->bdy, extra->hdr);
+          mutt_save_attachment_list (extra->fp, 0, extra->bdy, extra->hdr, NULL);
           break;
         }

protos.h

@@ -249 +249 @@
 int mutt_check_mime_type (const char *);
 int mutt_check_month (const char *);
-int mutt_check_overwrite (const char *, const char *, char *, size_t, int *);
+int mutt_check_overwrite (const char *, const char *, char *, size_t, int *, char **);
 int mutt_check_traditional_pgp (HEADER *, int *);
 int mutt_command_complete (char *, size_t, int, int);

recvattach.c

@@ -130 +130 @@
       new = idx[(*idxlen)++];
       new->content = m;
+      m->aptr = new;
       new->parent_type = parent_type;
       new->level = level;
@@ -364 +365 @@
 }
 
-static int mutt_query_save_attachment (FILE *fp, BODY *body, HEADER *hdr)
-{
+static int mutt_query_save_attachment (FILE *fp, BODY *body, HEADER *hdr, char **directory)
+{
+  char *prompt;
   char buf[_POSIX_PATH_MAX], tfile[_POSIX_PATH_MAX];
   int is_message;
   int append = 0;
-
-  if (body->filename)
-    strfcpy (buf, body->filename, sizeof (buf));
+  int rc;
+  
+  if (body->filename) 
+  {
+    if (directory && *directory)
+      mutt_concat_path (buf, *directory, mutt_basename (body->filename), sizeof (buf));
+    else
+      strfcpy (buf, body->filename, sizeof (buf));
+  }
   else if(body->hdr &&
           body->encoding != ENCBASE64 &&
@@ -380 +388 @@
     buf[0] = 0;
 
-  if (mutt_get_field (_("Save to file: "), buf, sizeof (buf), M_FILE | M_CLEAR) != 0
-      || !buf[0])
-    return -1;
-
-  mutt_expand_path (buf, sizeof (buf));
-
-  is_message = (fp && 
-      body->hdr && 
-      body->encoding != ENCBASE64 && 
-      body->encoding != ENCQUOTEDPRINTABLE && 
-      mutt_is_message_type (body->type, body->subtype));
-  
-  if (is_message)
-  {
-    struct stat st;
+  prompt = _("Save to file: ");
+  while (prompt)
+  {
+    if (mutt_get_field (prompt, buf, sizeof (buf), M_FILE | M_CLEAR) != 0
+        || !buf[0])
+      return -1;
     
-    /* check to make sure that this file is really the one the user wants */
-    if (!mutt_save_confirm (buf, &st))
-      return -1;
-    strfcpy(tfile, buf, sizeof(tfile));
-  }
-  else
-    if (mutt_check_overwrite (body->filename, buf, tfile, sizeof (tfile), &append))
-      return -1;
-
-  mutt_message _("Saving...");
-  if (mutt_save_attachment (fp, body, tfile, append, (hdr || !is_message) ? hdr : body->hdr) == 0)
-  {
-    mutt_message _("Attachment saved.");
-    return 0;
-  }
-  else
-    return -1;
-}
-
-void mutt_save_attachment_list (FILE *fp, int tag, BODY *top, HEADER *hdr)
+    prompt = NULL;
+    mutt_expand_path (buf, sizeof (buf));
+    
+    is_message = (fp && 
+                  body->hdr && 
+                  body->encoding != ENCBASE64 && 
+                  body->encoding != ENCQUOTEDPRINTABLE && 
+                  mutt_is_message_type (body->type, body->subtype));
+    
+    if (is_message)
+    {
+      struct stat st;
+      
+      /* check to make sure that this file is really the one the user wants */
+      if ((rc = mutt_save_confirm (buf, &st)) == 1)
+      {
+        prompt = _("Save to file: ");
+        continue;
+      } 
+      else if (rc == -1)
+        return -1;
+      strfcpy(tfile, buf, sizeof(tfile));
+    }
+    else
+    {
+      if ((rc = mutt_check_overwrite (body->filename, buf, tfile, sizeof (tfile), &append, directory)) == -1)
+        return -1;
+      else if (rc == 1)
+      {
+        prompt = _("Save to file: ");
+        continue;
+      }
+    }
+    
+    mutt_message _("Saving...");
+    if (mutt_save_attachment (fp, body, tfile, append, (hdr || !is_message) ? hdr : body->hdr) == 0)
+    {
+      mutt_message _("Attachment saved.");
+      return 0;
+    }
+    else
+    {
+      prompt = _("Save to file: ");
+      continue;
+    }
+  }
+  return 0;
+}
+    
+void mutt_save_attachment_list (FILE *fp, int tag, BODY *top, HEADER *hdr, MUTTMENU *menu)
 {
   char buf[_POSIX_PATH_MAX], tfile[_POSIX_PATH_MAX];
+  char *directory = NULL;
   int rc = 1;
+  int last = menu ? menu->current : -1;
   FILE *fpout;
 
@@ -439 +470 @@
           mutt_expand_path (buf, sizeof (buf));
           if (mutt_check_overwrite (top->filename, buf, tfile,
-                                    sizeof (tfile), &append))
+                                    sizeof (tfile), &append, NULL))
             return;
           rc = mutt_save_attachment (fp, top, tfile, append, hdr);
@@ -458 +489 @@
         }
       }
-      else
-        mutt_query_save_attachment (fp, top, hdr);
+      else 
+      {
+        if (tag && menu && top->aptr)
+        {
+          menu->oldcurrent = menu->current;
+          menu->current = top->aptr->num;
+          menu_check_recenter (menu);
+          menu->redraw |= REDRAW_MOTION;
+
+          menu_redraw (menu);
+        }
+        if (mutt_query_save_attachment (fp, top, hdr, &directory) == -1)
+          break;
+      }
     }
     else if (top->parts)
-      mutt_save_attachment_list (fp, 1, top->parts, hdr);
+      mutt_save_attachment_list (fp, 1, top->parts, hdr, menu);
     if (!tag)
-      return;
-  }
-
+      break;
+  }
+
+  FREE (&directory);
+
+  if (tag && menu)
+  {
+    menu->oldcurrent = menu->current;
+    menu->current = last;
+    menu_check_recenter (menu);
+    menu->redraw |= REDRAW_MOTION;
+  }
+  
   if (!option (OPTATTACHSPLIT) && (rc == 0))
     mutt_message _("Attachment saved.");
@@ -978 +1031 @@
       case OP_SAVE:
         mutt_save_attachment_list (fp, menu->tagprefix, 
-                  menu->tagprefix ?  cur : idx[menu->current]->content, hdr);
-
-        if (option (OPTRESOLVE) && menu->current < menu->max - 1)
+                  menu->tagprefix ?  cur : idx[menu->current]->content, hdr, menu);
+
+        if (!menu->tagprefix && option (OPTRESOLVE) && menu->current < menu->max - 1)
           menu->current++;
       
@@ -1121 +1174 @@
           if (idx[idxmax]->content && idx[idxmax]->content->deleted)
             hdr->attach_del = 1;
+          if (idx[idxmax]->content)
+            idx[idxmax]->content->aptr = NULL;
           FREE (&idx[idxmax]->tree);
           FREE (&idx[idxmax]);