msgview/save: Use defaultSavePath if no path is provided

3 files changed, 26 insertions, 6 deletions

diff --git a/commands/msgview/save.go b/commands/msgview/save.go
index eff9c66f..59d94b2f 100644
--- a/commands/msgview/save.go
+++ b/commands/msgview/save.go
@@ -3,6 +3,7 @@ package msgview
 import (
 	"encoding/base64"
 	"errors"
+	"fmt"
 	"io"
 	"mime/quotedprintable"
 	"os"
@@ -34,10 +35,13 @@ func Save(aerc *widgets.Aerc, args []string) error {
 			mkdirs = true
 		}
 	}
-	if len(args) <= optind {
+	if len(args) == optind+1 {
+		path = args[optind]
+	} else if defaultPath := aerc.Config().General.DefaultSavePath; defaultPath != "" {
+		path = defaultPath
+	} else {
 		return errors.New("Usage: :save [-p] <path>")
 	}
-	path = args[optind]
 
 	mv := aerc.SelectedTab().(*widgets.MessageViewer)
 	p := mv.CurrentPart()
@@ -68,15 +72,21 @@ func Save(aerc *widgets.Aerc, args []string) error {
 		} else if os.IsExist(err) && pathIsDir {
 			aerc.PushError("The given directory is an existing file")
 		}
-
-		// Use attachment name as filename if given path is a directory
-		save_file := filepath.Base(path)
-		save_dir := filepath.Dir(path)
+		var (
+			save_file string
+			save_dir  string
+		)
 		if pathIsDir {
 			save_dir = path
 			if filename, ok := p.Part.DispositionParams["filename"]; ok {
 				save_file = filename
+			} else {
+				timestamp := time.Now().Format("2006-01-02-150405")
+				save_file = fmt.Sprintf("aerc_%v", timestamp)
 			}
+		} else {
+			save_file = filepath.Base(path)
+			save_dir = filepath.Dir(path)
 		}
 		if _, err := os.Stat(save_dir); os.IsNotExist(err) {
 			if mkdirs {
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index b5e35054..8e0e0564 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -23,6 +23,13 @@ separated with "=".
 
 This file is used for configuring the general appearance and behavior of aerc.
 
+## GENERAL OPTIONS
+
+These options are configured in the *[general]* section of aerc.conf.
+
+*default-save-path*
+	Used as a default path for save operations if no other path is specified.
+
 ## UI OPTIONS
 
 These options are configured in the *[ui]* section of aerc.conf.
diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd
index 4fdd91ab..f97d01d3 100644
--- a/doc/aerc.1.scd
+++ b/doc/aerc.1.scd
@@ -131,6 +131,9 @@ message list, the message in the message viewer, etc).
 *save* [-p] <path>
 	Saves the current message part to the given path.
 
+	If no path is given but general.default-save-path is set, the
+	file will be saved there.
+
 	*-p*: Make any directories in the path that do not exist
 
 *close*