better unit formatting

Author: chrisyxlee

app/cmd/root.go

@@ -283,13 +283,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-const (
-	categoryCreatedAndCompletedWithin = "create_complete_within"
-	categoryLongTermFinished          = "pulled_across_finish_line"
-	categoryLongTermContinue          = "long_term_continue"
-	categoryGeneralUpdate             = "general_update"
-)
-
 /*
 End goal: ??
 

go.mod

@@ -3,6 +3,7 @@ module github.com/chrisyxlee/snippets
 go 1.18
 
 require (
+	github.com/bcicen/go-units v1.0.5
 	github.com/benbjohnson/clock v1.3.0
 	github.com/charmbracelet/lipgloss v0.7.1
 	github.com/google/go-github/v53 v53.2.0
@@ -14,8 +15,10 @@ require (
 )
 
 require (
+	github.com/Knetic/govaluate v3.0.0+incompatible // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/bcicen/bfstree v1.0.0 // indirect
 	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect

go.sum

@@ -1,7 +1,13 @@
+github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg=
+github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA=
 github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/bcicen/bfstree v1.0.0 h1:Fx9vcyXYspj2GIJqAvd1lwCNI+cQF/r2JJqxHHmsAO0=
+github.com/bcicen/bfstree v1.0.0/go.mod h1:u//juIip96SNFkG4iMn9z0KzqLSeFSpBKoBo5ceq1uE=
+github.com/bcicen/go-units v1.0.5 h1:gfeKGDc8JgKCFyqxNKPgHc735KH3VW8bnuL5X2y2up4=
+github.com/bcicen/go-units v1.0.5/go.mod h1:c7/sSz9cc6XvnrjsyNwoKHqN6KDDf8LME5vSf+U5Y08=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=

internal/format/issue.go

@@ -3,14 +3,37 @@ package format
 import (
 	"bytes"
 	"fmt"
+	"math"
 	"strings"
 	"time"
 
+	u "github.com/bcicen/go-units"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/google/go-github/v53/github"
 	"github.com/samber/lo"
 )
 
+var (
+	uWeek                u.Unit
+	orderedDurationUnits []u.Unit
+)
+
+func init() {
+	uWeek = u.NewUnit("week", "wk", u.UnitOptionPlural("auto"))
+	u.NewRatioConversion(uWeek, u.Day, 7)
+
+	orderedDurationUnits = []u.Unit{
+		u.Year,
+		u.Month,
+		uWeek,
+		u.Day,
+		u.Hour,
+		u.Minute,
+		u.Second,
+		u.MilliSecond,
+	}
+}
+
 var (
 	styleNumber = lipgloss.NewStyle().
 		AlignHorizontal(lipgloss.Right).
@@ -207,29 +230,22 @@ func fmtDuration(issue *github.Issue) string {
 		dur = time.Since(issue.CreatedAt.Time)
 	}
 
-	var roughDuration string
-	switch {
-	case dur > oneYear:
-		roughDuration = fmt.Sprintf("%0.1fyr", dur.Seconds()/oneYear.Seconds())
-	case dur > oneMonth:
-		roughDuration = fmt.Sprintf("%0.1fmo", dur.Seconds()/oneMonth.Seconds())
-	case dur > oneWeek:
-		roughDuration = fmt.Sprintf("%0.1fw", dur.Seconds()/oneWeek.Seconds())
-	case dur > oneDay:
-		roughDuration = fmt.Sprintf("%0.1fd", dur.Seconds()/oneDay.Seconds())
-	case dur > time.Hour:
-		roughDuration = fmt.Sprintf("%0.1fh", dur.Seconds()/time.Hour.Seconds())
-	case dur > time.Minute:
-		roughDuration = fmt.Sprintf("%0.1fm", dur.Seconds()/time.Minute.Seconds())
-	case dur > time.Second:
-		roughDuration = fmt.Sprintf("%0.1fs", dur.Seconds()/time.Minute.Seconds())
+	val := u.NewValue(dur.Seconds(), u.Second)
+	var newVal u.Value
+	for _, unit := range orderedDurationUnits {
+		convertedVal := val.MustConvert(unit)
+		if convertedVal.Float() > 1 {
+			newVal = u.NewValue(math.Ceil(convertedVal.Float()), convertedVal.Unit())
+			break
+		}
 	}
 
-	if len(roughDuration) > 0 {
-		return fmt.Sprintf("(%s)", roughDuration)
-	}
+	fmtVal := newVal.Fmt(u.FmtOptions{
+		Label:     true,
+		Precision: 1,
+	})
 
-	return ""
+	return fmt.Sprintf("<=%s", fmtVal)
 }
 
 func fmtType(issue *github.Issue) string {