{{.Cfg.Title}} ({{.Offset}}-{{.OffsetNext}})

cmd/sgblog/gopher.go | 28 ++++++++++++++-------------- cmd/sgblog/http.go | 38 +++++++++++++++++--------------------- common.go | 2 +- diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go index 4fbff0f000ac9e4024deaf311c470cf0432d06b053a282210e0b1626bdc42e52..c4667b61eec6c0a19afa2904ef00be4d16a0d85b2609855d9a24775371ff8d00 100644 --- a/cmd/sgblog/gopher.go +++ b/cmd/sgblog/gopher.go @@ -38,18 +38,20 @@ "gopkg.in/src-d/go-git.v4/plumbing/object" ) const ( - TmplGopherMenu = `{{$Cfg := .Cfg}}{{$CR := .CR}}i{{.Cfg.Title}} ({{.Offset}}-{{.OffsetNext}}) err {{.Cfg.GopherDomain}} 70{{.CR}} -{{if .Cfg.AboutURL}}hAbout URL:{{.Cfg.AboutURL}} {{.Cfg.GopherDomain}} 70{{.CR}}{{end}} -{{if .Offset}}1Prev offset/{{.OffsetPrev}} {{.Cfg.GopherDomain}} 70{{.CR}}{{end}} -{{if not .LogEnded}}1Next offset/{{.OffsetNext}} {{.Cfg.GopherDomain}} 70{{.CR}}{{end -}} -{{- $yearPrev := 0}}{{$monthPrev := 0}}{{$dayPrev := 0 -}} -{{- range .Entries }}{{$yearCur := .Commit.Author.When.Year}}{{$monthCur := .Commit.Author.When.Month}}{{$dayCur := .Commit.Author.When.Day -}} -{{- if or (ne $dayCur $dayPrev) (ne $monthCur $monthPrev) (ne $yearCur $yearPrev)}}{{$dayPrev = $dayCur}}{{$monthPrev = $monthCur}}{{$yearPrev = $yearCur}} -i{{$yearCur | printf "%04d"}}-{{$monthCur | printf "%02d"}}-{{$dayCur | printf "%02d"}} err {{$Cfg.GopherDomain}} 70{{$CR}}{{end}} -0[{{.Commit.Author.When.Hour | printf "%02d"}}:{{.Commit.Author.When.Minute | printf "%02d"}}] {{.Title}} ({{.LinesNum}}L){{if .CommentsNum}} ({{.CommentsNum}}C){{end}} /{{.Commit.Hash.String}} {{$Cfg.GopherDomain}} 70{{$CR}}{{end}} -iGenerated by: SGBlog {{.Version}} err {{.Cfg.GopherDomain}} 70{{.CR}} -.{{.CR}} -` + TmplGopherMenu = `{{$CR := printf "\r"}}{{$CRLF := printf "\r\n" -}} +{{- define "domainPort" }} {{.GopherDomain}} 70{{end}}{{$Cfg := .Cfg -}} +i{{.Cfg.Title}} ({{.Offset}}-{{.OffsetNext}}) err{{template "domainPort" .Cfg}}{{$CRLF -}} +{{- if .Cfg.AboutURL}}hAbout URL:{{.Cfg.AboutURL}}{{template "domainPort" .Cfg}}{{$CRLF}}{{end -}} +{{- if .Offset}}1Prev offset/{{.OffsetPrev}}{{template "domainPort" .Cfg}}{{$CRLF}}{{end -}} +{{- if not .LogEnded}}1Next offset/{{.OffsetNext}}{{template "domainPort" .Cfg}}{{$CRLF}}{{end -}} +{{- $datePrev := "0001-01-01" -}} +{{- range .Entries -}} +{{- $dateCur := .Commit.Author.When.Format "2006-01-02" -}} +{{- if ne $dateCur $datePrev}}{{$datePrev = $dateCur}} +i{{$dateCur}} err{{template "domainPort" $Cfg}}{{$CR}}{{end}} +0[{{.Commit.Author.When.Format "15:04"}}] {{.Title}} ({{.LinesNum}}L){{with .CommentsNum}} ({{.}}C){{end}} /{{.Commit.Hash.String}}{{template "domainPort" $Cfg}}{{$CR}}{{end}} +iGenerated by: SGBlog {{.Version}} err{{template "domainPort" .Cfg}}{{$CR}} +.{{$CRLF}}` TmplGopherEntry = `What: {{.Commit.Hash.String}} When: {{.When}} ------------------------------------------------------------------------ @@ -152,7 +154,6 @@ OffsetNext int LogEnded bool Entries []TableMenuEntry Version string - CR string }{ Cfg: cfg, Offset: offset, @@ -161,7 +162,6 @@ OffsetNext: offset + PageEntries, LogEnded: logEnded, Entries: entries, Version: sgblog.Version, - CR: "\r", }) if err != nil { log.Fatalln(err) diff --git a/cmd/sgblog/http.go b/cmd/sgblog/http.go index e68d2666a076d1037a68a5b23adbd6f3abe9627aa582c9902f57d946bda0d655..fdaf0ef13fce0b98294cf32a9fd0037c8363ba3bec0e7430dd3eb666b1eca17f 100644 --- a/cmd/sgblog/http.go +++ b/cmd/sgblog/http.go @@ -54,10 +54,9 @@ {{.Cfg.Title}} ({{.Offset}}-{{.OffsetNext}}) - {{if .Cfg.CSS}}{{end}} - {{if .Cfg.Webmaster}}{{end -}} - {{- range .Cfg.GitURLs}} - {{end}} + {{with .Cfg.CSS}}{{end}} + {{with .Cfg.Webmaster}}{{end}} + {{range .Cfg.GitURLs}}{{end}} {{if .CommentsEnabled}}{{end}} @@ -65,38 +64,35 @@ {{if .Offset}}{{end}} {{if not .LogEnded}}{{end}} -{{if .Cfg.AboutURL}}[about]{{end}} +{{with .Cfg.AboutURL}}[about]{{end}} {{block "links" .}} {{if .Offset}}[prev]{{end}} {{if not .LogEnded}}[next]{{end}} {{end}} {{- $Cfg := .Cfg -}} -{{- $yearPrev := 0 -}} -{{- $monthPrev := 0 -}} -{{- $dayPrev := 0}} +{{- $datePrev := "0001-01-01" -}} -{{range .Entries -}} -{{- $yearCur := .Commit.Author.When.Year -}} -{{- $monthCur := .Commit.Author.When.Month -}} -{{- $dayCur := .Commit.Author.When.Day -}} -{{- if or (ne $dayCur $dayPrev) (ne $monthCur $monthPrev) (ne $yearCur $yearPrev) -}} - -{{- $dayPrev = $dayCur}}{{$monthPrev = $monthCur}}{{$yearPrev = $yearCur -}} + +{{range .Entries -}} +{{- $dateCur := .Commit.Author.When.Format "2006-01-02" -}} +{{- if ne $dateCur $datePrev -}} + + {{- $datePrev = $dateCur -}} {{- end -}} - + - + -{{- end}}

N	When	Title	L	C	Linked to
`{{$yearCur \| printf "%04d"}}-{{$monthCur \| printf "%02d"}}-{{$dayCur \| printf "%02d"}}`
`{{$dateCur}}`
{{.Num}}	`{{.Commit.Author.When.Hour \| printf "%02d" -}}:{{- .Commit.Author.When.Minute \| printf "%02d"}}`	`{{.Commit.Author.When.Format "15:04"}}`	{{.Title}}	{{.LinesNum}}	{{if .CommentsNum}}{{.CommentsNum}}{{else}} {{end}}	{{range .DomainURLs}} {{.}} {{end}}	{{if .DomainURLs}}{{range .DomainURLs}} {{.}} {{end}}{{else}} {{end}}

+{{end}} {{template "links" .}} @@ -106,8 +102,8 @@ {{.Title}} ({{.When}}) - {{if .Cfg.CSS}}{{end}} - {{if .Cfg.Webmaster}}{{end -}} + {{with .Cfg.CSS}}{{end}} + {{with .Cfg.Webmaster}}{{end -}} {{- range .Cfg.GitURLs}} {{end}} @@ -115,7 +111,7 @@ {{if .Parent}}{{end}} -{{if .Cfg.AboutURL}}[about]{{end}} +{{with .Cfg.AboutURL}}[about]{{end}} [index] {{if .Parent}}[prev]{{end}} [{{.When}}] diff --git a/common.go b/common.go index ceb4782c28fd7909a9ad08aedc6e08c3f7c362951ab8a1ec66635fdeff41d704..bbf7b2570ae00d1b3d38e5187b461422f891ed2ec524dad2fab6ec13e8768a3f 100644 --- a/common.go +++ b/common.go @@ -2,6 +2,6 @@ // SGBlog -- Git-backed CGI/inetd blogging/phlogging engine package sgblog const ( - Version = "0.7.0" + Version = "0.7.1" WhenFmt = "2006-01-02 15:04:05Z07:00" )