cmd/sgblog/gemini-entry.tmpl | 5 +---- cmd/sgblog/gemini-menu.tmpl | 3 +-- cmd/sgblog/gemini.go | 36 ++++++++++++------------------------ cmd/sgblog/gopher-entry.tmpl | 7 +------ cmd/sgblog/gopher-menu.tmpl | 3 +-- cmd/sgblog/gopher.go | 45 ++++++++++++--------------------------------- common.go | 2 +- diff --git a/cmd/sgblog/gemini-entry.tmpl b/cmd/sgblog/gemini-entry.tmpl index 23bc842a54586210b3165a19012908a1b9c79a1b38318efc3304fa421ec0e327..83d2cc4a52dd2d8e68aa886a321286a3c8311476d949607f3970512fc21b7a71 100644 --- a/cmd/sgblog/gemini-entry.tmpl +++ b/cmd/sgblog/gemini-entry.tmpl @@ -15,12 +15,9 @@ {{- if .Images}} {{range $idx, $img := .Images}}=> /img/{{$img.Path}} {{$img.Alt}} {{end}} {{end -}} -{{- if .Cfg.CommentsEmail}} -=> mailto:{{.Cfg.CommentsEmail}}?subject={{.TitleEscaped}} {{$.T.Get "leave a comment"}} -{{end}}{{range $idx, $comment := .Comments}} +{{range $idx, $comment := .Comments}} ## {{$.T.Get "comment"}} {{$idx}}: ``` {{$comment}} ``` {{end}} -{{$.T.Get "Generated by"}}: SGBlog {{.Version}} diff --git a/cmd/sgblog/gemini-menu.tmpl b/cmd/sgblog/gemini-menu.tmpl index d70f70b03cda4b4c0497a8d4fc38886748fd2e1d83cf094d4a08b036c86a83ae..2614bbd208d3e235e044db73b9593b327a05d2ae37828c3cbe8a65e1c4047cd6 100644 --- a/cmd/sgblog/gemini-menu.tmpl +++ b/cmd/sgblog/gemini-menu.tmpl @@ -9,9 +9,8 @@ {{- range .Entries -}} {{- $dateCur := .Commit.Author.When.Format "2006-01-02" -}} {{- if ne $dateCur $datePrev}}{{$datePrev = $dateCur}}## {{$dateCur}} {{end -}} -=> /{{.Commit.Hash.String}} {{.Commit.Author.When.Format "2006-01-02"}} [{{.Commit.Author.When.Format "15:04"}}] {{.Title}} ({{.LinesNum}}L){{with .ImagesNum}} ({{.}}I){{end}}{{with .CommentsNum}} ({{.}}C){{end}}{{if .Topics}}{{range .Topics}} {{.}}{{end}}{{end}} +=> /{{.Commit.Hash.String}} {{.Commit.Author.When.Format "2006-01-02"}} {{.Title}} {{end}} {{range .Topics -}}=> /?topic={{.}} Topic: {{.}} {{end}} -{{$.T.Get "Generated by"}}: SGBlog {{.Version}} diff --git a/cmd/sgblog/gemini.go b/cmd/sgblog/gemini.go index d5826ede976d76c7ff522e4051e3a837857d9e5dfc8601aac6b2491d6ccc4c24..10a4334c24ebb696f087aaa8ae1bff30f9408bcd3e4f11db42d695747eff1ca4 100644 --- a/cmd/sgblog/gemini.go +++ b/cmd/sgblog/gemini.go @@ -132,16 +132,8 @@ break } lines := msgSplit(commit.Message) entries = append(entries, TableMenuEntry{ - Commit: commit, - Title: lines[0], - LinesNum: len(lines) - 2, - ImagesNum: len(listImgs(cfg, commit.Hash)), - CommentsNum: len(sgblog.ParseComments(sgblog.GetNote( - repo, commentsTree, commit.Hash, - ))), - Topics: sgblog.ParseTopics(sgblog.GetNote( - repo, topicsTree, commit.Hash, - )), + Commit: commit, + Title: lines[0], }) } offsetPrev := max(offset-PageEntries, 0) @@ -178,17 +170,16 @@ log.Fatalln(err) } title := msgSplit(commit.Message)[0] err = TmplGemEntry.Execute(os.Stdout, struct { - T *spreak.Localizer - Title string - Commit *object.Commit - When string - Cfg *Cfg - Note string - Images []Img - Comments []string - Topics []string - Version string - TitleEscaped string + T *spreak.Localizer + Title string + Commit *object.Commit + When string + Cfg *Cfg + Note string + Images []Img + Comments []string + Topics []string + Version string }{ T: localizer, Title: title, @@ -200,9 +191,6 @@ Images: listImgs(cfg, commit.Hash), Comments: sgblog.ParseComments(sgblog.GetNote(repo, commentsTree, commit.Hash)), Topics: sgblog.ParseTopics(sgblog.GetNote(repo, topicsTree, commit.Hash)), Version: sgblog.Version, - TitleEscaped: url.PathEscape(fmt.Sprintf( - "Re: %s (%s)", title, commit.Hash, - )), }) if err != nil { log.Fatalln(err) diff --git a/cmd/sgblog/gopher-entry.tmpl b/cmd/sgblog/gopher-entry.tmpl index 0edcd1be9fec1b89cf97cb9d6975da65ea5045c4035f52f5269c231f0b2b821c..8f971896fa6bb916840a0611921eaed4d16b9889556e1a120baa19b82ec0ee00 100644 --- a/cmd/sgblog/gopher-entry.tmpl +++ b/cmd/sgblog/gopher-entry.tmpl @@ -12,13 +12,8 @@ {{- if .Note}} ------------------------------------------------------------------------ {{$.T.Get "Note"}}: {{.Note}}{{end -}} -{{- if .Cfg.CommentsEmail}} ------------------------------------------------------------------------- -{{$.T.Get "leave a comment"}}: mailto:{{.Cfg.CommentsEmail}}?subject={{.TitleEscaped}} -{{end}}{{range $idx, $comment := .Comments}} +{{range $idx, $comment := .Comments}} ------------------------------------------------------------------------ {{$.T.Get "comment"}} {{$idx}}: {{$comment}} {{end}} ------------------------------------------------------------------------- -{{$.T.Get "Generated by"}}: SGBlog {{.Version}} diff --git a/cmd/sgblog/gopher-menu.tmpl b/cmd/sgblog/gopher-menu.tmpl index a464f16a4efc8cf9d25d3b818383c19b3eec0e390bb4a23353463d0a348891ed..63180fa4f1cb021bbe0e5087ab19d9531b662c612664f4fd4d9af325e7caf785 100644 --- a/cmd/sgblog/gopher-menu.tmpl +++ b/cmd/sgblog/gopher-menu.tmpl @@ -9,8 +9,7 @@ {{- 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 .ImagesNum}} ({{.}}I){{end}}{{with .CommentsNum}} ({{.}}C){{end}}{{if .Topics}}{{range .Topics}} {{.}}{{end}}{{end}} /{{.Commit.Hash.String}}{{template "domainPort" $Cfg}}{{$CR}}{{end}} +0{{.Title}} /{{.Commit.Hash.String}}{{template "domainPort" $Cfg}}{{$CR}}{{end}} {{range .Topics}} 1{{$.T.Get "topic"}}: {{.}} {{.}}/offset/0{{template "domainPort" $Cfg}}{{$CR}}{{end}} -i{{$.T.Get "Generated by"}}: SGBlog {{.Version}} err{{template "domainPort" .Cfg}}{{$CR}} .{{$CRLF}} diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go index 8b542a7a6f700e988f8f3ddc9343ea822dbe043b80b13f8142a1bbc3b73016d0..5dcd996e92a7d22fb89fd650cec9c1c7b2b1685235df66662b1a3f30554452c1 100644 --- a/cmd/sgblog/gopher.go +++ b/cmd/sgblog/gopher.go @@ -22,7 +22,6 @@ "errors" "fmt" "io" "log" - "net/url" "os" "strconv" "strings" @@ -46,12 +45,8 @@ TmplGopherEntry = template.Must(template.New("gopher-entry").Parse(TmplGopherEntryRaw)) ) type TableMenuEntry struct { - Commit *object.Commit - Title string - Topics []string - LinesNum int - ImagesNum int - CommentsNum int + Commit *object.Commit + Title string } func serveGopher(cfgPath string) { @@ -97,16 +92,14 @@ if err != nil { log.Fatalln(err) } err = TmplGopherEntry.Execute(os.Stdout, struct { - T *spreak.Localizer - Commit *object.Commit - When string - Cfg *Cfg - Note string - Images []Img - Comments []string - Topics []string - Version string - TitleEscaped string + T *spreak.Localizer + Commit *object.Commit + When string + Cfg *Cfg + Note string + Images []Img + Comments []string + Topics []string }{ T: localizer, Commit: commit, @@ -116,10 +109,6 @@ Note: string(sgblog.GetNote(repo, notesTree, commit.Hash)), Images: listImgs(cfg, commit.Hash), Comments: sgblog.ParseComments(sgblog.GetNote(repo, commentsTree, commit.Hash)), Topics: sgblog.ParseTopics(sgblog.GetNote(repo, topicsTree, commit.Hash)), - Version: sgblog.Version, - TitleEscaped: url.PathEscape(fmt.Sprintf( - "Re: %s (%s)", msgSplit(commit.Message)[0], commit.Hash, - )), }) if err != nil { log.Fatalln(err) @@ -177,16 +166,8 @@ break } lines := msgSplit(commit.Message) entries = append(entries, TableMenuEntry{ - Commit: commit, - Title: lines[0], - LinesNum: len(lines) - 2, - ImagesNum: len(listImgs(cfg, commit.Hash)), - CommentsNum: len(sgblog.ParseComments(sgblog.GetNote( - repo, commentsTree, commit.Hash, - ))), - Topics: sgblog.ParseTopics(sgblog.GetNote( - repo, topicsTree, commit.Hash, - )), + Commit: commit, + Title: lines[0], }) } offsetPrev := max(offset-PageEntries, 0) @@ -200,7 +181,6 @@ OffsetNext int LogEnded bool Entries []TableMenuEntry Topics []string - Version string }{ T: localizer, Cfg: cfg, @@ -211,7 +191,6 @@ OffsetNext: offset + PageEntries, LogEnded: logEnded, Entries: entries, Topics: topicsCache.Topics(), - Version: sgblog.Version, }) if err != nil { log.Fatalln(err) diff --git a/common.go b/common.go index 6fdcf6b7a791c9cbec022b14cf5454b6ce8a731833d23fc4613e8d8f82ba5b49..e36cddacca81f93870127f4a6aec00ce72c4634bffaa10031333d88afea47489 100644 --- a/common.go +++ b/common.go @@ -30,7 +30,7 @@ "go.cypherpunks.su/recfile/v2" ) const ( - Version = "0.34.0" + Version = "0.35.0" WhenFmt = "2006-01-02 15:04:05Z07:00" )