go-vise

commit 063b786572e44e16a8497750da1e905d00d6a0cd
parent 4a9143932032033294d8223f1c43c1b99ea1422f
Author: lash <dev@holbrook.no>
Date:   Fri,  7 Apr 2023 09:30:23 +0100

Add sink splitter

Diffstat:
M
go/resource/resource.go
 | 
84
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
M
go/resource/size.go
 | 
20
+++++++++++++++++---

2 files changed, 96 insertions(+), 8 deletions(-)
diff --git a/go/resource/resource.go b/go/resource/resource.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 )
 
 // EntryFunc is a function signature for retrieving value for a key
@@ -106,6 +107,67 @@ func(m *MenuResource) RenderMenu() (string, error) {
 	return r, nil
 }
 
+// render menu and all syms except sink, split sink into display chunks
+func(m *MenuResource) prepare(sym string, values map[string]string, sizer *Sizer) (map[string]string, error) {
+	var sink *string
+	var sinkValues []string
+	noSinkValues := make(map[string]string)
+	for k, v := range values {
+		sz, err := sizer.Size(k)
+		if err != nil {
+			return nil, err
+		}
+		if sz == 0 {
+			sink = &k
+			sinkValues = strings.Split(v, "\n")
+			v = ""
+			log.Printf("found sink %s with field count %v", k, len(sinkValues))
+		}
+		noSinkValues[k] = v
+	}
+	
+	if sink == nil {
+		log.Printf("no sink found for sym %s", sym)
+		return values, nil
+	}
+
+	s, err := m.render(sym, noSinkValues, sizer)
+	if err != nil {
+		return nil, err
+	}
+
+	remaining, ok := sizer.Check(s)
+	if !ok {
+		return nil, fmt.Errorf("capacity exceeded")
+	}
+
+	l := 0
+	r := ""
+	r_tmp := ""
+
+	for i, v := range sinkValues {
+		l += len(v)
+		if uint32(l) > remaining {
+			if r_tmp == "" {
+				return nil, fmt.Errorf("capacity insufficient for sink field %v", i)
+			}
+			r += r_tmp + "\n"
+			r_tmp = ""
+			l = 0
+		}
+		r_tmp += v
+	}
+
+	r += r_tmp
+
+	if r[len(r)-1] != '\n' {
+		r += "\n"
+	}
+	noSinkValues[*sink] = r
+
+	return noSinkValues, nil
+}
+
 func(m *MenuResource) RenderTemplate(sym string, values map[string]string) (string, error) {
 	return DefaultRenderTemplate(m, sym, values)
 }
@@ -122,7 +184,8 @@ func(m *MenuResource) GetTemplate(sym string, sizer *Sizer) (string, error) {
 	return m.templateFunc(sym, sizer)
 }
 
-func(m *MenuResource) Render(sym string, values map[string]string, sizer *Sizer) (string, error) {
+func(m *MenuResource) render(sym string, values map[string]string, sizer *Sizer) (string, error) {
+	var ok bool
 	r := ""
 	s, err := m.RenderTemplate(sym, values)
 	if err != nil {
@@ -130,9 +193,9 @@ func(m *MenuResource) Render(sym string, values map[string]string, sizer *Sizer)
 	}
 	log.Printf("rendered %v bytes for template", len(s))
 	r += s
-	l, ok := sizer.Check(r)
+	_, ok = sizer.Check(r)
 	if !ok {
-		return "", fmt.Errorf("rendered size %v exceeds limits: %v", l, sizer)
+		return "", fmt.Errorf("limit exceeded: %v", sizer)
 	}
 	s, err = m.RenderMenu()
 	if err != nil {
@@ -140,9 +203,20 @@ func(m *MenuResource) Render(sym string, values map[string]string, sizer *Sizer)
 	}
 	log.Printf("rendered %v bytes for menu", len(s))
 	r += s
-	l, ok = sizer.Check(r)
+	_, ok = sizer.Check(r)
 	if !ok {
-		return "", fmt.Errorf("rendered size %v exceeds limits: %v", l, sizer)
+		return "", fmt.Errorf("limit exceeded: %v", sizer)
 	}
 	return r, nil
 }
+
+func(m *MenuResource) Render(sym string, values map[string]string, sizer *Sizer) (string, error) {
+	var err error
+	
+	values, err = m.prepare(sym, values, sizer)
+	if err != nil {
+		return "", err
+	}
+
+	return m.render(sym, values, sizer)
+}
diff --git a/go/resource/size.go b/go/resource/size.go
@@ -37,9 +37,12 @@ func SizerFromState(st *state.State) (Sizer, error){
 
 func(szr *Sizer) Check(s string) (uint32, bool) {
 	l := uint32(len(s))
-	if szr.outputSize > 0 && l > szr.outputSize {
-		log.Printf("sizer check fails with length %v: %s", l, szr)
-		return l, false
+	if szr.outputSize > 0 {
+		if l > szr.outputSize {
+			log.Printf("sizer check fails with length %v: %s", l, szr)
+			return 0, false
+		}
+		l = szr.outputSize - l
 	}
 	return l, true
 }
@@ -51,3 +54,14 @@ func(szr *Sizer) String() string {
 	}
 	return fmt.Sprintf("output: %v, member: %v, menu: %v, diff: %v", szr.outputSize, szr.totalMemberSize, szr.menuSize, diff)
 }
+
+func(szr *Sizer) Size(s string) (uint16, error) {
+	if szr.sink == s {
+		return 0, nil
+	}
+	r, ok := szr.memberSizes[s]
+	if !ok {
+		return 0, fmt.Errorf("unknown member: %s", s)
+	}
+	return r, nil
+}