aboutsummaryrefslogtreecommitdiffstats
path: root/commands/msgview/save.go
diff options
context:
space:
mode:
authorMoritz Poldrack <git@moritz.sh>2023-06-17 16:46:31 +0200
committerRobin Jarry <robin@jarry.cc>2023-06-17 23:19:24 +0200
commit8ec2f0c1e59286f05de63b683f7316a7a40e7b46 (patch)
treea1a2157e15c1623e4b03363ed9496c741f9e8abf /commands/msgview/save.go
parentb13c45797a1ea2d27f162c0fde0b640d7b24471e (diff)
downloadaerc-8ec2f0c1e59286f05de63b683f7316a7a40e7b46.tar.gz
save: fix saving of multiple files with the same name
When an email has multiple attachments with the same name, aerc currently only saves one of them. This patch adds a counter to them. the file has an extension, the counter is added before the extension. Signed-off-by: Moritz Poldrack <git@moritz.sh> Acked-by: Koni Marti <koni.marti@gmail.com>
Diffstat (limited to 'commands/msgview/save.go')
-rw-r--r--commands/msgview/save.go22
1 files changed, 20 insertions, 2 deletions
diff --git a/commands/msgview/save.go b/commands/msgview/save.go
index 5bd4c188..170ef7c1 100644
--- a/commands/msgview/save.go
+++ b/commands/msgview/save.go
@@ -115,8 +115,9 @@ func (s Save) Execute(aerc *widgets.Aerc, args []string) error {
return fmt.Errorf("This message has no attachments")
}
params.trailingSlash = true
+ names := make(map[string]struct{})
for _, pi := range parts {
- if err := savePart(pi, path, mv, aerc, &params); err != nil {
+ if err := savePart(pi, path, mv, aerc, &params, names); err != nil {
return err
}
}
@@ -124,7 +125,7 @@ func (s Save) Execute(aerc *widgets.Aerc, args []string) error {
}
pi := mv.SelectedMessagePart()
- return savePart(pi, path, mv, aerc, &params)
+ return savePart(pi, path, mv, aerc, &params, make(map[string]struct{}))
}
func savePart(
@@ -133,6 +134,7 @@ func savePart(
mv *widgets.MessageViewer,
aerc *widgets.Aerc,
params *saveParams,
+ names map[string]struct{},
) error {
if params.trailingSlash || isDirExists(path) {
filename := generateFilename(pi.Part)
@@ -147,6 +149,9 @@ func savePart(
}
}
+ path = getCollisionlessFilename(path, names)
+ names[path] = struct{}{}
+
if pathExists(path) && !params.force {
return fmt.Errorf("%q already exists and -f not given", path)
}
@@ -181,6 +186,19 @@ func savePart(
return nil
}
+func getCollisionlessFilename(path string, existing map[string]struct{}) string {
+ ext := filepath.Ext(path)
+ name := strings.TrimSuffix(path, ext)
+ _, exists := existing[path]
+ counter := 1
+ for exists {
+ path = fmt.Sprintf("%s_%d%s", name, counter, ext)
+ counter++
+ _, exists = existing[path]
+ }
+ return path
+}
+
// isDir returns true if path is a directory and exists
func isDirExists(path string) bool {
pathinfo, err := os.Stat(path)