aboutsummaryrefslogtreecommitdiffstats
path: root/worker/lib/parse.go
diff options
context:
space:
mode:
authorReto Brunner <reto@labrat.space>2020-06-19 17:58:08 +0200
committerReto Brunner <reto@labrat.space>2020-07-27 09:19:27 +0200
commitc574a838fa89bf46bf7188442f400b206b04df95 (patch)
tree89c40ba4a7f5f5a2e67ca8fb225f7d5d3eb319ad /worker/lib/parse.go
parent494bd674a98bc9f2889acad0fda3ff4c77c641b5 (diff)
downloadaerc-c574a838fa89bf46bf7188442f400b206b04df95.tar.gz
Remove hard coded bodystruct path everywhere
Aerc usually used the path []int{1} if it didn't know what the proper path is. However this only works for multipart messages and breaks if it isn't one. This patch removes all the hard coding and extracts the necessary helpers to lib.
Diffstat (limited to 'worker/lib/parse.go')
-rw-r--r--worker/lib/parse.go10
1 files changed, 4 insertions, 6 deletions
diff --git a/worker/lib/parse.go b/worker/lib/parse.go
index ded7a83b..a14a6d33 100644
--- a/worker/lib/parse.go
+++ b/worker/lib/parse.go
@@ -21,8 +21,9 @@ var dateRe = regexp.MustCompile(`(((Mon|Tue|Wed|Thu|Fri|Sat|Sun))[,]?\s[0-9]{1,2
`([0-9]{4})\s([0-9]{2}):([0-9]{2})(:([0-9]{2}))?\s([\+|\-][0-9]{4})\s?`)
func FetchEntityPartReader(e *message.Entity, index []int) (io.Reader, error) {
- if len(index) < 1 {
- return nil, fmt.Errorf("no part to read")
+ if len(index) == 0 {
+ // non multipart, simply return everything
+ return bufReader(e)
}
if mpr := e.MultipartReader(); mpr != nil {
idx := 0
@@ -41,10 +42,7 @@ func FetchEntityPartReader(e *message.Entity, index []int) (io.Reader, error) {
}
}
}
- if index[0] != 1 {
- return nil, fmt.Errorf("cannont return non-first part of non-multipart")
- }
- return bufReader(e)
+ return nil, fmt.Errorf("FetchEntityPartReader: unexpected code reached")
}
//TODO: the UI doesn't seem to like readers which aren't buffers