Merge pull request #7 from moul/dev/moul/uptime-duration

feat: add {{.Uptime}} and {{.Duration}}

cmd/prefix/main.go

@@ -31,7 +31,6 @@ func run(args []string) error {
 	var input io.Reader
 	{
 		remainingArgs := flags.Args()
-		fmt.Println(remainingArgs)
 		switch {
 		case len(remainingArgs) == 0:
 			input = os.Stdin

prefix.go

@@ -4,8 +4,10 @@ import (
 	"bytes"
 	"fmt"
 	"text/template"
+	"time"
 
 	"github.com/Masterminds/sprig"
+	"moul.io/u"
 )
 
 /// Public API
@@ -22,7 +24,9 @@ type linePrefixer struct {
 	Format     string
 	LineNumber int
 
-	t *template.Template
+	t         *template.Template
+	startedAt time.Time // used by {{.Uptime}}
+	lastTime  time.Time // used by {{.Duration}}
 }
 
 func New(format string) LinePrefixer {
@@ -35,14 +39,17 @@ func New(format string) LinePrefixer {
 		Format:     DefaultFormat,
 		LineNumber: 0,
 
-		t: template.Must(template.New("").Funcs(funcMap).Parse(format)),
+		t:         template.Must(template.New("").Funcs(funcMap).Parse(format)),
+		startedAt: time.Now(),
+		lastTime:  time.Now(),
 	}
 }
 
 func (p *linePrefixer) PrefixLine(line string) string {
 	p.LineNumber++
 	var prefix bytes.Buffer
 	_ = p.t.Execute(&prefix, p)
+	p.lastTime = time.Now()
 	return prefix.String() + line
 }
 
@@ -51,3 +58,9 @@ func (p *linePrefixer) PrefixLine(line string) string {
 func (p *linePrefixer) LineNumber3() string { return fmt.Sprintf("%-3d", p.LineNumber) }
 func (p *linePrefixer) LineNumber4() string { return fmt.Sprintf("%-4d", p.LineNumber) }
 func (p *linePrefixer) LineNumber5() string { return fmt.Sprintf("%-5d", p.LineNumber) }
+func (p *linePrefixer) Uptime() string {
+	return fmt.Sprintf("%-7s", u.ShortDuration(time.Since(p.startedAt)))
+}
+func (p *linePrefixer) Duration() string {
+	return fmt.Sprintf("%-7s", u.ShortDuration(time.Since(p.lastTime)))
+}