From 8ec2f0c1e59286f05de63b683f7316a7a40e7b46 Mon Sep 17 00:00:00 2001 From: Moritz Poldrack Date: Sat, 17 Jun 2023 16:46:31 +0200 Subject: 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 Acked-by: Koni Marti --- commands/msgview/save_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 commands/msgview/save_test.go (limited to 'commands/msgview/save_test.go') diff --git a/commands/msgview/save_test.go b/commands/msgview/save_test.go new file mode 100644 index 00000000..d6b7e757 --- /dev/null +++ b/commands/msgview/save_test.go @@ -0,0 +1,24 @@ +package msgview + +import "testing" + +func TestGetCollisionlessFilename(t *testing.T) { + tests := []struct { + originalFilename string + expectedNewName string + existingFiles map[string]struct{} + }{ + {"test", "test", map[string]struct{}{}}, + {"test", "test", map[string]struct{}{"other-file": {}}}, + {"test.txt", "test.txt", map[string]struct{}{"test.log": {}}}, + {"test.txt", "test_1.txt", map[string]struct{}{"test.txt": {}}}, + {"test.txt", "test_2.txt", map[string]struct{}{"test.txt": {}, "test_1.txt": {}}}, + {"test.txt", "test_1.txt", map[string]struct{}{"test.txt": {}, "test_2.txt": {}}}, + } + for _, tt := range tests { + actual := getCollisionlessFilename(tt.originalFilename, tt.existingFiles) + if actual != tt.expectedNewName { + t.Errorf("expected %s, actual %s", tt.expectedNewName, actual) + } + } +} -- cgit