From 43309c3bb07f615a517e2475b30c44ae1c1cd00c Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 15 Mar 2020 14:32:48 +0300 Subject: [PATCH] URL support in Gopher --- cmd/sgblog/gopher.go | 33 +++++++++++++++++++++++++++------ common.go | 2 +- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go index 41dc9d1..2fbbeda 100644 --- a/cmd/sgblog/gopher.go +++ b/cmd/sgblog/gopher.go @@ -107,8 +107,9 @@ func serveGopher() { yearCur, monthCur, dayCur := commit.Author.When.Date() if dayCur != dayPrev || monthCur != monthPrev || yearCur != yearPrev { menu.WriteString(fmt.Sprintf( - "i%04d-%02d-%02d\t\tnull.host\t1%s", - yearCur, monthCur, dayCur, CRLF, + "i%04d-%02d-%02d\tnil\t%s\t%d%s", + yearCur, monthCur, dayCur, + cfg.GopherDomain, 70, CRLF, )) yearPrev, monthPrev, dayPrev = yearCur, monthCur, dayCur } @@ -131,14 +132,18 @@ func serveGopher() { } fmt.Printf( - "i%s (%d-%d)\t\tnull.host\t1%s", + "i%s (%d-%d)\tnil\t%s\t%d%s", cfg.Title, offset, offset+PageEntries, - CRLF, + cfg.GopherDomain, 70, CRLF, ) if cfg.AboutURL != "" { - fmt.Printf("iAbout: %s\t\tnull.host\t1%s", cfg.AboutURL, CRLF) + fmt.Printf( + "hAbout\tURL:%s\t%s\t%d%s", + cfg.AboutURL, + cfg.GopherDomain, 70, CRLF, + ) } if offset > 0 { offsetPrev := offset - PageEntries @@ -159,8 +164,24 @@ func serveGopher() { ) } fmt.Print(menu.String()) - fmt.Printf("iGenerated by: SGBlog %s\t\tnull.host\t1%s", sgblog.Version, CRLF) + fmt.Printf( + "iGenerated by: SGBlog %s\terr\t%s\t%d%s", + sgblog.Version, + cfg.GopherDomain, 70, CRLF, + ) fmt.Print("." + CRLF) + } else if strings.HasPrefix(selector, "URL:") { + selector = selector[len("URL:"):] + fmt.Printf(` + + + Redirect to non-gopher URL + + +Redirecting to %s... + + +`, selector, selector, selector) } else if sha1DigestRe.MatchString(selector) { commit, err := repo.CommitObject(plumbing.NewHash(selector[1:])) if err != nil { diff --git a/common.go b/common.go index 86d1e83..bcc0d9c 100644 --- a/common.go +++ b/common.go @@ -2,6 +2,6 @@ package sgblog const ( - Version = "0.4.0" + Version = "0.5.0" WhenFmt = "2006-01-02 15:04:05Z07:00" ) -- 2.44.0