mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2024-10-30 03:36:16 +00:00
Code Issues Releases Wiki Activity

Route /rev/ to see any text part at a specified revision

Browse Source
This commit is contained in:
Timur Ismagilov 2020-08-20 22:20:13 +05:00
parent 60fcbdd30d
commit 813bbcf954
2 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
history/sh.go
View File

@ -89,12 +89,17 @@ func parseRevisionLine(line string) *Revision {
return &rev
}
func (rev *Revision) AsHtmlTableRow() string {
func (rev *Revision) AsHtmlTableRow(hyphaName string) string {
return fmt.Sprintf(`
<tr>
<td>%s</td>
<td><a href="/rev/%s/%s">%s</a></td>
<td>%s</td>
<td><time>%s</time></td>
<td>%s</td>
</tr>`, rev.Hash, rev.Username, rev.Time.String(), rev.Message)
</tr>`, rev.Hash, hyphaName, rev.Hash, rev.Username, rev.Time.String(), rev.Message)
}
func FileAtRevision(filepath, hash string) (string, error) {
out, err := gitsh("show", hash+":"+filepath)
return out.String(), err
}

48
http_readers.go
View File

@ -6,6 +6,8 @@ import (
"log"
"net/http"
"os"
"path"
"strings"
"github.com/bouncepaw/mycorrhiza/gemtext"
"github.com/bouncepaw/mycorrhiza/history"
@ -17,6 +19,48 @@ func init() {
http.HandleFunc("/text/", handlerText)
http.HandleFunc("/binary/", handlerBinary)
http.HandleFunc("/history/", handlerHistory)
http.HandleFunc("/rev/", handlerRevision)
}
// handlerRevision displays a specific revision of text part a page
func handlerRevision(w http.ResponseWriter, rq *http.Request) {
log.Println(rq.URL)
var (
shorterUrl = strings.TrimPrefix(rq.URL.Path, "/rev/")
revHash = path.Dir(shorterUrl)
hyphaName = CanonicalName(strings.TrimPrefix(shorterUrl, revHash+"/"))
contents = fmt.Sprintf(`<p>This hypha had no text at this revision.</p>`)
textPath = hyphaName + "&.gmi"
textContents, err = history.FileAtRevision(textPath, revHash)
)
log.Println(revHash, hyphaName, textPath, textContents, err)
if err == nil {
contents = gemtext.ToHtml(hyphaName, textContents)
}
form := fmt.Sprintf(`
<main>
<nav>
<ul>
<li><a href="/page/%[1]s">See the last revision</a></li>
<li><a href="/history/%[1]s">History</a></li>
</ul>
</nav>
<article>
%[2]s
%[3]s
</article>
<hr/>
<aside>
%[4]s
</aside>
</main>
`, hyphaName,
naviTitle(hyphaName),
contents,
tree.TreeAsHtml(hyphaName, IterateHyphaNamesWith))
w.Header().Set("Content-Type", "text/html;charset=utf-8")
w.WriteHeader(http.StatusOK)
w.Write([]byte(base(hyphaName, form)))
}
// handlerHistory lists all revisions of a hypha
@ -28,13 +72,13 @@ func handlerHistory(w http.ResponseWriter, rq *http.Request) {
revsT, err := history.Revisions(data.textPath)
if err == nil {
for _, rev := range revsT {
tbody += rev.AsHtmlTableRow()
tbody += rev.AsHtmlTableRow(hyphaName)
}
}
revsB, err := history.Revisions(data.binaryPath)
if err == nil {
for _, rev := range revsB {
tbody += rev.AsHtmlTableRow()
tbody += rev.AsHtmlTableRow(hyphaName)
}
}
log.Println(revsT, revsB)