cmd/sgblog/gopher.go | 174 +++++++++++++++++++++++++++---------------------------
cmd/sgblog/http.go | 429 +++++++++++++++++++++++++++++------------------------
common.go | 2 +-
diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go
index bf0904128b3be948d2ee15296e76df8908051d16aac1074e2cf124574065ba0c..4fbff0f000ac9e4024deaf311c470cf0432d06b053a282210e0b1626bdc42e52 100644
--- a/cmd/sgblog/gopher.go
+++ b/cmd/sgblog/gopher.go
@@ -19,7 +19,6 @@ package main
import (
"bufio"
- "bytes"
"encoding/json"
"errors"
"fmt"
@@ -29,20 +28,54 @@ "log"
"os"
"strconv"
"strings"
- "time"
+ "text/template"
"github.com/hjson/hjson-go"
"go.stargrave.org/sgblog"
"gopkg.in/src-d/go-git.v4"
"gopkg.in/src-d/go-git.v4/plumbing"
+ "gopkg.in/src-d/go-git.v4/plumbing/object"
)
-const CRLF = "\r\n"
+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}}
+`
+ TmplGopherEntry = `What: {{.Commit.Hash.String}}
+When: {{.When}}
+------------------------------------------------------------------------
+{{.Commit.Message -}}
+{{- if .Note}}
+------------------------------------------------------------------------
+Note:
+{{.Note}}{{end -}}
+{{- if .Cfg.CommentsEmail}}
+------------------------------------------------------------------------
+leave comment: mailto:{{.Cfg.CommentsEmail}}?subject={{.Commit.Hash.String}}
+{{end}}{{range $idx, $comment := .Comments}}
+------------------------------------------------------------------------
+comment {{$idx}}:
+{{$comment}}
+{{end}}
+------------------------------------------------------------------------
+Generated by: SGBlog {{.Version}}
+`
+)
-var DashLine = strings.Repeat("-", 72)
-
-func makeI(cfg *Cfg, value string) string {
- return strings.Join([]string{"i" + value, "err", cfg.GopherDomain, "70", CRLF}, "\t")
+type TableMenuEntry struct {
+ Commit *object.Commit
+ Title string
+ LinesNum int
+ CommentsNum int
}
func serveGopher() {
@@ -89,79 +122,50 @@ repoLog, err := repo.Log(&git.LogOptions{From: *headHash})
if err != nil {
log.Fatalln(err)
}
- commitN := 0
for i := 0; i < offset; i++ {
if _, err = repoLog.Next(); err != nil {
break
}
- commitN++
}
-
logEnded := false
- var menu bytes.Buffer
- var yearPrev int
- var monthPrev time.Month
- var dayPrev int
+ entries := make([]TableMenuEntry, 0, PageEntries)
for i := 0; i < PageEntries; i++ {
commit, err := repoLog.Next()
if err != nil {
logEnded = true
break
}
- yearCur, monthCur, dayCur := commit.Author.When.Date()
- if dayCur != dayPrev || monthCur != monthPrev || yearCur != yearPrev {
- menu.WriteString(makeI(cfg, fmt.Sprintf(
- "%04d-%02d-%02d", yearCur, monthCur, dayCur,
- )))
- yearPrev, monthPrev, dayPrev = yearCur, monthCur, dayCur
- }
- commitN++
lines := msgSplit(commit.Message)
- var commentsValue string
- if l := len(parseComments(getNote(commentsTree, commit.Hash))); l > 0 {
- commentsValue = fmt.Sprintf(" (%dC)", l)
- }
- menu.WriteString(fmt.Sprintf(
- "0[%02d:%02d] %s (%dL)%s\t/%s\t%s\t%d%s",
- commit.Author.When.Hour(),
- commit.Author.When.Minute(),
- lines[0],
- len(lines)-2,
- commentsValue,
- commit.Hash.String(),
- cfg.GopherDomain, 70, CRLF,
- ))
- }
-
- fmt.Print(makeI(cfg, fmt.Sprintf("%s (%d-%d)", cfg.Title, offset, offset+PageEntries)))
- if cfg.AboutURL != "" {
- fmt.Printf(
- "hAbout\tURL:%s\t%s\t%d%s",
- cfg.AboutURL,
- cfg.GopherDomain, 70, CRLF,
- )
- }
- if offset > 0 {
- offsetPrev := offset - PageEntries
- if offsetPrev < 0 {
- offsetPrev = 0
- }
- fmt.Printf(
- "1Prev\toffset/%d\t%s\t%d%s",
- offsetPrev,
- cfg.GopherDomain, 70, CRLF,
- )
+ entries = append(entries, TableMenuEntry{
+ Commit: commit,
+ Title: lines[0],
+ LinesNum: len(lines) - 2,
+ CommentsNum: len(parseComments(getNote(commentsTree, commit.Hash))),
+ })
}
- if !logEnded {
- fmt.Printf(
- "1Next\toffset/%d\t%s\t%d%s",
- offset+PageEntries,
- cfg.GopherDomain, 70, CRLF,
- )
+ tmpl := template.Must(template.New("menu").Parse(TmplGopherMenu))
+ err = tmpl.Execute(os.Stdout, struct {
+ Cfg *Cfg
+ Offset int
+ OffsetPrev int
+ OffsetNext int
+ LogEnded bool
+ Entries []TableMenuEntry
+ Version string
+ CR string
+ }{
+ Cfg: cfg,
+ Offset: offset,
+ OffsetPrev: offset - PageEntries,
+ OffsetNext: offset + PageEntries,
+ LogEnded: logEnded,
+ Entries: entries,
+ Version: sgblog.Version,
+ CR: "\r",
+ })
+ if err != nil {
+ log.Fatalln(err)
}
- fmt.Print(menu.String())
- fmt.Printf(makeI(cfg, "Generated by: SGBlog "+sgblog.Version))
- fmt.Print("." + CRLF)
} else if strings.HasPrefix(selector, "URL:") {
selector = selector[len("URL:"):]
fmt.Printf(`
@@ -179,29 +183,25 @@ commit, err := repo.CommitObject(plumbing.NewHash(selector[1:]))
if err != nil {
log.Fatalln(err)
}
- fmt.Printf(
- "What: %s\nWhen: %s\n%s\n%s",
- commit.Hash.String(),
- commit.Author.When.Format(sgblog.WhenFmt),
- DashLine,
- commit.Message,
- )
- notesRaw := getNote(notesTree, commit.Hash)
- if len(notesRaw) > 0 {
- fmt.Printf("%s\nNote:\n%s\n", DashLine, string(notesRaw))
+ tmpl := template.Must(template.New("entry").Parse(TmplGopherEntry))
+ err = tmpl.Execute(os.Stdout, struct {
+ Commit *object.Commit
+ When string
+ Cfg *Cfg
+ Note string
+ Comments []string
+ Version string
+ }{
+ Commit: commit,
+ When: commit.Author.When.Format(sgblog.WhenFmt),
+ Cfg: cfg,
+ Note: string(getNote(notesTree, commit.Hash)),
+ Comments: parseComments(getNote(commentsTree, commit.Hash)),
+ Version: sgblog.Version,
+ })
+ if err != nil {
+ log.Fatalln(err)
}
- if cfg.CommentsEmail != "" {
- fmt.Printf(
- "%s\nleave comment: mailto:%s?subject=%s\n",
- DashLine,
- cfg.CommentsEmail,
- commit.Hash.String(),
- )
- }
- for i, comment := range parseComments(getNote(commentsTree, commit.Hash)) {
- fmt.Printf("%s\ncomment %d:\n%s\n", DashLine, i, comment)
- }
- fmt.Printf("%s\nGenerated by: SGBlog %s\n", DashLine, sgblog.Version)
} else {
log.Fatalln(errors.New("unknown selector"))
}
diff --git a/cmd/sgblog/http.go b/cmd/sgblog/http.go
index 9fa38b2f1221c19a21b7b2e1ea79004a1b34a98d3d32856e64aa099caf8cfdfd..e68d2666a076d1037a68a5b23adbd6f3abe9627aa582c9902f57d946bda0d655 100644
--- a/cmd/sgblog/http.go
+++ b/cmd/sgblog/http.go
@@ -35,7 +35,7 @@ "net/url"
"os"
"strconv"
"strings"
- "time"
+ "text/template"
"github.com/hjson/hjson-go"
"go.stargrave.org/sgblog"
@@ -49,11 +49,106 @@
const (
AtomPostsFeed = "feed.atom"
AtomCommentsFeed = "comments.atom"
+ TmplHTMLIndex = `
+
+ {{.Cfg.Title}} ({{.Offset}}-{{.OffsetNext}})
+ {{if .Cfg.CSS}}about ]{{end}}
+{{block "links" .}}
+{{if .Offset}}[prev ]{{end}}
+{{if not .LogEnded}}[next ]{{end}}
+{{end}}
+{{- $Cfg := .Cfg -}}
+{{- $yearPrev := 0 -}}
+{{- $monthPrev := 0 -}}
+{{- $dayPrev := 0}}
+
+
+ N When Title
+ L C Linked to
+ {{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) -}}
+{{$yearCur | printf "%04d"}}-{{$monthCur | printf "%02d"}}-{{$dayCur | printf "%02d"}}
+ {{.Num}}
+ {{.Commit.Author.When.Hour | printf "%02d" -}}:{{- .Commit.Author.When.Minute | printf "%02d"}} {{.Title}} {{.LinesNum}}
+ {{if .CommentsNum}}{{.CommentsNum}}{{else}} {{end}}
+ {{range .DomainURLs}} {{.}} {{end}}
+
+{{- end}}
+{{template "links" .}}
+
+
+`
+ TmplHTMLEntry = `{{$Cfg := .Cfg}}
+
+ {{.Title}} ({{.When}})
+ {{if .Cfg.CSS}}about ]{{end}}
+[index ]
+{{if .Parent}}[prev ]{{end}}
+[{{.When}} {{.Commit.Hash.String}} {{.Title}}
+
+{{range .Lines}}{{. | lineURLize $Cfg.URLPrefix}}
+{{end}}
+
+{{range .NoteLines}}{{. | lineURLize $Cfg.URLPrefix}}
+{{end}}
+leave comment ]{{end}}
+
+{{range $idx, $comment := .Comments}}
+comment {{$idx}} :
+{{range $comment.HeaderLines}}{{.}}
+{{end}}{{range $comment.BodyLines}}{{. | lineURLize $Cfg.URLPrefix}}
+{{end}}
+
+
+
+`
)
var (
- defaultLinks = []string{}
-
renderableSchemes = map[string]struct{}{
"ftp": struct{}{},
"gopher": struct{}{},
@@ -64,8 +159,18 @@ }
)
type TableEntry struct {
- commit *object.Commit
- commentsRaw []byte
+ Commit *object.Commit
+ CommentsRaw []byte
+ Num int
+ Title string
+ LinesNum int
+ CommentsNum int
+ DomainURLs []string
+}
+
+type CommentEntry struct {
+ HeaderLines []string
+ BodyLines []string
}
func makeA(href, text string) string {
@@ -92,13 +197,15 @@ if u := urlParse(col); u != nil {
cols[i] = makeA(col, col)
continue
}
- cols[i] = sha1DigestRe.ReplaceAllString(col, makeA(
- urlPrefix+"/$1", "$1",
- ))
+ cols[i] = sha1DigestRe.ReplaceAllString(col, makeA(urlPrefix+"/$1", "$1"))
}
return strings.Join(cols, " ")
}
+func lineURLizeInTemplate(urlPrefix, line interface{}) string {
+ return lineURLize(urlPrefix.(string), line.(string))
+}
+
func startHeader(etag hash.Hash, gziped bool) string {
lines := []string{
"Content-Type: text/html; charset=UTF-8",
@@ -112,21 +219,6 @@ lines = append(lines, "")
return strings.Join(lines, "\n")
}
-func startHTML(title string, additional []string) string {
- return fmt.Sprintf(`
-
- %s
- %s
-
-
-`,
- sgblog.Version, title,
- strings.Join(append(defaultLinks, additional...), "\n "),
- )
-}
-
func makeErr(err error) {
fmt.Print("Content-Type: text/plain; charset=UTF-8\n\n")
fmt.Println(err)
@@ -182,42 +274,31 @@ etagHash, err := blake2b.New256(nil)
if err != nil {
panic(err)
}
- etagHash.Write([]byte("SGBLOG"))
- etagHash.Write([]byte(sgblog.Version))
- etagHash.Write([]byte(cfg.GitPath))
- etagHash.Write([]byte(cfg.Branch))
- etagHash.Write([]byte(cfg.Title))
- etagHash.Write([]byte(cfg.URLPrefix))
- etagHash.Write([]byte(cfg.AtomBaseURL))
- etagHash.Write([]byte(cfg.AtomId))
- etagHash.Write([]byte(cfg.AtomAuthor))
-
- etagHashForWeb := [][]byte{}
- if cfg.CSS != "" {
- defaultLinks = append(defaultLinks, `\n" +
- "N " +
- "When " +
- "Title " +
- `L C Linked to \n")
- var yearPrev int
- var monthPrev time.Month
- var dayPrev int
- for _, entry := range entries {
- yearCur, monthCur, dayCur := entry.commit.Author.When.Date()
- if dayCur != dayPrev || monthCur != monthPrev || yearCur != yearPrev {
- table.WriteString(fmt.Sprintf(
- "%04d-%02d-%02d %d %02d:%02d %s "+
- "%d %s "+
- "%s
")
-
- var href string
- links := []string{`%s %s %s \n\n",
- when, commit.Hash.String(), title,
- )))
- for _, line := range lines[2:] {
- out.Write([]byte(lineURLize(cfg.URLPrefix, line) + "\n"))
- }
- out.Write([]byte(" \n\n"))
- for _, line := range strings.Split(string(notesRaw), "\n") {
- out.Write([]byte(lineURLize(cfg.URLPrefix, line) + "\n"))
- }
- out.Write([]byte(" \n\n"))
- for i, comment := range parseComments(commentsRaw) {
- out.Write([]byte(fmt.Sprintf(
- "comment %d :"+
- "\n",
- i, i, i,
- )))
- lines = strings.Split(comment, "\n")
- for _, line := range lines[:3] {
- out.Write([]byte(line + "\n"))
- }
- for _, line := range lines[3:] {
- out.Write([]byte(lineURLize(cfg.URLPrefix, line) + "\n"))
- }
- out.Write([]byte(" \n"))
} else {
makeErr(errors.New("unknown URL action"))
}
diff --git a/common.go b/common.go
index 03ccde2422d085c05a7df6dfac157e9de0316c622b1832fecc81a3842117b3d0..ceb4782c28fd7909a9ad08aedc6e08c3f7c362951ab8a1ec66635fdeff41d704 100644
--- a/common.go
+++ b/common.go
@@ -2,6 +2,6 @@ // SGBlog -- Git-backed CGI/inetd blogging/phlogging engine
package sgblog
const (
- Version = "0.6.5"
+ Version = "0.7.0"
WhenFmt = "2006-01-02 15:04:05Z07:00"
)