~rjarry/aerc-devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
4 4

[PATCH aerc] dirlist: fix conversion of dirlist-format

Details
Message ID
<20230221160514.190711-1-robin@jarry.cc>
DKIM signature
missing
Download raw message
Patch: +21 -3
strings.SplitN is not like python str.split() method... It requires an
exact number of items including the trailing non split part.

Add unit tests to ensure it works.

Fixes: 6cfbc87d8ab0 ("dirlist: use templates instead of % mini language")
Reported-by: John Mcenroy <handplanet@outlook.com>
Signed-off-by: Robin Jarry <robin@jarry.cc>
---
 config/ui.go      |  6 +++---
 config/ui_test.go | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/config/ui.go b/config/ui.go
index 599651d1c97d..b1330ffda4bb 100644
--- a/config/ui.go
+++ b/config/ui.go
@@ -581,12 +581,12 @@ func convertDirlistFormat(format string) (string, string) {
			return s
		},
	)
	tokens := strings.SplitN(tmpl, "%>", 1)
	tokens := strings.SplitN(tmpl, "%>", 2)
	switch len(tokens) {
	case 2:
		return tokens[0], tokens[1]
		return strings.TrimSpace(tokens[0]), strings.TrimSpace(tokens[1])
	case 1:
		return tokens[0], ""
		return strings.TrimSpace(tokens[0]), ""
	default:
		return "", ""
	}
diff --git a/config/ui_test.go b/config/ui_test.go
index 677dcc866462..80373da205b0 100644
--- a/config/ui_test.go
+++ b/config/ui_test.go
@@ -45,3 +45,21 @@ func TestConvertIndexFormat(t *testing.T) {
	assert.Equal(t, ALIGN_LEFT|WIDTH_AUTO, columns[3].Flags)
	assert.Equal(t, `{{.Subject}}`, templateText(columns[3].Template))
}

func TestConvertDirlistFormat(t *testing.T) {
	left, right := convertDirlistFormat("%n %>r")
	assert.Equal(t, "{{.Folder}}", left)
	assert.Equal(t, unreadExists, right)

	left, right = convertDirlistFormat("%n        %>r    ")
	assert.Equal(t, "{{.Folder}}", left)
	assert.Equal(t, unreadExists, right)

	left, right = convertDirlistFormat("%r%>n")
	assert.Equal(t, unreadExists, left)
	assert.Equal(t, "{{.Folder}}", right)

	left, right = convertDirlistFormat("%>N")
	assert.Equal(t, "", left)
	assert.Equal(t, "{{.Folder | compactDir}}", right)
}
-- 
2.39.2

[aerc/patches] build success

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CQODDXKIPRPS.3L0BA5AX351WB@cirno2>
In-Reply-To
<20230221160514.190711-1-robin@jarry.cc> (view parent)
DKIM signature
missing
Download raw message
aerc/patches: SUCCESS in 4m4s

[dirlist: fix conversion of dirlist-format][0] from [Robin Jarry][1]

[0]: https://lists.sr.ht/~rjarry/aerc-devel/patches/39207
[1]: robin@jarry.cc

✓ #945039 SUCCESS aerc/patches/alpine.yml  https://builds.sr.ht/~rjarry/job/945039
✓ #945040 SUCCESS aerc/patches/openbsd.yml https://builds.sr.ht/~rjarry/job/945040
Details
Message ID
<CQPABDEB2NYO.2BMB791WT2M39@bens-mini-m2.lan>
In-Reply-To
<20230221160514.190711-1-robin@jarry.cc> (view parent)
DKIM signature
missing
Download raw message
On Tue Feb 21, 2023 at 11:05 AM EST, Robin Jarry wrote:
> strings.SplitN is not like python str.split() method... It requires an
> exact number of items including the trailing non split part.
>
> Add unit tests to ensure it works.
>
> Fixes: 6cfbc87d8ab0 ("dirlist: use templates instead of % mini language")
> Reported-by: John Mcenroy <handplanet@outlook.com>
> Signed-off-by: Robin Jarry <robin@jarry.cc>

Tested-by: Ben Lee-Cohen <ben@lee-cohen.com>
Details
Message ID
<CQPC5Y1KIFJK.3BH35T29CD9JD@vincent-arch>
In-Reply-To
<20230221160514.190711-1-robin@jarry.cc> (view parent)
DKIM signature
missing
Download raw message
> strings.SplitN is not like python str.split() method... It requires an
> exact number of items including the trailing non split part.
>
> Add unit tests to ensure it works.
>
> Fixes: 6cfbc87d8ab0 ("dirlist: use templates instead of % mini language")
> Reported-by: John Mcenroy <handplanet@outlook.com>
> Signed-off-by: Robin Jarry <robin@jarry.cc>

Reviewed-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Details
Message ID
<CQPER73N1MAG.37QZNOL1APFW3@hades.moritz.sh>
In-Reply-To
<20230221160514.190711-1-robin@jarry.cc> (view parent)
DKIM signature
missing
Download raw message
Applied. Thanks!

To git@git.sr.ht:~rjarry/aerc
   3c898a2..1b00f28  master -> master
Reply to thread Export thread (mbox)