From 3d75da2eab0d8932ae67fc8e638050c58b159d3a Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Wed, 17 Apr 2024 11:45:04 -0600 Subject: imworkingon: Include more precise timestamps --- cmd/generate/imworkingon.html.tmpl | 4 ++-- cmd/generate/main.go | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'cmd/generate') diff --git a/cmd/generate/imworkingon.html.tmpl b/cmd/generate/imworkingon.html.tmpl index b73c2d8..d34f141 100644 --- a/cmd/generate/imworkingon.html.tmpl +++ b/cmd/generate/imworkingon.html.tmpl @@ -40,8 +40,8 @@ #{{ $tag }} {{/* */}} {{- end }} -
Submitted: {{ $contrib.SubmittedAt.Format "2006-01-02" }}
-
{{ if not $contrib.LastUpdatedAt.IsZero }}Last updated: {{ $contrib.LastUpdatedAt.Format "2006-01-02" }}{{ end }}
+
Submitted: {{ timeTag $contrib.SubmittedAt "2006-01-02" }}
+
{{ if not $contrib.LastUpdatedAt.IsZero }}Last updated: {{ timeTag $contrib.LastUpdatedAt "2006-01-02" }}{{ end }}
Status: {{ $contrib.Status }}
{{- $contrib.Desc | md2html }} diff --git a/cmd/generate/main.go b/cmd/generate/main.go index e26120d..7ed67cf 100644 --- a/cmd/generate/main.go +++ b/cmd/generate/main.go @@ -7,6 +7,7 @@ import ( "os" "sort" "strings" + "time" "html/template" @@ -35,6 +36,9 @@ func main() { //go:embed imworkingon.html.tmpl var htmlTmplStr string +var timeTagTmpl = template.Must(template.New("time.tag.tmpl"). + Parse(``)) + func mainWithError() error { contribs, err := ReadContribs("imworkingon/contribs.yml") if err != nil { @@ -63,6 +67,15 @@ func mainWithError() error { tmpl := template.Must(template.New("imworkingon.html.tmpl"). Funcs(template.FuncMap{ + "timeTag": func(ts time.Time, prettyFmt string) (template.HTML, error) { + var out strings.Builder + err := timeTagTmpl.Execute(&out, map[string]string{ + "Machine": ts.Format(time.RFC3339), + "HumanVerbose": ts.Format("2006-01-02 15:04:05Z07:00"), + "HumanPretty": ts.Format(prettyFmt), + }) + return template.HTML(out.String()), err + }, "md2html": MarkdownToHTML, "getUpstream": func(c Contribution) Upstream { // First try any of the documented upstreams. -- cgit v1.2.3-2-g168b