From b9bfb5a86e364838355c99402977fff38db24285 Mon Sep 17 00:00:00 2001 From: "Gabriel A. Giovanini" Date: Sat, 8 Feb 2025 22:07:17 +0100 Subject: feat: Add time to commit logs --- templates/commit.qtpl | 6 +- templates/commit.qtpl.go | 108 ++++++++++++---------- templates/gitlist.qtpl | 10 +- templates/gitlist.qtpl.go | 230 +++++++++++++++++++++++----------------------- 4 files changed, 187 insertions(+), 167 deletions(-) diff --git a/templates/commit.qtpl b/templates/commit.qtpl index dc6eae4..ea2f144 100644 --- a/templates/commit.qtpl +++ b/templates/commit.qtpl @@ -1,10 +1,12 @@ +{% import "git.gabrielgio.me/cerrado/pkg/humanize" %} {% import "github.com/go-git/go-git/v5/plumbing/object" %} {% func Commit(name string, c *object.Commit, showTar bool) %}
diff --git a/templates/commit.qtpl.go b/templates/commit.qtpl.go index ea8f020..eeaa1f0 100644 --- a/templates/commit.qtpl.go +++ b/templates/commit.qtpl.go @@ -5,121 +5,133 @@ package templates //line templates/commit.qtpl:1 +import "git.gabrielgio.me/cerrado/pkg/humanize" + +//line templates/commit.qtpl:2 import "github.com/go-git/go-git/v5/plumbing/object" -//line templates/commit.qtpl:3 +//line templates/commit.qtpl:4 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/commit.qtpl:3 +//line templates/commit.qtpl:4 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/commit.qtpl:3 +//line templates/commit.qtpl:4 func StreamCommit(qw422016 *qt422016.Writer, name string, c *object.Commit, showTar bool) { -//line templates/commit.qtpl:3 +//line templates/commit.qtpl:4 qw422016.N().S(`
`)
-//line templates/commit.qtpl:19
+//line templates/commit.qtpl:21
 	qw422016.E().S(c.Message)
-//line templates/commit.qtpl:19
+//line templates/commit.qtpl:21
 	qw422016.N().S(`
`) -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 } -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 func WriteCommit(qq422016 qtio422016.Writer, name string, c *object.Commit, showTar bool) { -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 StreamCommit(qw422016, name, c, showTar) -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 qt422016.ReleaseWriter(qw422016) -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 } -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 func Commit(name string, c *object.Commit, showTar bool) string { -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 qb422016 := qt422016.AcquireByteBuffer() -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 WriteCommit(qb422016, name, c, showTar) -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 qs422016 := string(qb422016.B) -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 qt422016.ReleaseByteBuffer(qb422016) -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 return qs422016 -//line templates/commit.qtpl:22 +//line templates/commit.qtpl:24 } diff --git a/templates/gitlist.qtpl b/templates/gitlist.qtpl index 4f25fc6..bb07e7f 100644 --- a/templates/gitlist.qtpl +++ b/templates/gitlist.qtpl @@ -1,3 +1,4 @@ +{% import "git.gabrielgio.me/cerrado/pkg/humanize" %} {% import "git.gabrielgio.me/cerrado/pkg/service" %} {% import "context" %} {% import "strings" %} @@ -39,10 +40,11 @@ type GitListPage struct {

{%s r.Description %}

-

- {%s r.LastCommit.Hash.String()[0:8] %} - - {%s r.LastCommit.Author.Name %} - - {%s firstLine(r.LastCommit.Message) %}

+

log tree diff --git a/templates/gitlist.qtpl.go b/templates/gitlist.qtpl.go index f3df84f..6fb168a 100644 --- a/templates/gitlist.qtpl.go +++ b/templates/gitlist.qtpl.go @@ -5,34 +5,37 @@ package templates //line templates/gitlist.qtpl:1 -import "git.gabrielgio.me/cerrado/pkg/service" +import "git.gabrielgio.me/cerrado/pkg/humanize" //line templates/gitlist.qtpl:2 -import "context" +import "git.gabrielgio.me/cerrado/pkg/service" //line templates/gitlist.qtpl:3 +import "context" + +//line templates/gitlist.qtpl:4 import "strings" -//line templates/gitlist.qtpl:5 +//line templates/gitlist.qtpl:6 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/gitlist.qtpl:5 +//line templates/gitlist.qtpl:6 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/gitlist.qtpl:6 +//line templates/gitlist.qtpl:7 type GitListPage struct { Respositories []*service.Repository About []byte } -//line templates/gitlist.qtpl:13 +//line templates/gitlist.qtpl:14 func firstLine(text string) string { lines := strings.Split(text, "\n") if len(lines) > 0 { @@ -41,185 +44,186 @@ func firstLine(text string) string { return "" } -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 func (p *GitListPage) StreamTitle(qw422016 *qt422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 qw422016.N().S(`Git | List`) -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 } -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 func (p *GitListPage) WriteTitle(qq422016 qtio422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 p.StreamTitle(qw422016, ctx) -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 qt422016.ReleaseWriter(qw422016) -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 } -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 func (p *GitListPage) Title(ctx context.Context) string { -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 qb422016 := qt422016.AcquireByteBuffer() -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 p.WriteTitle(qb422016, ctx) -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 qs422016 := string(qb422016.B) -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 qt422016.ReleaseByteBuffer(qb422016) -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 return qs422016 -//line templates/gitlist.qtpl:22 +//line templates/gitlist.qtpl:23 } -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 func (p *GitListPage) StreamNavbar(qw422016 *qt422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 StreamNavbar(qw422016, ctx, Git) -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 } -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 func (p *GitListPage) WriteNavbar(qq422016 qtio422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 p.StreamNavbar(qw422016, ctx) -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 qt422016.ReleaseWriter(qw422016) -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 } -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 func (p *GitListPage) Navbar(ctx context.Context) string { -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 qb422016 := qt422016.AcquireByteBuffer() -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 p.WriteNavbar(qb422016, ctx) -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 qs422016 := string(qb422016.B) -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 qt422016.ReleaseByteBuffer(qb422016) -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 return qs422016 -//line templates/gitlist.qtpl:24 +//line templates/gitlist.qtpl:25 } -//line templates/gitlist.qtpl:26 +//line templates/gitlist.qtpl:27 func (p *GitListPage) StreamContent(qw422016 *qt422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:26 +//line templates/gitlist.qtpl:27 qw422016.N().S(`

`) -//line templates/gitlist.qtpl:30 +//line templates/gitlist.qtpl:31 for _, r := range p.Respositories { -//line templates/gitlist.qtpl:30 +//line templates/gitlist.qtpl:31 qw422016.N().S(`
`) -//line templates/gitlist.qtpl:37 +//line templates/gitlist.qtpl:38 if !r.Public { -//line templates/gitlist.qtpl:37 +//line templates/gitlist.qtpl:38 qw422016.N().S(`private`) -//line templates/gitlist.qtpl:37 +//line templates/gitlist.qtpl:38 } -//line templates/gitlist.qtpl:37 +//line templates/gitlist.qtpl:38 qw422016.N().S(`

`) -//line templates/gitlist.qtpl:41 +//line templates/gitlist.qtpl:42 qw422016.E().S(r.Description) -//line templates/gitlist.qtpl:41 +//line templates/gitlist.qtpl:42 qw422016.N().S(`

-

- + `) -//line templates/gitlist.qtpl:43 - qw422016.E().S(r.LastCommit.Hash.String()[0:8]) -//line templates/gitlist.qtpl:43 - qw422016.N().S(` - - `) + qw422016.N().S(`/">`) //line templates/gitlist.qtpl:44 - qw422016.E().S(r.LastCommit.Author.Name) + qw422016.E().S(r.LastCommit.Hash.String()[0:8]) //line templates/gitlist.qtpl:44 - qw422016.N().S(` - - `) + qw422016.N().S(` + `) //line templates/gitlist.qtpl:45 qw422016.E().S(firstLine(r.LastCommit.Message)) //line templates/gitlist.qtpl:45 - qw422016.N().S(`

+ qw422016.N().S(` + `) +//line templates/gitlist.qtpl:46 + qw422016.E().S(humanize.Time(r.LastCommit.Author.When)) +//line templates/gitlist.qtpl:46 + qw422016.N().S(` +

log tree refs

`) -//line templates/gitlist.qtpl:52 +//line templates/gitlist.qtpl:54 } -//line templates/gitlist.qtpl:52 +//line templates/gitlist.qtpl:54 qw422016.N().S(`
`) -//line templates/gitlist.qtpl:56 +//line templates/gitlist.qtpl:58 qw422016.N().Z(p.About) -//line templates/gitlist.qtpl:56 +//line templates/gitlist.qtpl:58 qw422016.N().S(`
`) -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 } -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 func (p *GitListPage) WriteContent(qq422016 qtio422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 p.StreamContent(qw422016, ctx) -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 qt422016.ReleaseWriter(qw422016) -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 } -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 func (p *GitListPage) Content(ctx context.Context) string { -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 qb422016 := qt422016.AcquireByteBuffer() -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 p.WriteContent(qb422016, ctx) -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 qs422016 := string(qb422016.B) -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 qt422016.ReleaseByteBuffer(qb422016) -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 return qs422016 -//line templates/gitlist.qtpl:62 +//line templates/gitlist.qtpl:64 } -//line templates/gitlist.qtpl:64 +//line templates/gitlist.qtpl:66 func (p *GitListPage) StreamScript(qw422016 *qt422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:64 +//line templates/gitlist.qtpl:66 qw422016.N().S(` `) -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 } -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 func (p *GitListPage) WriteScript(qq422016 qtio422016.Writer, ctx context.Context) { -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 p.StreamScript(qw422016, ctx) -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 qt422016.ReleaseWriter(qw422016) -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 } -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 func (p *GitListPage) Script(ctx context.Context) string { -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 qb422016 := qt422016.AcquireByteBuffer() -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 p.WriteScript(qb422016, ctx) -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 qs422016 := string(qb422016.B) -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 qt422016.ReleaseByteBuffer(qb422016) -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 return qs422016 -//line templates/gitlist.qtpl:65 +//line templates/gitlist.qtpl:67 } -- cgit v1.2.3