From b662eb5219d6bd44eb4b9939c57bd2e26cacabdd Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Sun, 24 Jan 2021 17:52:40 +0500 Subject: [PATCH 01/53] Move some files around --- README.md | 2 +- .../{http_mutators.qtpl => mutators.qtpl} | 0 ...http_mutators.qtpl.go => mutators.qtpl.go} | 122 ++++----- templates/{http_readers.qtpl => readers.qtpl} | 0 .../{http_readers.qtpl.go => readers.qtpl.go} | 220 +++++++-------- templates/{http_stuff.qtpl => stuff.qtpl} | 2 +- .../{http_stuff.qtpl.go => stuff.qtpl.go} | 252 +++++++++--------- 7 files changed, 299 insertions(+), 299 deletions(-) rename templates/{http_mutators.qtpl => mutators.qtpl} (100%) rename templates/{http_mutators.qtpl.go => mutators.qtpl.go} (57%) rename templates/{http_readers.qtpl => readers.qtpl} (100%) rename templates/{http_readers.qtpl.go => readers.qtpl.go} (54%) rename templates/{http_stuff.qtpl => stuff.qtpl} (98%) rename templates/{http_stuff.qtpl.go => stuff.qtpl.go} (52%) diff --git a/README.md b/README.md index db4db81..d092c4c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 🍄 MycorrhizaWiki 0.12 +# 🍄 MycorrhizaWiki 0.13 A wiki engine. [Main wiki](https://mycorrhiza.lesarbr.es) diff --git a/templates/http_mutators.qtpl b/templates/mutators.qtpl similarity index 100% rename from templates/http_mutators.qtpl rename to templates/mutators.qtpl diff --git a/templates/http_mutators.qtpl.go b/templates/mutators.qtpl.go similarity index 57% rename from templates/http_mutators.qtpl.go rename to templates/mutators.qtpl.go index 8f25c90..7a4ec80 100644 --- a/templates/http_mutators.qtpl.go +++ b/templates/mutators.qtpl.go @@ -1,169 +1,169 @@ -// Code generated by qtc from "http_mutators.qtpl". DO NOT EDIT. +// Code generated by qtc from "mutators.qtpl". DO NOT EDIT. // See https://github.com/valyala/quicktemplate for details. -//line templates/http_mutators.qtpl:1 +//line templates/mutators.qtpl:1 package templates -//line templates/http_mutators.qtpl:1 +//line templates/mutators.qtpl:1 import "net/http" -//line templates/http_mutators.qtpl:3 +//line templates/mutators.qtpl:3 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/http_mutators.qtpl:3 +//line templates/mutators.qtpl:3 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/http_mutators.qtpl:3 +//line templates/mutators.qtpl:3 func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string) { -//line templates/http_mutators.qtpl:3 +//line templates/mutators.qtpl:3 qw422016.N().S(` `) -//line templates/http_mutators.qtpl:4 +//line templates/mutators.qtpl:4 qw422016.N().S(navHTML(rq, hyphaName, "edit")) -//line templates/http_mutators.qtpl:4 +//line templates/mutators.qtpl:4 qw422016.N().S(`

Edit `) -//line templates/http_mutators.qtpl:6 +//line templates/mutators.qtpl:6 qw422016.E().S(hyphaName) -//line templates/http_mutators.qtpl:6 +//line templates/mutators.qtpl:6 qw422016.N().S(`

`) -//line templates/http_mutators.qtpl:7 +//line templates/mutators.qtpl:7 qw422016.N().S(warning) -//line templates/http_mutators.qtpl:7 +//line templates/mutators.qtpl:7 qw422016.N().S(`

Cancel
`) -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 } -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 func WriteEditHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string) { -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 StreamEditHTML(qw422016, rq, hyphaName, textAreaFill, warning) -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 qt422016.ReleaseWriter(qw422016) -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 } -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) string { -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 qb422016 := qt422016.AcquireByteBuffer() -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 WriteEditHTML(qb422016, rq, hyphaName, textAreaFill, warning) -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 qs422016 := string(qb422016.B) -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 qt422016.ReleaseByteBuffer(qb422016) -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 return qs422016 -//line templates/http_mutators.qtpl:17 +//line templates/mutators.qtpl:17 } -//line templates/http_mutators.qtpl:19 +//line templates/mutators.qtpl:19 func StreamPreviewHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) { -//line templates/http_mutators.qtpl:19 +//line templates/mutators.qtpl:19 qw422016.N().S(` `) -//line templates/http_mutators.qtpl:20 +//line templates/mutators.qtpl:20 qw422016.N().S(navHTML(rq, hyphaName, "edit")) -//line templates/http_mutators.qtpl:20 +//line templates/mutators.qtpl:20 qw422016.N().S(`

Edit `) -//line templates/http_mutators.qtpl:22 +//line templates/mutators.qtpl:22 qw422016.E().S(hyphaName) -//line templates/http_mutators.qtpl:22 +//line templates/mutators.qtpl:22 qw422016.N().S(` (preview)

`) -//line templates/http_mutators.qtpl:23 +//line templates/mutators.qtpl:23 qw422016.N().S(warning) -//line templates/http_mutators.qtpl:23 +//line templates/mutators.qtpl:23 qw422016.N().S(`

Cancel

Note that the hypha is not saved yet. You can preview the changes ↓

`) -//line templates/http_mutators.qtpl:33 +//line templates/mutators.qtpl:33 qw422016.N().S(renderedPage) -//line templates/http_mutators.qtpl:33 +//line templates/mutators.qtpl:33 qw422016.N().S(`
`) -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 } -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 func WritePreviewHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) { -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 StreamPreviewHTML(qw422016, rq, hyphaName, textAreaFill, warning, renderedPage) -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 qt422016.ReleaseWriter(qw422016) -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 } -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 func PreviewHTML(rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) string { -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 qb422016 := qt422016.AcquireByteBuffer() -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 WritePreviewHTML(qb422016, rq, hyphaName, textAreaFill, warning, renderedPage) -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 qs422016 := string(qb422016.B) -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 qt422016.ReleaseByteBuffer(qb422016) -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 return qs422016 -//line templates/http_mutators.qtpl:35 +//line templates/mutators.qtpl:35 } diff --git a/templates/http_readers.qtpl b/templates/readers.qtpl similarity index 100% rename from templates/http_readers.qtpl rename to templates/readers.qtpl diff --git a/templates/http_readers.qtpl.go b/templates/readers.qtpl.go similarity index 54% rename from templates/http_readers.qtpl.go rename to templates/readers.qtpl.go index d9000da..e93927b 100644 --- a/templates/http_readers.qtpl.go +++ b/templates/readers.qtpl.go @@ -1,256 +1,256 @@ -// Code generated by qtc from "http_readers.qtpl". DO NOT EDIT. +// Code generated by qtc from "readers.qtpl". DO NOT EDIT. // See https://github.com/valyala/quicktemplate for details. -//line templates/http_readers.qtpl:1 +//line templates/readers.qtpl:1 package templates -//line templates/http_readers.qtpl:1 +//line templates/readers.qtpl:1 import "net/http" -//line templates/http_readers.qtpl:2 +//line templates/readers.qtpl:2 import "path" -//line templates/http_readers.qtpl:3 +//line templates/readers.qtpl:3 import "github.com/bouncepaw/mycorrhiza/user" -//line templates/http_readers.qtpl:5 +//line templates/readers.qtpl:5 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/http_readers.qtpl:5 +//line templates/readers.qtpl:5 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/http_readers.qtpl:5 +//line templates/readers.qtpl:5 func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/http_readers.qtpl:5 +//line templates/readers.qtpl:5 qw422016.N().S(` `) -//line templates/http_readers.qtpl:6 +//line templates/readers.qtpl:6 streamnavHTML(qw422016, rq, hyphaName, "history") -//line templates/http_readers.qtpl:6 +//line templates/readers.qtpl:6 qw422016.N().S(`

History of `) -//line templates/http_readers.qtpl:9 +//line templates/readers.qtpl:9 qw422016.E().S(hyphaName) -//line templates/http_readers.qtpl:9 +//line templates/readers.qtpl:9 qw422016.N().S(`

`) -//line templates/http_readers.qtpl:10 +//line templates/readers.qtpl:10 qw422016.N().S(list) -//line templates/http_readers.qtpl:10 +//line templates/readers.qtpl:10 qw422016.N().S(`
`) -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 } -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 StreamHistoryHTML(qw422016, rq, hyphaName, list) -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 qt422016.ReleaseWriter(qw422016) -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 } -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 func HistoryHTML(rq *http.Request, hyphaName, list string) string { -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 qb422016 := qt422016.AcquireByteBuffer() -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 WriteHistoryHTML(qb422016, rq, hyphaName, list) -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 qs422016 := string(qb422016.B) -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 qt422016.ReleaseByteBuffer(qb422016) -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 return qs422016 -//line templates/http_readers.qtpl:13 +//line templates/readers.qtpl:13 } -//line templates/http_readers.qtpl:15 +//line templates/readers.qtpl:15 func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) { -//line templates/http_readers.qtpl:15 +//line templates/readers.qtpl:15 qw422016.N().S(` `) -//line templates/http_readers.qtpl:16 +//line templates/readers.qtpl:16 streamnavHTML(qw422016, rq, hyphaName, "revision", revHash) -//line templates/http_readers.qtpl:16 +//line templates/readers.qtpl:16 qw422016.N().S(`

Please note that viewing binary parts of hyphae is not supported in history for now.

`) -//line templates/http_readers.qtpl:20 +//line templates/readers.qtpl:20 qw422016.N().S(naviTitle) -//line templates/http_readers.qtpl:20 +//line templates/readers.qtpl:20 qw422016.N().S(` `) -//line templates/http_readers.qtpl:21 +//line templates/readers.qtpl:21 qw422016.N().S(contents) -//line templates/http_readers.qtpl:21 +//line templates/readers.qtpl:21 qw422016.N().S(`
`) -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 } -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) { -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, revHash) -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 qt422016.ReleaseWriter(qw422016) -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 } -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) string { -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 qb422016 := qt422016.AcquireByteBuffer() -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, revHash) -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 qs422016 := string(qb422016.B) -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 qt422016.ReleaseByteBuffer(qb422016) -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 return qs422016 -//line templates/http_readers.qtpl:28 +//line templates/readers.qtpl:28 } // If `contents` == "", a helpful message is shown instead. -//line templates/http_readers.qtpl:31 +//line templates/readers.qtpl:31 func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/http_readers.qtpl:31 +//line templates/readers.qtpl:31 qw422016.N().S(` `) -//line templates/http_readers.qtpl:32 +//line templates/readers.qtpl:32 streamnavHTML(qw422016, rq, hyphaName, "page") -//line templates/http_readers.qtpl:32 +//line templates/readers.qtpl:32 qw422016.N().S(`
`) -//line templates/http_readers.qtpl:35 +//line templates/readers.qtpl:35 qw422016.N().S(naviTitle) -//line templates/http_readers.qtpl:35 +//line templates/readers.qtpl:35 qw422016.N().S(` `) -//line templates/http_readers.qtpl:36 +//line templates/readers.qtpl:36 if contents == "" { -//line templates/http_readers.qtpl:36 +//line templates/readers.qtpl:36 qw422016.N().S(`

This hypha has no text. Why not create it?

`) -//line templates/http_readers.qtpl:38 +//line templates/readers.qtpl:38 } else { -//line templates/http_readers.qtpl:38 +//line templates/readers.qtpl:38 qw422016.N().S(` `) -//line templates/http_readers.qtpl:39 +//line templates/readers.qtpl:39 qw422016.N().S(contents) -//line templates/http_readers.qtpl:39 +//line templates/readers.qtpl:39 qw422016.N().S(` `) -//line templates/http_readers.qtpl:40 +//line templates/readers.qtpl:40 } -//line templates/http_readers.qtpl:40 +//line templates/readers.qtpl:40 qw422016.N().S(`
`) -//line templates/http_readers.qtpl:43 +//line templates/readers.qtpl:43 if prevHyphaName != "" { -//line templates/http_readers.qtpl:43 +//line templates/readers.qtpl:43 qw422016.N().S(` `) -//line templates/http_readers.qtpl:45 +//line templates/readers.qtpl:45 } -//line templates/http_readers.qtpl:45 +//line templates/readers.qtpl:45 qw422016.N().S(` `) -//line templates/http_readers.qtpl:46 +//line templates/readers.qtpl:46 if nextHyphaName != "" { -//line templates/http_readers.qtpl:46 +//line templates/readers.qtpl:46 qw422016.N().S(` `) -//line templates/http_readers.qtpl:48 +//line templates/readers.qtpl:48 } -//line templates/http_readers.qtpl:48 +//line templates/readers.qtpl:48 qw422016.N().S(`
`) -//line templates/http_readers.qtpl:50 +//line templates/readers.qtpl:50 if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" { -//line templates/http_readers.qtpl:50 +//line templates/readers.qtpl:50 qw422016.N().S(`
`) -//line templates/http_readers.qtpl:54 +//line templates/readers.qtpl:54 if hasAmnt { -//line templates/http_readers.qtpl:54 +//line templates/readers.qtpl:54 qw422016.N().S(` Unattach current attachment? `) -//line templates/http_readers.qtpl:56 +//line templates/readers.qtpl:56 } -//line templates/http_readers.qtpl:56 +//line templates/readers.qtpl:56 qw422016.N().S(`
@@ -258,44 +258,44 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi
`) -//line templates/http_readers.qtpl:62 +//line templates/readers.qtpl:62 } -//line templates/http_readers.qtpl:62 +//line templates/readers.qtpl:62 qw422016.N().S(`
`) -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 } -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 qt422016.ReleaseWriter(qw422016) -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 } -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) string { -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 qb422016 := qt422016.AcquireByteBuffer() -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 qs422016 := string(qb422016.B) -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 qt422016.ReleaseByteBuffer(qb422016) -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 return qs422016 -//line templates/http_readers.qtpl:67 +//line templates/readers.qtpl:67 } diff --git a/templates/http_stuff.qtpl b/templates/stuff.qtpl similarity index 98% rename from templates/http_stuff.qtpl rename to templates/stuff.qtpl index 8723860..adf7958 100644 --- a/templates/http_stuff.qtpl +++ b/templates/stuff.qtpl @@ -60,7 +60,7 @@

About {%s util.SiteName %}

+ {% endfunc %} diff --git a/templates/recent_changes.qtpl.go b/templates/recent_changes.qtpl.go index 329ccc5..e3cc346 100644 --- a/templates/recent_changes.qtpl.go +++ b/templates/recent_changes.qtpl.go @@ -21,58 +21,59 @@ var ( func StreamRecentChangesHTML(qw422016 *qt422016.Writer, changes []string, n int) { //line templates/recent_changes.qtpl:1 qw422016.N().S(` -
+
+

Recent Changes

← Back

@@ -80,80 +81,81 @@ func StreamRecentChangesHTML(qw422016 *qt422016.Writer, changes []string, n int)

Subscribe via RSS, Atom or JSON feed.

`) -//line templates/recent_changes.qtpl:28 +//line templates/recent_changes.qtpl:29 qw422016.N().S(`
`) -//line templates/recent_changes.qtpl:31 +//line templates/recent_changes.qtpl:32 if len(changes) == 0 { -//line templates/recent_changes.qtpl:31 +//line templates/recent_changes.qtpl:32 qw422016.N().S(`

Could not find any recent changes.

`) -//line templates/recent_changes.qtpl:33 +//line templates/recent_changes.qtpl:34 } else { -//line templates/recent_changes.qtpl:33 +//line templates/recent_changes.qtpl:34 qw422016.N().S(` `) -//line templates/recent_changes.qtpl:34 +//line templates/recent_changes.qtpl:35 for i, entry := range changes { -//line templates/recent_changes.qtpl:34 +//line templates/recent_changes.qtpl:35 qw422016.N().S(`
    `) -//line templates/recent_changes.qtpl:37 +//line templates/recent_changes.qtpl:38 qw422016.N().S(entry) -//line templates/recent_changes.qtpl:37 +//line templates/recent_changes.qtpl:38 qw422016.N().S(`
`) -//line templates/recent_changes.qtpl:39 +//line templates/recent_changes.qtpl:40 } -//line templates/recent_changes.qtpl:39 +//line templates/recent_changes.qtpl:40 qw422016.N().S(` `) -//line templates/recent_changes.qtpl:40 +//line templates/recent_changes.qtpl:41 } -//line templates/recent_changes.qtpl:40 +//line templates/recent_changes.qtpl:41 qw422016.N().S(`
+
`) -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 } -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 func WriteRecentChangesHTML(qq422016 qtio422016.Writer, changes []string, n int) { -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 StreamRecentChangesHTML(qw422016, changes, n) -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 qt422016.ReleaseWriter(qw422016) -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 } -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 func RecentChangesHTML(changes []string, n int) string { -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 qb422016 := qt422016.AcquireByteBuffer() -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 WriteRecentChangesHTML(qb422016, changes, n) -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 qs422016 := string(qb422016.B) -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 qt422016.ReleaseByteBuffer(qb422016) -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 return qs422016 -//line templates/recent_changes.qtpl:43 +//line templates/recent_changes.qtpl:45 } diff --git a/templates/rename.qtpl b/templates/rename.qtpl index aee28ce..8f35d55 100644 --- a/templates/rename.qtpl +++ b/templates/rename.qtpl @@ -2,7 +2,8 @@ This dialog is to be shown to a user when they try to rename a hypha. {% func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) %} {%= navHTML(rq, hyphaName, "rename-ask") %} -
+
+
{%- if isOld -%}

Rename {%s hyphaName %}

@@ -26,6 +27,7 @@ This dialog is to be shown to a user when they try to rename a hypha. {%= cannotRenameDueToNonExistence(hyphaName) %} {%- endif -%}
+
{% endfunc %} {% func cannotRenameDueToNonExistence(hyphaName string) %} diff --git a/templates/rename.qtpl.go b/templates/rename.qtpl.go index 2347bcd..973c5f7 100644 --- a/templates/rename.qtpl.go +++ b/templates/rename.qtpl.go @@ -31,28 +31,29 @@ func StreamRenameAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName streamnavHTML(qw422016, rq, hyphaName, "rename-ask") //line templates/rename.qtpl:4 qw422016.N().S(` -
+
+
`) -//line templates/rename.qtpl:6 +//line templates/rename.qtpl:7 if isOld { -//line templates/rename.qtpl:6 +//line templates/rename.qtpl:7 qw422016.N().S(`

Rename `) -//line templates/rename.qtpl:8 +//line templates/rename.qtpl:9 qw422016.E().S(hyphaName) -//line templates/rename.qtpl:8 +//line templates/rename.qtpl:9 qw422016.N().S(`

New name
@@ -67,92 +68,93 @@ func StreamRenameAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName
`) -//line templates/rename.qtpl:25 +//line templates/rename.qtpl:26 } else { -//line templates/rename.qtpl:25 +//line templates/rename.qtpl:26 qw422016.N().S(` `) -//line templates/rename.qtpl:26 +//line templates/rename.qtpl:27 streamcannotRenameDueToNonExistence(qw422016, hyphaName) -//line templates/rename.qtpl:26 +//line templates/rename.qtpl:27 qw422016.N().S(` `) -//line templates/rename.qtpl:27 +//line templates/rename.qtpl:28 } -//line templates/rename.qtpl:27 +//line templates/rename.qtpl:28 qw422016.N().S(`
+
`) -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 } -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 func WriteRenameAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 StreamRenameAskHTML(qw422016, rq, hyphaName, isOld) -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 qt422016.ReleaseWriter(qw422016) -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 } -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) string { -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 qb422016 := qt422016.AcquireByteBuffer() -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 WriteRenameAskHTML(qb422016, rq, hyphaName, isOld) -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 qs422016 := string(qb422016.B) -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 qt422016.ReleaseByteBuffer(qb422016) -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 return qs422016 -//line templates/rename.qtpl:29 +//line templates/rename.qtpl:31 } -//line templates/rename.qtpl:31 +//line templates/rename.qtpl:33 func streamcannotRenameDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) { -//line templates/rename.qtpl:31 +//line templates/rename.qtpl:33 qw422016.N().S(`

Cannot rename `) -//line templates/rename.qtpl:33 +//line templates/rename.qtpl:35 qw422016.E().S(hyphaName) -//line templates/rename.qtpl:33 +//line templates/rename.qtpl:35 qw422016.N().S(`

This hypha does not exist.

Go back

`) -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 } -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 func writecannotRenameDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) { -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 streamcannotRenameDueToNonExistence(qw422016, hyphaName) -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 qt422016.ReleaseWriter(qw422016) -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 } -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 func cannotRenameDueToNonExistence(hyphaName string) string { -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 qb422016 := qt422016.AcquireByteBuffer() -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 writecannotRenameDueToNonExistence(qb422016, hyphaName) -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 qs422016 := string(qb422016.B) -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 qt422016.ReleaseByteBuffer(qb422016) -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 return qs422016 -//line templates/rename.qtpl:37 +//line templates/rename.qtpl:39 } diff --git a/templates/stuff.qtpl b/templates/stuff.qtpl index 724a925..fce9908 100644 --- a/templates/stuff.qtpl +++ b/templates/stuff.qtpl @@ -27,7 +27,8 @@ {% endfunc %} {% func HyphaListHTML(tbody string, pageCount int) %} -
+
+

List of hyphae

This wiki has {%d pageCount %} hyphae.

@@ -42,6 +43,7 @@
+
{% endfunc %} {% func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) %} @@ -56,7 +58,8 @@ {% endfunc %} {% func AboutHTML() %} -
+
+

About {%s util.SiteName %}

    @@ -75,4 +78,5 @@

    See /list for information about hyphae on this wiki.

+
{% endfunc %} diff --git a/templates/stuff.qtpl.go b/templates/stuff.qtpl.go index a42f972..0bf3bf1 100644 --- a/templates/stuff.qtpl.go +++ b/templates/stuff.qtpl.go @@ -117,12 +117,13 @@ func BaseHTML(title, body string, u *user.User, headElements ...string) string { func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) { //line templates/stuff.qtpl:29 qw422016.N().S(` -
+
+

List of hyphae

This wiki has `) -//line templates/stuff.qtpl:32 +//line templates/stuff.qtpl:33 qw422016.N().D(pageCount) -//line templates/stuff.qtpl:32 +//line templates/stuff.qtpl:33 qw422016.N().S(` hyphae.

@@ -133,203 +134,206 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) `) -//line templates/stuff.qtpl:41 +//line templates/stuff.qtpl:42 qw422016.N().S(tbody) -//line templates/stuff.qtpl:41 +//line templates/stuff.qtpl:42 qw422016.N().S(`
+
`) -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 } -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) { -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 StreamHyphaListHTML(qw422016, tbody, pageCount) -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 } -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 func HyphaListHTML(tbody string, pageCount int) string { -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 WriteHyphaListHTML(qb422016, tbody, pageCount) -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 return qs422016 -//line templates/stuff.qtpl:45 +//line templates/stuff.qtpl:47 } -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:49 func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:49 qw422016.N().S(` `) -//line templates/stuff.qtpl:49 +//line templates/stuff.qtpl:51 qw422016.E().S(hyphaName) -//line templates/stuff.qtpl:49 +//line templates/stuff.qtpl:51 qw422016.N().S(` `) -//line templates/stuff.qtpl:50 +//line templates/stuff.qtpl:52 if binaryPresent { -//line templates/stuff.qtpl:50 +//line templates/stuff.qtpl:52 qw422016.N().S(` `) -//line templates/stuff.qtpl:51 +//line templates/stuff.qtpl:53 qw422016.E().S(binaryMime) -//line templates/stuff.qtpl:51 +//line templates/stuff.qtpl:53 qw422016.N().S(` `) -//line templates/stuff.qtpl:52 +//line templates/stuff.qtpl:54 } else { -//line templates/stuff.qtpl:52 +//line templates/stuff.qtpl:54 qw422016.N().S(` `) -//line templates/stuff.qtpl:54 +//line templates/stuff.qtpl:56 } -//line templates/stuff.qtpl:54 +//line templates/stuff.qtpl:56 qw422016.N().S(` `) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 } -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 } -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string { -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 return qs422016 -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:58 } -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:60 func StreamAboutHTML(qw422016 *qt422016.Writer) { -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:60 qw422016.N().S(` -
+
+

About `) -//line templates/stuff.qtpl:61 +//line templates/stuff.qtpl:64 qw422016.E().S(util.SiteName) -//line templates/stuff.qtpl:61 +//line templates/stuff.qtpl:64 qw422016.N().S(`

See /list for information about hyphae on this wiki.

+
`) -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 } -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 func WriteAboutHTML(qq422016 qtio422016.Writer) { -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 StreamAboutHTML(qw422016) -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 } -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 func AboutHTML() string { -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 WriteAboutHTML(qb422016) -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 return qs422016 -//line templates/stuff.qtpl:78 +//line templates/stuff.qtpl:82 } diff --git a/templates/unattach.qtpl b/templates/unattach.qtpl index e4f0ae2..8f7fe60 100644 --- a/templates/unattach.qtpl +++ b/templates/unattach.qtpl @@ -1,7 +1,8 @@ {% import "net/http" %} {% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %} -
{%= navHTML(rq, hyphaName, "unattach-ask") %} +
+
{%- if isOld -%}

Unattach {%s hyphaName %}?

@@ -13,6 +14,7 @@ {%= cannotUnattachDueToNonExistence(hyphaName) %} {%- endif -%}
+
{% endfunc %} {% func cannotUnattachDueToNonExistence(hyphaName string) %} diff --git a/templates/unattach.qtpl.go b/templates/unattach.qtpl.go index c00bc80..e5bc0d2 100644 --- a/templates/unattach.qtpl.go +++ b/templates/unattach.qtpl.go @@ -24,125 +24,127 @@ var ( func StreamUnattachAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { //line templates/unattach.qtpl:2 qw422016.N().S(` -
`) -//line templates/unattach.qtpl:4 +//line templates/unattach.qtpl:3 streamnavHTML(qw422016, rq, hyphaName, "unattach-ask") -//line templates/unattach.qtpl:4 +//line templates/unattach.qtpl:3 qw422016.N().S(` +
+
`) -//line templates/unattach.qtpl:5 +//line templates/unattach.qtpl:6 if isOld { -//line templates/unattach.qtpl:5 +//line templates/unattach.qtpl:6 qw422016.N().S(`

Unattach `) -//line templates/unattach.qtpl:7 +//line templates/unattach.qtpl:8 qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:7 +//line templates/unattach.qtpl:8 qw422016.N().S(`?

Do you really want to unattach hypha `) -//line templates/unattach.qtpl:8 +//line templates/unattach.qtpl:9 qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:8 +//line templates/unattach.qtpl:9 qw422016.N().S(`?

Confirm

Cancel

`) -//line templates/unattach.qtpl:12 +//line templates/unattach.qtpl:13 } else { -//line templates/unattach.qtpl:12 +//line templates/unattach.qtpl:13 qw422016.N().S(` `) -//line templates/unattach.qtpl:13 +//line templates/unattach.qtpl:14 streamcannotUnattachDueToNonExistence(qw422016, hyphaName) -//line templates/unattach.qtpl:13 +//line templates/unattach.qtpl:14 qw422016.N().S(` `) -//line templates/unattach.qtpl:14 +//line templates/unattach.qtpl:15 } -//line templates/unattach.qtpl:14 +//line templates/unattach.qtpl:15 qw422016.N().S(`
+
`) -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 } -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 func WriteUnattachAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 StreamUnattachAskHTML(qw422016, rq, hyphaName, isOld) -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 qt422016.ReleaseWriter(qw422016) -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 } -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) string { -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 qb422016 := qt422016.AcquireByteBuffer() -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 WriteUnattachAskHTML(qb422016, rq, hyphaName, isOld) -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 qs422016 := string(qb422016.B) -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 qt422016.ReleaseByteBuffer(qb422016) -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 return qs422016 -//line templates/unattach.qtpl:16 +//line templates/unattach.qtpl:18 } -//line templates/unattach.qtpl:18 +//line templates/unattach.qtpl:20 func streamcannotUnattachDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) { -//line templates/unattach.qtpl:18 +//line templates/unattach.qtpl:20 qw422016.N().S(`

Cannot unattach `) -//line templates/unattach.qtpl:20 +//line templates/unattach.qtpl:22 qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:20 +//line templates/unattach.qtpl:22 qw422016.N().S(`

This hypha does not exist.

Go back

`) -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 } -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 func writecannotUnattachDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) { -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 streamcannotUnattachDueToNonExistence(qw422016, hyphaName) -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 qt422016.ReleaseWriter(qw422016) -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 } -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 func cannotUnattachDueToNonExistence(hyphaName string) string { -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 qb422016 := qt422016.AcquireByteBuffer() -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 writecannotUnattachDueToNonExistence(qb422016, hyphaName) -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 qs422016 := string(qb422016.B) -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 qt422016.ReleaseByteBuffer(qb422016) -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 return qs422016 -//line templates/unattach.qtpl:24 +//line templates/unattach.qtpl:26 } From ae1c5db3b3b69f5cefbc10bf2a7e416b44e46eaa Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Fri, 29 Jan 2021 00:07:21 +0500 Subject: [PATCH 07/53] Move mimetype stuff to a separate module --- .gitignore | 1 + http_readers.go | 3 +- hypha.go | 87 ++++++++++++++++++++++++------------------------ hyphae/hypha.go | 21 ------------ main.go | 3 +- mime.go | 62 ---------------------------------- mimetype/mime.go | 68 +++++++++++++++++++++++++++++++++++++ util/util.go | 14 ++++++++ 8 files changed, 131 insertions(+), 128 deletions(-) delete mode 100644 hyphae/hypha.go delete mode 100644 mime.go create mode 100644 mimetype/mime.go diff --git a/.gitignore b/.gitignore index c450f48..9632b28 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ mycorrhiza +hyphae/*.gog diff --git a/http_readers.go b/http_readers.go index 7978e69..9cd4c69 100644 --- a/http_readers.go +++ b/http_readers.go @@ -11,6 +11,7 @@ import ( "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/mimetype" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/tree" "github.com/bouncepaw/mycorrhiza/user" @@ -71,7 +72,7 @@ func handlerBinary(w http.ResponseWriter, rq *http.Request) { hyphaName := HyphaNameFromRq(rq, "binary") if data, ok := HyphaStorage[hyphaName]; ok { log.Println("Serving", data.binaryPath) - w.Header().Set("Content-Type", ExtensionToMime(filepath.Ext(data.binaryPath))) + w.Header().Set("Content-Type", mimetype.FromExtension(filepath.Ext(data.binaryPath))) http.ServeFile(w, rq, data.binaryPath) } } diff --git a/hypha.go b/hypha.go index be7fef4..82fe103 100644 --- a/hypha.go +++ b/hypha.go @@ -13,6 +13,7 @@ import ( "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/mimetype" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" ) @@ -114,7 +115,7 @@ func UploadBinary(hyphaName, mime string, file multipart.File, u *user.User) *hi if err != nil { return hop.WithError(err).Apply() } - return uploadHelp(hop, hyphaName, MimeToExtension(mime), data, u) + return uploadHelp(hop, hyphaName, mimetype.ToExtension(mime), data, u) } // DeleteHypha deletes hypha and makes a history record about that. @@ -254,48 +255,6 @@ func binaryHtmlBlock(hyphaName string, hd *HyphaData) string { } } -// Index finds all hypha files in the full `path` and saves them to HyphaStorage. This function is recursive. -func Index(path string) { - nodes, err := ioutil.ReadDir(path) - if err != nil { - log.Fatal(err) - } - - for _, node := range nodes { - // If this hypha looks like it can be a hypha path, go deeper. Do not touch the .git and static folders for they have an admnistrative importance! - if node.IsDir() && isCanonicalName(node.Name()) && node.Name() != ".git" && node.Name() != "static" { - Index(filepath.Join(path, node.Name())) - continue - } - - var ( - hyphaPartPath = filepath.Join(path, node.Name()) - hyphaName, isText, skip = DataFromFilename(hyphaPartPath) - hyphaData *HyphaData - ) - if !skip { - // Reuse the entry for existing hyphae, create a new one for those that do not exist yet. - if hd, ok := HyphaStorage[hyphaName]; ok { - hyphaData = hd - } else { - hyphaData = &HyphaData{} - HyphaStorage[hyphaName] = hyphaData - hyphae.IncrementCount() - } - if isText { - hyphaData.textPath = hyphaPartPath - } else { - // Notify the user about binary part collisions. It's a design decision to just use any of them, it's the user's fault that they have screwed up the folder structure, but the engine should at least let them know, right? - if hyphaData.binaryPath != "" { - log.Println("There is a file collision for binary part of a hypha:", hyphaData.binaryPath, "and", hyphaPartPath, "-- going on with the latter") - } - hyphaData.binaryPath = hyphaPartPath - } - } - - } -} - // FetchTextPart tries to read text file in the `d`. If there is no file, empty string is returned. func FetchTextPart(d *HyphaData) (string, error) { if d.textPath == "" { @@ -327,3 +286,45 @@ func setHeaderLinks() { } } } + +// Index finds all hypha files in the full `path` and saves them to HyphaStorage. This function is recursive. +func Index(path string) { + nodes, err := ioutil.ReadDir(path) + if err != nil { + log.Fatal(err) + } + + for _, node := range nodes { + // If this hypha looks like it can be a hypha path, go deeper. Do not touch the .git and static folders for they have an admnistrative importance! + if node.IsDir() && isCanonicalName(node.Name()) && node.Name() != ".git" && node.Name() != "static" { + Index(filepath.Join(path, node.Name())) + continue + } + + var ( + hyphaPartPath = filepath.Join(path, node.Name()) + hyphaName, isText, skip = mimetype.DataFromFilename(hyphaPartPath) + hyphaData *HyphaData + ) + if !skip { + // Reuse the entry for existing hyphae, create a new one for those that do not exist yet. + if hd, ok := HyphaStorage[hyphaName]; ok { + hyphaData = hd + } else { + hyphaData = &HyphaData{} + HyphaStorage[hyphaName] = hyphaData + hyphae.IncrementCount() + } + if isText { + hyphaData.textPath = hyphaPartPath + } else { + // Notify the user about binary part collisions. It's a design decision to just use any of them, it's the user's fault that they have screwed up the folder structure, but the engine should at least let them know, right? + if hyphaData.binaryPath != "" { + log.Println("There is a file collision for binary part of a hypha:", hyphaData.binaryPath, "and", hyphaPartPath, "-- going on with the latter") + } + hyphaData.binaryPath = hyphaPartPath + } + } + + } +} diff --git a/hyphae/hypha.go b/hyphae/hypha.go deleted file mode 100644 index d70cd1e..0000000 --- a/hyphae/hypha.go +++ /dev/null @@ -1,21 +0,0 @@ -package hyphae - -// TODO: do -import () - -type Hypha struct { - Name string - Exists bool - TextPath string - BinaryPath string - OutLinks []string - BackLinks []string -} - -// AddHypha adds a hypha named `name` with such `textPath` and `binaryPath`. Both paths can be empty. Does //not// check for hypha's existence beforehand. Count is handled. -func AddHypha(name, textPath, binaryPath string) { -} - -// DeleteHypha clears both paths and all out-links from the named hypha and marks it as non-existent. It does not actually delete it from the memdb. Count is handled. -func DeleteHypha(name string) { -} diff --git a/main.go b/main.go index c87c96e..f16eaa3 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ import ( "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/mimetype" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" @@ -64,7 +65,7 @@ func handlerList(w http.ResponseWriter, rq *http.Request) { u = user.FromRequest(rq) ) for hyphaName, data := range HyphaStorage { - tbody += templates.HyphaListRowHTML(hyphaName, ExtensionToMime(filepath.Ext(data.binaryPath)), data.binaryPath != "") + tbody += templates.HyphaListRowHTML(hyphaName, mimetype.FromExtension(filepath.Ext(data.binaryPath)), data.binaryPath != "") } util.HTTP200Page(w, base("List of pages", templates.HyphaListHTML(tbody, pageCount), u)) } diff --git a/mime.go b/mime.go deleted file mode 100644 index c16eebe..0000000 --- a/mime.go +++ /dev/null @@ -1,62 +0,0 @@ -package main - -import ( - "path/filepath" - "strings" -) - -func MimeToExtension(mime string) string { - mm := map[string]string{ - "application/octet-stream": "bin", - "image/jpeg": "jpg", - "image/gif": "gif", - "image/png": "png", - "image/webp": "webp", - "image/svg+xml": "svg", - "image/x-icon": "ico", - "application/ogg": "ogg", - "video/webm": "webm", - "audio/mp3": "mp3", - "video/mp4": "mp4", - } - if ext, ok := mm[mime]; ok { - return "." + ext - } - return ".bin" -} - -func ExtensionToMime(ext string) string { - mm := map[string]string{ - ".bin": "application/octet-stream", - ".jpg": "image/jpeg", - ".jpeg": "image/jpeg", - ".gif": "image/gif", - ".png": "image/png", - ".webp": "image/webp", - ".svg": "image/svg+xml", - ".ico": "image/x-icon", - ".ogg": "application/ogg", - ".webm": "video/webm", - ".mp3": "audio/mp3", - ".mp4": "video/mp4", - } - if mime, ok := mm[ext]; ok { - return mime - } - return "application/octet-stream" -} - -// DataFromFilename fetches all meta information from hypha content file with path `fullPath`. If it is not a content file, `skip` is true, and you are expected to ignore this file when indexing hyphae. `name` is name of the hypha to which this file relates. `isText` is true when the content file is text, false when is binary. `mimeId` is an integer representation of content type. Cast it to TextType if `isText == true`, cast it to BinaryType if `isText == false`. -func DataFromFilename(fullPath string) (name string, isText bool, skip bool) { - shortPath := strings.TrimPrefix(fullPath, WikiDir)[1:] - ext := filepath.Ext(shortPath) - name = CanonicalName(strings.TrimSuffix(shortPath, ext)) - switch ext { - case ".myco": - isText = true - case "", shortPath: - skip = true - } - - return -} diff --git a/mimetype/mime.go b/mimetype/mime.go new file mode 100644 index 0000000..7e18ca7 --- /dev/null +++ b/mimetype/mime.go @@ -0,0 +1,68 @@ +package mimetype + +import ( + "path/filepath" + "strings" + + "github.com/bouncepaw/mycorrhiza/util" +) + +// ToExtension returns dotted extension for given mime-type. +func ToExtension(mime string) string { + if ext, ok := mapMime2Ext[mime]; ok { + return "." + ext + } + return ".bin" +} + +// FromExtension returns mime-type for given extension. The extension must start with a dot. +func FromExtension(ext string) string { + if mime, ok := mapExt2Mime[ext]; ok { + return mime + } + return "application/octet-stream" +} + +// DataFromFilename fetches all meta information from hypha content file with path `fullPath`. If it is not a content file, `skip` is true, and you are expected to ignore this file when indexing hyphae. `name` is name of the hypha to which this file relates. `isText` is true when the content file is text, false when is binary. +func DataFromFilename(fullPath string) (name string, isText bool, skip bool) { + shortPath := util.ShorterPath(fullPath) + ext := filepath.Ext(shortPath) + name = util.CanonicalName(strings.TrimSuffix(shortPath, ext)) + switch ext { + case ".myco": + isText = true + case "", shortPath: + skip = true + } + + return +} + +var mapMime2Ext = map[string]string{ + "application/octet-stream": "bin", + "image/jpeg": "jpg", + "image/gif": "gif", + "image/png": "png", + "image/webp": "webp", + "image/svg+xml": "svg", + "image/x-icon": "ico", + "application/ogg": "ogg", + "video/webm": "webm", + "audio/mp3": "mp3", + "video/mp4": "mp4", +} + +var mapExt2Mime = map[string]string{ + ".bin": "application/octet-stream", + ".jpg": "image/jpeg", + ".jpeg": "image/jpeg", + ".gif": "image/gif", + ".png": "image/png", + ".webp": "image/webp", + ".svg": "image/svg+xml", + ".ico": "image/x-icon", + ".ogg": "application/ogg", + ".webm": "video/webm", + ".mp3": "audio/mp3", + ".mp4": "video/mp4", +} diff --git a/util/util.go b/util/util.go index c977992..acf0eec 100644 --- a/util/util.go +++ b/util/util.go @@ -4,6 +4,7 @@ import ( "crypto/rand" "encoding/hex" "net/http" + "regexp" "strings" ) @@ -65,3 +66,16 @@ func BeautifulName(uglyName string) string { } return strings.Title(strings.ReplaceAll(uglyName, "_", " ")) } + +// CanonicalName makes sure the `name` is canonical. A name is canonical if it is lowercase and all spaces are replaced with underscores. +func CanonicalName(name string) string { + return strings.ToLower(strings.ReplaceAll(name, " ", "_")) +} + +// HyphaPattern is a pattern which all hyphae must match. +var HyphaPattern = regexp.MustCompile(`[^?!:#@><*|"\'&%{}]+`) + +// IsCanonicalName checks if the `name` is canonical. +func IsCanonicalName(name string) bool { + return HyphaPattern.MatchString(name) +} From e3b4c75f799fed49d29d8149ce3720753b88d2c5 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Sat, 30 Jan 2021 23:21:50 +0500 Subject: [PATCH 08/53] Add /user-list page --- main.go | 7 + markup/paragraph.go | 12 ++ templates/stuff.qtpl | 43 ++++++ templates/stuff.qtpl.go | 307 +++++++++++++++++++++++++++++----------- user/users.go | 23 ++- 5 files changed, 300 insertions(+), 92 deletions(-) diff --git a/main.go b/main.go index f16eaa3..97ce3c3 100644 --- a/main.go +++ b/main.go @@ -160,6 +160,12 @@ func handlerAbout(w http.ResponseWriter, rq *http.Request) { w.Write([]byte(base("About "+util.SiteName, templates.AboutHTML(), user.FromRequest(rq)))) } +func handlerUserList(w http.ResponseWriter, rq *http.Request) { + w.Header().Set("Content-Type", "text/html;charset=utf-8") + w.WriteHeader(http.StatusOK) + w.Write([]byte(base("User list", templates.UserListHTML(), user.FromRequest(rq)))) +} + func handlerRobotsTxt(w http.ResponseWriter, rq *http.Request) { w.Header().Set("Content-Type", "text/plain") w.WriteHeader(http.StatusOK) @@ -193,6 +199,7 @@ func main() { http.HandleFunc("/update-header-links", handlerUpdateHeaderLinks) http.HandleFunc("/random", handlerRandom) http.HandleFunc("/about", handlerAbout) + http.HandleFunc("/user-list", handlerUserList) http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(WikiDir+"/static")))) http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, rq *http.Request) { http.ServeFile(w, rq, WikiDir+"/static/favicon.ico") diff --git a/markup/paragraph.go b/markup/paragraph.go index f506bb6..4bef250 100644 --- a/markup/paragraph.go +++ b/markup/paragraph.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "html" + "regexp" "strings" "unicode" ) @@ -103,6 +104,17 @@ func getTextNode(input *bytes.Buffer) string { return textNodeBuffer.String() } +var ( + dangerousSymbols = "<>{}|\\^[]`,()" + reLink = regexp.MustCompile(fmt.Sprintf(`[^[]{0,2}((https|http|gemini|gopher)://[^%[1]s]+)|(mailto:[^%[1]s]+)[^]]{0,2}`, dangerousSymbols)) +) + +// TODO: +func doRegexpStuff(input string) string { + reLink.ReplaceAllString(input, "[[$1]]") + return "" +} + func ParagraphToHtml(hyphaName, input string) string { var ( p = bytes.NewBufferString(input) diff --git a/templates/stuff.qtpl b/templates/stuff.qtpl index fce9908..f6f95b8 100644 --- a/templates/stuff.qtpl +++ b/templates/stuff.qtpl @@ -26,6 +26,49 @@ {% endfunc %} +{% func UserListHTML() %} +
+
+

List of users

+{% code +var ( + admins = make([]string, 0) + moderators = make([]string, 0) + editors = make([]string, 0) +) +for u := range user.YieldUsers() { + switch u.Group { + case "admin": + admins = append(admins, u.Name) + case "moderator": + moderators = append(moderators, u.Name) + case "editor", "trusted": + editors = append(editors, u.Name) + } +} +%} +
+

Admins

+
    {% for _, name := range admins %} +
  1. {%s name %}
    2. + {% endfor %}
+
+
+

Moderators

+
    {% for _, name := range moderators %} +
  1. {%s name %}
    2. + {% endfor %}
+
+
+

Editors

+
    {% for _, name := range editors %} +
  1. {%s name %}
    2. + {% endfor %}
+
+
+
+{% endfunc %} + {% func HyphaListHTML(tbody string, pageCount int) %}
diff --git a/templates/stuff.qtpl.go b/templates/stuff.qtpl.go index 0bf3bf1..d6efabd 100644 --- a/templates/stuff.qtpl.go +++ b/templates/stuff.qtpl.go @@ -114,16 +114,153 @@ func BaseHTML(title, body string, u *user.User, headElements ...string) string { } //line templates/stuff.qtpl:29 -func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) { +func StreamUserListHTML(qw422016 *qt422016.Writer) { //line templates/stuff.qtpl:29 qw422016.N().S(`
+
+

List of users

+`) +//line templates/stuff.qtpl:34 + var ( + admins = make([]string, 0) + moderators = make([]string, 0) + editors = make([]string, 0) + ) + for u := range user.YieldUsers() { + switch u.Group { + case "admin": + admins = append(admins, u.Name) + case "moderator": + moderators = append(moderators, u.Name) + case "editor", "trusted": + editors = append(editors, u.Name) + } + } + +//line templates/stuff.qtpl:49 + qw422016.N().S(` +
+

Admins

+
    `) +//line templates/stuff.qtpl:52 + for _, name := range admins { +//line templates/stuff.qtpl:52 + qw422016.N().S(` +
  1. `) +//line templates/stuff.qtpl:53 + qw422016.E().S(name) +//line templates/stuff.qtpl:53 + qw422016.N().S(`
    2. + `) +//line templates/stuff.qtpl:54 + } +//line templates/stuff.qtpl:54 + qw422016.N().S(`
+
+
+

Moderators

+
    `) +//line templates/stuff.qtpl:58 + for _, name := range moderators { +//line templates/stuff.qtpl:58 + qw422016.N().S(` +
  1. `) +//line templates/stuff.qtpl:59 + qw422016.E().S(name) +//line templates/stuff.qtpl:59 + qw422016.N().S(`
    2. + `) +//line templates/stuff.qtpl:60 + } +//line templates/stuff.qtpl:60 + qw422016.N().S(`
+
+
+

Editors

+
    `) +//line templates/stuff.qtpl:64 + for _, name := range editors { +//line templates/stuff.qtpl:64 + qw422016.N().S(` +
  1. `) +//line templates/stuff.qtpl:65 + qw422016.E().S(name) +//line templates/stuff.qtpl:65 + qw422016.N().S(`
    2. + `) +//line templates/stuff.qtpl:66 + } +//line templates/stuff.qtpl:66 + qw422016.N().S(`
+
+
+
+`) +//line templates/stuff.qtpl:70 +} + +//line templates/stuff.qtpl:70 +func WriteUserListHTML(qq422016 qtio422016.Writer) { +//line templates/stuff.qtpl:70 + qw422016 := qt422016.AcquireWriter(qq422016) +//line templates/stuff.qtpl:70 + StreamUserListHTML(qw422016) +//line templates/stuff.qtpl:70 + qt422016.ReleaseWriter(qw422016) +//line templates/stuff.qtpl:70 +} + +//line templates/stuff.qtpl:70 +func UserListHTML() string { +//line templates/stuff.qtpl:70 + qb422016 := qt422016.AcquireByteBuffer() +//line templates/stuff.qtpl:70 + WriteUserListHTML(qb422016) +//line templates/stuff.qtpl:70 + qs422016 := string(qb422016.B) +//line templates/stuff.qtpl:70 + qt422016.ReleaseByteBuffer(qb422016) +//line templates/stuff.qtpl:70 + return qs422016 +//line templates/stuff.qtpl:70 +} + +//line templates/stuff.qtpl:72 +func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) { +//line templates/stuff.qtpl:72 + qw422016.N().S(` +

List of hyphae

This wiki has `) -//line templates/stuff.qtpl:33 +//line templates/stuff.qtpl:76 qw422016.N().D(pageCount) -//line templates/stuff.qtpl:33 +//line templates/stuff.qtpl:76 qw422016.N().S(` hyphae.

@@ -134,206 +271,206 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) `) -//line templates/stuff.qtpl:42 +//line templates/stuff.qtpl:85 qw422016.N().S(tbody) -//line templates/stuff.qtpl:42 +//line templates/stuff.qtpl:85 qw422016.N().S(`
`) -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 } -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) { -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 StreamHyphaListHTML(qw422016, tbody, pageCount) -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 } -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 func HyphaListHTML(tbody string, pageCount int) string { -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 WriteHyphaListHTML(qb422016, tbody, pageCount) -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 return qs422016 -//line templates/stuff.qtpl:47 +//line templates/stuff.qtpl:90 } -//line templates/stuff.qtpl:49 +//line templates/stuff.qtpl:92 func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line templates/stuff.qtpl:49 +//line templates/stuff.qtpl:92 qw422016.N().S(` `) -//line templates/stuff.qtpl:51 +//line templates/stuff.qtpl:94 qw422016.E().S(hyphaName) -//line templates/stuff.qtpl:51 +//line templates/stuff.qtpl:94 qw422016.N().S(` `) -//line templates/stuff.qtpl:52 +//line templates/stuff.qtpl:95 if binaryPresent { -//line templates/stuff.qtpl:52 +//line templates/stuff.qtpl:95 qw422016.N().S(` `) -//line templates/stuff.qtpl:53 +//line templates/stuff.qtpl:96 qw422016.E().S(binaryMime) -//line templates/stuff.qtpl:53 +//line templates/stuff.qtpl:96 qw422016.N().S(` `) -//line templates/stuff.qtpl:54 +//line templates/stuff.qtpl:97 } else { -//line templates/stuff.qtpl:54 +//line templates/stuff.qtpl:97 qw422016.N().S(` `) -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:99 } -//line templates/stuff.qtpl:56 +//line templates/stuff.qtpl:99 qw422016.N().S(` `) -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 } -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent) -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 } -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string { -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent) -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 return qs422016 -//line templates/stuff.qtpl:58 +//line templates/stuff.qtpl:101 } -//line templates/stuff.qtpl:60 +//line templates/stuff.qtpl:103 func StreamAboutHTML(qw422016 *qt422016.Writer) { -//line templates/stuff.qtpl:60 +//line templates/stuff.qtpl:103 qw422016.N().S(`

About `) -//line templates/stuff.qtpl:64 +//line templates/stuff.qtpl:107 qw422016.E().S(util.SiteName) -//line templates/stuff.qtpl:64 +//line templates/stuff.qtpl:107 qw422016.N().S(`

See /list for information about hyphae on this wiki.

`) -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 } -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 func WriteAboutHTML(qq422016 qtio422016.Writer) { -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 StreamAboutHTML(qw422016) -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 } -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 func AboutHTML() string { -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 WriteAboutHTML(qb422016) -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 return qs422016 -//line templates/stuff.qtpl:82 +//line templates/stuff.qtpl:125 } diff --git a/user/users.go b/user/users.go index aa5bb4b..847d130 100644 --- a/user/users.go +++ b/user/users.go @@ -8,16 +8,25 @@ var AuthUsed bool var users sync.Map var tokens sync.Map +func YieldUsers() chan *User { + ch := make(chan *User) + go func(ch chan *User) { + users.Range(func(_, v interface{}) bool { + ch <- v.(*User) + return true + }) + close(ch) + }(ch) + return ch +} + func ListUsersWithGroup(group string) []string { usersWithTheGroup := []string{} - users.Range(func(_, v interface{}) bool { - userobj := v.(*User) - - if userobj.Group == group { - usersWithTheGroup = append(usersWithTheGroup, userobj.Name) + for u := range YieldUsers() { + if u.Group == group { + usersWithTheGroup = append(usersWithTheGroup, u.Name) } - return true - }) + } return usersWithTheGroup } From 92dd19316cb98e865c95995fe15a447157a839d4 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Sat, 30 Jan 2021 23:29:56 +0500 Subject: [PATCH 09/53] Make /hypha/ a synonym for /page/ --- http_readers.go | 9 +++++---- main.go | 2 +- name.go | 14 +++++++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/http_readers.go b/http_readers.go index 9cd4c69..10676a8 100644 --- a/http_readers.go +++ b/http_readers.go @@ -19,7 +19,8 @@ import ( ) func init() { - http.HandleFunc("/page/", handlerPage) + http.HandleFunc("/page/", handlerHypha) + http.HandleFunc("/hypha/", handlerHypha) http.HandleFunc("/text/", handlerText) http.HandleFunc("/binary/", handlerBinary) http.HandleFunc("/rev/", handlerRevision) @@ -77,11 +78,11 @@ func handlerBinary(w http.ResponseWriter, rq *http.Request) { } } -// handlerPage is the main hypha action that displays the hypha and the binary upload form along with some navigation. -func handlerPage(w http.ResponseWriter, rq *http.Request) { +// handlerHypha is the main hypha action that displays the hypha and the binary upload form along with some navigation. +func handlerHypha(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var ( - hyphaName = HyphaNameFromRq(rq, "page") + hyphaName = HyphaNameFromRq(rq, "page", "hypha") data, hyphaExists = HyphaStorage[hyphaName] hasAmnt = hyphaExists && data.binaryPath != "" contents string diff --git a/main.go b/main.go index 97ce3c3..068f706 100644 --- a/main.go +++ b/main.go @@ -190,7 +190,7 @@ func main() { history.Start(WikiDir) setHeaderLinks() - // See http_readers.go for /page/, /text/, /binary/ + // See http_readers.go for /page/, /hypha/, /text/, /binary/ // See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/, /unattach-ask/, /unattach-confirm/ // See http_auth.go for /login, /login-data, /logout, /logout-confirm // See http_history.go for /history/, /recent-changes diff --git a/name.go b/name.go index 2a859d8..57c860a 100644 --- a/name.go +++ b/name.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "log" "net/http" "strings" @@ -46,7 +47,14 @@ func naviTitle(canonicalName string) string { return html + "" } -// HyphaNameFromRq extracts hypha name from http request. You have to also pass the action which is embedded in the url. For url /page/hypha, the action would be "page". -func HyphaNameFromRq(rq *http.Request, action string) string { - return CanonicalName(strings.TrimPrefix(rq.URL.Path, "/"+action+"/")) +// HyphaNameFromRq extracts hypha name from http request. You have to also pass the action which is embedded in the url or several actions. For url /hypha/hypha, the action would be "hypha". +func HyphaNameFromRq(rq *http.Request, actions ...string) string { + p := rq.URL.Path + for _, action := range actions { + if strings.HasPrefix(p, "/"+action+"/") { + return util.CanonicalName(strings.TrimPrefix(p, "/"+action+"/")) + } + } + log.Fatal("HyphaNameFromRq: no matching action passed") + return "" } From dd98ae492bfd7701c8a87356c39ff29539dfadcc Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Sun, 31 Jan 2021 00:25:18 +0500 Subject: [PATCH 10/53] Start moving universal link-related stuff to a separate module --- link/link.go | 107 +++++++++++++++++++++++++++++++++++++++++++++++++ markup/link.go | 39 ++++-------------- 2 files changed, 114 insertions(+), 32 deletions(-) create mode 100644 link/link.go diff --git a/link/link.go b/link/link.go new file mode 100644 index 0000000..3f9b9c4 --- /dev/null +++ b/link/link.go @@ -0,0 +1,107 @@ +package link + +import ( + "fmt" + "path" + "strings" + + "github.com/bouncepaw/mycorrhiza/util" +) + +// LinkType tells what type the given link is. +type LinkType int + +const ( + LinkInavild LinkType = iota + // LinkLocalRoot is a link like "/list", "/user-list", etc. + LinkLocalRoot + // LinkLocalHypha is a link like "test", "../test", etc. + LinkLocalHypha + // LinkExternal is an external link with specified protocol. + LinkExternal + // LinkInterwiki is currently unused. + LinkInterwiki +) + +// Link is an abstraction for universal representation of links, be they links in mycomarkup links or whatever. +type Link struct { + // Address is what the link points to. + Address string + // Display is what gets nested into the tag. + Display string + Kind LinkType + DestinationUnknown bool + + Protocol string + // How the link address looked originally in source text. + SrcAddress string + // How the link display text looked originally in source text. May be empty. + SrcDisplay string + // RelativeTo is hypha name to which the link is relative to. + RelativeTo string +} + +// Classes returns CSS class string for given link. +func (l *Link) Classes() string { + if l.Kind == LinkExternal { + return fmt.Sprintf("wikilink wikilink_external wikilink_%s", l.Protocol) + } + classes := "wikilink wikilink_internal" + if l.DestinationUnknown { + classes += " wikilink_new" + } + return classes +} + +// Href returns content for the href attrubite. You should always use it. +func (l *Link) Href() string { + switch l.Kind { + case LinkExternal, LinkLocalRoot: + return l.Address + default: + return "/hypha/" + l.Address + } +} + +// From returns a Link object given these `address` and `display` on relative to given `hyphaName`. +func From(address, display, hyphaName string) *Link { + link := Link{ + SrcAddress: address, + SrcDisplay: display, + RelativeTo: hyphaName, + } + + if display == "" { + link.Display = address + } else { + link.Display = strings.TrimSpace(display) + } + + switch { + case strings.ContainsRune(address, ':'): + pos := strings.IndexRune(address, ':') + link.Protocol = address[:pos] + link.Kind = LinkExternal + + if display == "" { + link.Display = address[pos+1:] + if strings.HasPrefix(link.Display, "//") && len(link.Display) > 2 { + link.Display = link.Display[2:] + } + } + link.Address = address + case strings.HasPrefix(address, "/"): + link.Address = address + link.Kind = LinkLocalRoot + case strings.HasPrefix(address, "./"): + link.Kind = LinkLocalHypha + link.Address = util.CanonicalName(path.Join(hyphaName, address[2:])) + case strings.HasPrefix(address, "../"): + link.Kind = LinkLocalHypha + link.Address = util.CanonicalName(path.Join(path.Dir(hyphaName), address[3:])) + default: + link.Address = util.CanonicalName(address) + } + + return &link +} diff --git a/markup/link.go b/markup/link.go index af3e51c..9243fca 100644 --- a/markup/link.go +++ b/markup/link.go @@ -1,47 +1,22 @@ package markup import ( - "fmt" - "path" "strings" + + "github.com/bouncepaw/mycorrhiza/link" ) // LinkParts determines what href, text and class should resulting have based on mycomarkup's addr, display and hypha name. // // => addr display // [[addr|display]] +// TODO: deprecate func LinkParts(addr, display, hyphaName string) (href, text, class string) { - if display == "" { - text = addr - } else { - text = strings.TrimSpace(display) + l := link.From(addr, display, hyphaName) + if l.Kind == link.LinkLocalHypha && !HyphaExists(l.Address) { + l.DestinationUnknown = true } - class = "wikilink wikilink_internal" - - switch { - case strings.ContainsRune(addr, ':'): - pos := strings.IndexRune(addr, ':') - destination := addr[:pos] - if display == "" { - text = addr[pos+1:] - if strings.HasPrefix(text, "//") && len(text) > 2 { - text = text[2:] - } - } - return addr, text, fmt.Sprintf("wikilink wikilink_external wikilink_%s", destination) - case strings.HasPrefix(addr, "/"): - return addr, text, class - case strings.HasPrefix(addr, "./"): - hyphaName = canonicalName(path.Join(hyphaName, addr[2:])) - case strings.HasPrefix(addr, "../"): - hyphaName = canonicalName(path.Join(path.Dir(hyphaName), addr[3:])) - default: - hyphaName = canonicalName(addr) - } - if !HyphaExists(hyphaName) { - class += " wikilink_new" - } - return "/page/" + hyphaName, text, class + return l.Href(), l.Display, l.Classes() } // Parse markup line starting with "=>" according to wikilink rules. From b4e866446e961dbfaf996026966b44ff65c3696d Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Sun, 31 Jan 2021 21:39:08 +0500 Subject: [PATCH 11/53] Make img galleries use the new link abstraction --- link/link.go | 20 ++++++++- markup/img.go | 99 +++++++++----------------------------------- markup/img_entry.go | 45 ++++++++++++++++++++ markup/mycomarkup.go | 15 +++++-- 4 files changed, 94 insertions(+), 85 deletions(-) create mode 100644 markup/img_entry.go diff --git a/link/link.go b/link/link.go index 3f9b9c4..6c7e7b8 100644 --- a/link/link.go +++ b/link/link.go @@ -41,6 +41,13 @@ type Link struct { RelativeTo string } +// DoubtExistence sets DestinationUnknown to true if the link is local hypha link. +func (l *Link) DoubtExistence() { + if l.Kind == LinkLocalHypha { + l.DestinationUnknown = true + } +} + // Classes returns CSS class string for given link. func (l *Link) Classes() string { if l.Kind == LinkExternal { @@ -53,7 +60,7 @@ func (l *Link) Classes() string { return classes } -// Href returns content for the href attrubite. You should always use it. +// Href returns content for the href attrubite for hyperlink. You should always use it. func (l *Link) Href() string { switch l.Kind { case LinkExternal, LinkLocalRoot: @@ -63,6 +70,16 @@ func (l *Link) Href() string { } } +// ImgSrc returns content for src attribute of img tag. Used with `img{}`. +func (l *Link) ImgSrc() string { + switch l.Kind { + case LinkExternal, LinkLocalRoot: + return l.Address + default: + return "/binary/" + l.Address + } +} + // From returns a Link object given these `address` and `display` on relative to given `hyphaName`. func From(address, display, hyphaName string) *Link { link := Link{ @@ -100,6 +117,7 @@ func From(address, display, hyphaName string) *Link { link.Kind = LinkLocalHypha link.Address = util.CanonicalName(path.Join(path.Dir(hyphaName), address[3:])) default: + link.Kind = LinkLocalHypha link.Address = util.CanonicalName(address) } diff --git a/markup/img.go b/markup/img.go index 99c919b..b1a59c1 100644 --- a/markup/img.go +++ b/markup/img.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/bouncepaw/mycorrhiza/util" + "github.com/bouncepaw/mycorrhiza/link" ) var imgRe = regexp.MustCompile(`^img\s+{`) @@ -14,44 +14,6 @@ func MatchesImg(line string) bool { return imgRe.MatchString(line) } -type imgEntry struct { - trimmedPath string - path strings.Builder - sizeW strings.Builder - sizeH strings.Builder - desc strings.Builder -} - -func (entry *imgEntry) descriptionAsHtml(hyphaName string) (html string) { - if entry.desc.Len() == 0 { - return "" - } - lines := strings.Split(entry.desc.String(), "\n") - for _, line := range lines { - if line = strings.TrimSpace(line); line != "" { - if html != "" { - html += `
` - } - html += ParagraphToHtml(hyphaName, line) - } - } - return `
` + html + `
` -} - -func (entry *imgEntry) sizeWAsAttr() string { - if entry.sizeW.Len() == 0 { - return "" - } - return ` width="` + entry.sizeW.String() + `"` -} - -func (entry *imgEntry) sizeHAsAttr() string { - if entry.sizeH.Len() == 0 { - return "" - } - return ` height="` + entry.sizeH.String() + `"` -} - type imgState int const ( @@ -71,6 +33,8 @@ type Img struct { func (img *Img) pushEntry() { if strings.TrimSpace(img.currEntry.path.String()) != "" { + img.currEntry.srclink = link.From(img.currEntry.path.String(), "", img.hyphaName) + img.currEntry.srclink.DoubtExistence() img.entries = append(img.entries, img.currEntry) img.currEntry = imgEntry{} img.currEntry.path.Reset() @@ -177,23 +141,6 @@ func ImgFromFirstLine(line, hyphaName string) (img *Img, shouldGoBackToNormal bo return img, img.Process(line) } -func (img *Img) binaryPathFor(path string) string { - path = strings.TrimSpace(path) - if strings.IndexRune(path, ':') != -1 || strings.IndexRune(path, '/') == 0 { - return path - } else { - return "/binary/" + xclCanonicalName(img.hyphaName, path) - } -} - -func (img *Img) ogBinaryPathFor(path string) string { - path = img.binaryPathFor(path) - if strings.HasPrefix(path, "/binary/") { - return util.URL + path - } - return path -} - func (img *Img) pagePathFor(path string) string { path = strings.TrimSpace(path) if strings.IndexRune(path, ':') != -1 || strings.IndexRune(path, '/') == 0 { @@ -214,30 +161,18 @@ func parseDimensions(dimensions string) (sizeW, sizeH string) { return } -func (img *Img) checkLinks() map[string]bool { - m := make(map[string]bool) - for i, entry := range img.entries { - // Also trim them for later use - entry.trimmedPath = strings.TrimSpace(entry.path.String()) - isAbsoluteUrl := strings.ContainsRune(entry.trimmedPath, ':') - if !isAbsoluteUrl { - entry.trimmedPath = canonicalName(entry.trimmedPath) - } - img.entries[i] = entry - m[entry.trimmedPath] = isAbsoluteUrl - } - HyphaIterate(func(hyphaName string) { +func (img *Img) markExistenceOfSrcLinks() { + HyphaIterate(func(hn string) { for _, entry := range img.entries { - if hyphaName == xclCanonicalName(img.hyphaName, entry.trimmedPath) { - m[entry.trimmedPath] = true + if hn == entry.srclink.Address { + entry.srclink.DestinationUnknown = false } } }) - return m } func (img *Img) ToHtml() (html string) { - linkAvailabilityMap := img.checkLinks() + img.markExistenceOfSrcLinks() isOneImageOnly := len(img.entries) == 1 && img.entries[0].desc.Len() == 0 if isOneImageOnly { html += `
` @@ -247,15 +182,19 @@ func (img *Img) ToHtml() (html string) { for _, entry := range img.entries { html += `
` - // If is existing hypha or an external path - if linkAvailabilityMap[entry.trimmedPath] { + if entry.srclink.DestinationUnknown { + html += fmt.Sprintf( + `Hypha %s does not exist`, + entry.srclink.Classes(), + entry.srclink.Href(), + entry.srclink.Address) + } else { html += fmt.Sprintf( ``, - img.pagePathFor(entry.trimmedPath), - img.binaryPathFor(entry.trimmedPath), - entry.sizeWAsAttr(), entry.sizeHAsAttr()) - } else { // If is a non-existent hypha - html += fmt.Sprintf(`Hypha %s does not exist`, img.pagePathFor(entry.trimmedPath), entry.trimmedPath) + entry.srclink.Href(), + entry.srclink.ImgSrc(), + entry.sizeWAsAttr(), + entry.sizeHAsAttr()) } html += entry.descriptionAsHtml(img.hyphaName) html += `
` diff --git a/markup/img_entry.go b/markup/img_entry.go new file mode 100644 index 0000000..acba2fd --- /dev/null +++ b/markup/img_entry.go @@ -0,0 +1,45 @@ +package markup + +import ( + "strings" + + "github.com/bouncepaw/mycorrhiza/link" +) + +type imgEntry struct { + srclink *link.Link + path strings.Builder + sizeW strings.Builder + sizeH strings.Builder + desc strings.Builder +} + +func (entry *imgEntry) descriptionAsHtml(hyphaName string) (html string) { + if entry.desc.Len() == 0 { + return "" + } + lines := strings.Split(entry.desc.String(), "\n") + for _, line := range lines { + if line = strings.TrimSpace(line); line != "" { + if html != "" { + html += `
` + } + html += ParagraphToHtml(hyphaName, line) + } + } + return `
` + html + `
` +} + +func (entry *imgEntry) sizeWAsAttr() string { + if entry.sizeW.Len() == 0 { + return "" + } + return ` width="` + entry.sizeW.String() + `"` +} + +func (entry *imgEntry) sizeHAsAttr() string { + if entry.sizeH.Len() == 0 { + return "" + } + return ` height="` + entry.sizeH.String() + `"` +} diff --git a/markup/mycomarkup.go b/markup/mycomarkup.go index 656ca28..f15c07b 100644 --- a/markup/mycomarkup.go +++ b/markup/mycomarkup.go @@ -7,6 +7,7 @@ import ( "regexp" "strings" + "github.com/bouncepaw/mycorrhiza/link" "github.com/bouncepaw/mycorrhiza/util" ) @@ -57,15 +58,16 @@ func (md *MycoDoc) OpenGraphHTML() string { ogTag("title", md.hyphaName), ogTag("type", "article"), ogTag("image", md.firstImageURL), - ogTag("url", util.URL+"/page/"+md.hyphaName), + ogTag("url", util.URL+"/hypha/"+md.hyphaName), ogTag("determiner", ""), ogTag("description", htmlTagRe.ReplaceAllString(md.description, "")), }, "\n") } func (md *MycoDoc) ogFillVars() *MycoDoc { + md.firstImageURL = util.URL + "/favicon.ico" foundDesc := false - md.firstImageURL = HyphaImageForOG(md.hyphaName) + foundImg := false for _, line := range md.ast { switch v := line.contents.(type) { case string: @@ -74,8 +76,12 @@ func (md *MycoDoc) ogFillVars() *MycoDoc { foundDesc = true } case Img: - if len(v.entries) > 0 { - md.firstImageURL = v.entries[0].path.String() + if !foundImg && len(v.entries) > 0 { + md.firstImageURL = v.entries[0].srclink.ImgSrc() + if v.entries[0].srclink.Kind != link.LinkExternal { + md.firstImageURL = util.URL + md.firstImageURL + } + foundImg = true } } } @@ -153,6 +159,7 @@ func crawl(name, content string) []string { preAcc += html.EscapeString(line) } } + break } return []string{} From 9fbcab210ab4586fac869d9ecb3391cefeff42a3 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Sun, 31 Jan 2021 21:50:44 +0500 Subject: [PATCH 12/53] Make autolinks ignore several characters --- markup/paragraph.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/markup/paragraph.go b/markup/paragraph.go index 4bef250..a576fee 100644 --- a/markup/paragraph.go +++ b/markup/paragraph.go @@ -4,7 +4,6 @@ import ( "bytes" "fmt" "html" - "regexp" "strings" "unicode" ) @@ -56,7 +55,8 @@ func getLinkNode(input *bytes.Buffer, hyphaName string, isBracketedLink bool) st } else if isBracketedLink && b == ']' && bytes.HasPrefix(input.Bytes(), []byte{']'}) { input.Next(1) break - } else if !isBracketedLink && unicode.IsSpace(rune(b)) { + } else if !isBracketedLink && (unicode.IsSpace(rune(b)) || strings.ContainsRune("<>{}|\\^[]`,()", rune(b))) { + input.UnreadByte() break } else { currBuf.WriteByte(b) @@ -104,17 +104,6 @@ func getTextNode(input *bytes.Buffer) string { return textNodeBuffer.String() } -var ( - dangerousSymbols = "<>{}|\\^[]`,()" - reLink = regexp.MustCompile(fmt.Sprintf(`[^[]{0,2}((https|http|gemini|gopher)://[^%[1]s]+)|(mailto:[^%[1]s]+)[^]]{0,2}`, dangerousSymbols)) -) - -// TODO: -func doRegexpStuff(input string) string { - reLink.ReplaceAllString(input, "[[$1]]") - return "" -} - func ParagraphToHtml(hyphaName, input string) string { var ( p = bytes.NewBufferString(input) From 1604278819e45591f15c890c411af2e1003f230e Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Tue, 2 Feb 2021 21:47:34 +0500 Subject: [PATCH 13/53] Display beautiful names in on /hypha/ and /rev/ --- http_readers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http_readers.go b/http_readers.go index 10676a8..cb1450b 100644 --- a/http_readers.go +++ b/http_readers.go @@ -53,7 +53,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { ) w.Header().Set("Content-Type", "text/html;charset=utf-8") w.WriteHeader(http.StatusOK) - w.Write([]byte(base(hyphaName, page, u))) + w.Write([]byte(base(util.BeautifulName(hyphaName), page, u))) } // handlerText serves raw source text of the hypha. @@ -104,7 +104,7 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { treeHTML, prevHypha, nextHypha := tree.Tree(hyphaName, IterateHyphaNamesWith) util.HTTP200Page(w, templates.BaseHTML( - hyphaName, + util.BeautifulName(hyphaName), templates.PageHTML(rq, hyphaName, naviTitle(hyphaName), contents, From dcd12a4a6d22ca4af4e21e35ad4353b983d72511 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Tue, 2 Feb 2021 22:28:26 +0500 Subject: [PATCH 14/53] Allow adding styles in addition to default to /static/custom.css --- main.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 068f706..cf4559f 100644 --- a/main.go +++ b/main.go @@ -119,12 +119,15 @@ func handlerRandom(w http.ResponseWriter, rq *http.Request) { func handlerStyle(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) - if _, err := os.Stat(WikiDir + "/static/common.css"); err == nil { - http.ServeFile(w, rq, WikiDir+"/static/common.css") + if _, err := os.Stat(util.WikiDir + "/static/common.css"); err == nil { + http.ServeFile(w, rq, util.WikiDir+"/static/common.css") } else { w.Header().Set("Content-Type", "text/css;charset=utf-8") w.Write([]byte(templates.DefaultCSS())) } + if bytes, err := ioutil.ReadFile(util.WikiDir + "/static/custom.css"); err == nil { + w.Write(bytes) + } } func handlerIcon(w http.ResponseWriter, rq *http.Request) { From 86aa82bc502c99109cbc68aa2b62173a97045524 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Thu, 4 Feb 2021 20:47:09 +0500 Subject: [PATCH 15/53] Drop-in replace main.hyphaData with hyphae.Hypha --- http_mutators.go | 4 ++-- http_readers.go | 20 +++++++++--------- hypha.go | 53 +++++++++++++++++++++++------------------------- hyphae/hyphae.go | 43 +++++++++++++++++++++++++++++++++++++++ main.go | 2 +- 5 files changed, 81 insertions(+), 41 deletions(-) create mode 100644 hyphae/hyphae.go diff --git a/http_mutators.go b/http_mutators.go index ca48d07..ea37b9c 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -30,7 +30,7 @@ func handlerUnattachAsk(w http.ResponseWriter, rq *http.Request) { var ( hyphaName = HyphaNameFromRq(rq, "unattach-ask") hd, isOld = HyphaStorage[hyphaName] - hasAmnt = hd != nil && hd.binaryPath != "" + hasAmnt = hd != nil && hd.BinaryPath != "" ) if !hasAmnt { HttpErr(w, http.StatusBadRequest, hyphaName, "Cannot unattach", "No attachment attached yet, therefore you cannot unattach") @@ -49,7 +49,7 @@ func handlerUnattachConfirm(w http.ResponseWriter, rq *http.Request) { var ( hyphaName = HyphaNameFromRq(rq, "unattach-confirm") hyphaData, isOld = HyphaStorage[hyphaName] - hasAmnt = hyphaData != nil && hyphaData.binaryPath != "" + hasAmnt = hyphaData != nil && hyphaData.BinaryPath != "" u = user.FromRequest(rq) ) if !u.CanProceed("unattach-confirm") { diff --git a/http_readers.go b/http_readers.go index cb1450b..08a5057 100644 --- a/http_readers.go +++ b/http_readers.go @@ -35,8 +35,8 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { revHash = shorterUrl[:firstSlashIndex] hyphaName = CanonicalName(shorterUrl[firstSlashIndex+1:]) contents = fmt.Sprintf(`<p>This hypha had no text at this revision.</p>`) - textPath = hyphaName + ".myco" - textContents, err = history.FileAtRevision(textPath, revHash) + TextPath = hyphaName + ".myco" + textContents, err = history.FileAtRevision(TextPath, revHash) u = user.FromRequest(rq) ) if err == nil { @@ -61,9 +61,9 @@ func handlerText(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) hyphaName := HyphaNameFromRq(rq, "text") if data, ok := HyphaStorage[hyphaName]; ok { - log.Println("Serving", data.textPath) + log.Println("Serving", data.TextPath) w.Header().Set("Content-Type", "text/plain; charset=utf-8") - http.ServeFile(w, rq, data.textPath) + http.ServeFile(w, rq, data.TextPath) } } @@ -72,9 +72,9 @@ func handlerBinary(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) hyphaName := HyphaNameFromRq(rq, "binary") if data, ok := HyphaStorage[hyphaName]; ok { - log.Println("Serving", data.binaryPath) - w.Header().Set("Content-Type", mimetype.FromExtension(filepath.Ext(data.binaryPath))) - http.ServeFile(w, rq, data.binaryPath) + log.Println("Serving", data.BinaryPath) + w.Header().Set("Content-Type", mimetype.FromExtension(filepath.Ext(data.BinaryPath))) + http.ServeFile(w, rq, data.BinaryPath) } } @@ -84,14 +84,14 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { var ( hyphaName = HyphaNameFromRq(rq, "page", "hypha") data, hyphaExists = HyphaStorage[hyphaName] - hasAmnt = hyphaExists && data.binaryPath != "" + hasAmnt = hyphaExists && data.BinaryPath != "" contents string openGraph string u = user.FromRequest(rq) ) if hyphaExists { - fileContentsT, errT := ioutil.ReadFile(data.textPath) - _, errB := os.Stat(data.binaryPath) + fileContentsT, errT := ioutil.ReadFile(data.TextPath) + _, errB := os.Stat(data.BinaryPath) if errT == nil { md := markup.Doc(hyphaName, string(fileContentsT)) contents = md.AsHTML() diff --git a/hypha.go b/hypha.go index 82fe103..acfa736 100644 --- a/hypha.go +++ b/hypha.go @@ -26,7 +26,7 @@ func init() { markup.HyphaAccess = func(hyphaName string) (rawText, binaryBlock string, err error) { if hyphaData, ok := HyphaStorage[hyphaName]; ok { rawText, err = FetchTextPart(hyphaData) - if hyphaData.binaryPath != "" { + if hyphaData.BinaryPath != "" { binaryBlock = binaryHtmlBlock(hyphaName, hyphaData) } } else { @@ -36,7 +36,7 @@ func init() { } markup.HyphaIterate = IterateHyphaNamesWith markup.HyphaImageForOG = func(hyphaName string) string { - if hd, isOld := GetHyphaData(hyphaName); isOld && hd.binaryPath != "" { + if hd, isOld := GetHyphaData(hyphaName); isOld && hd.BinaryPath != "" { return util.URL + "/binary/" + hyphaName } return util.URL + "/favicon.ico" @@ -53,20 +53,17 @@ func GetHyphaData(hyphaName string) (hyphaData *HyphaData, isOld bool) { } // HyphaData represents a hypha's meta information: binary and text parts rooted paths and content types. -type HyphaData struct { - textPath string - binaryPath string -} +type HyphaData hyphae.Hypha // uploadHelp is a helper function for UploadText and UploadBinary func uploadHelp(hop *history.HistoryOp, hyphaName, ext string, data []byte, u *user.User) *history.HistoryOp { var ( hyphaData, isOld = GetHyphaData(hyphaName) fullPath = filepath.Join(WikiDir, hyphaName+ext) - originalFullPath = &hyphaData.textPath + originalFullPath = &hyphaData.TextPath ) if hop.Type == history.TypeEditBinary { - originalFullPath = &hyphaData.binaryPath + originalFullPath = &hyphaData.BinaryPath } if err := os.MkdirAll(filepath.Dir(fullPath), 0777); err != nil { @@ -121,7 +118,7 @@ func UploadBinary(hyphaName, mime string, file multipart.File, u *user.User) *hi // DeleteHypha deletes hypha and makes a history record about that. func (hd *HyphaData) DeleteHypha(hyphaName string, u *user.User) *history.HistoryOp { hop := history.Operation(history.TypeDeleteHypha). - WithFilesRemoved(hd.textPath, hd.binaryPath). + WithFilesRemoved(hd.TextPath, hd.BinaryPath). WithMsg(fmt.Sprintf("Delete ‘%s’", hyphaName)). WithUser(u). Apply() @@ -135,18 +132,18 @@ func (hd *HyphaData) DeleteHypha(hyphaName string, u *user.User) *history.Histor // UnattachHypha unattaches hypha and makes a history record about that. func (hd *HyphaData) UnattachHypha(hyphaName string, u *user.User) *history.HistoryOp { hop := history.Operation(history.TypeUnattachHypha). - WithFilesRemoved(hd.binaryPath). + WithFilesRemoved(hd.BinaryPath). WithMsg(fmt.Sprintf("Unattach ‘%s’", hyphaName)). WithUser(u). Apply() if len(hop.Errs) == 0 { hd, ok := HyphaStorage[hyphaName] if ok { - if hd.binaryPath != "" { - hd.binaryPath = "" + if hd.BinaryPath != "" { + hd.BinaryPath = "" } // If nothing is left of the hypha - if hd.textPath == "" { + if hd.TextPath == "" { delete(HyphaStorage, hyphaName) hyphae.DecrementCount() } @@ -170,11 +167,11 @@ func renamingPairs(hyphaNames []string, replaceName func(string) string) (map[st if _, nameUsed := HyphaStorage[replaceName(hn)]; nameUsed { return nil, errors.New("Hypha " + replaceName(hn) + " already exists") } - if hd.textPath != "" { - renameMap[hd.textPath] = replaceName(hd.textPath) + if hd.TextPath != "" { + renameMap[hd.TextPath] = replaceName(hd.TextPath) } - if hd.binaryPath != "" { - renameMap[hd.binaryPath] = replaceName(hd.binaryPath) + if hd.BinaryPath != "" { + renameMap[hd.BinaryPath] = replaceName(hd.BinaryPath) } } } @@ -185,8 +182,8 @@ func renamingPairs(hyphaNames []string, replaceName func(string) string) (map[st func relocateHyphaData(hyphaNames []string, replaceName func(string) string) { for _, hyphaName := range hyphaNames { if hd, ok := HyphaStorage[hyphaName]; ok { - hd.textPath = replaceName(hd.textPath) - hd.binaryPath = replaceName(hd.binaryPath) + hd.TextPath = replaceName(hd.TextPath) + hd.BinaryPath = replaceName(hd.BinaryPath) HyphaStorage[replaceName(hyphaName)] = hd delete(HyphaStorage, hyphaName) } @@ -224,7 +221,7 @@ func RenameHypha(hyphaName, newName string, recursive bool, u *user.User) *histo // binaryHtmlBlock creates an html block for binary part of the hypha. func binaryHtmlBlock(hyphaName string, hd *HyphaData) string { - switch filepath.Ext(hd.binaryPath) { + switch filepath.Ext(hd.BinaryPath) { case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico": return fmt.Sprintf(` <div class="binary-container binary-container_with-img"> @@ -257,16 +254,16 @@ func binaryHtmlBlock(hyphaName string, hd *HyphaData) string { // FetchTextPart tries to read text file in the `d`. If there is no file, empty string is returned. func FetchTextPart(d *HyphaData) (string, error) { - if d.textPath == "" { + if d.TextPath == "" { return "", nil } - _, err := os.Stat(d.textPath) + _, err := os.Stat(d.TextPath) if os.IsNotExist(err) { return "", nil } else if err != nil { return "", err } - text, err := ioutil.ReadFile(d.textPath) + text, err := ioutil.ReadFile(d.TextPath) if err != nil { return "", err } @@ -277,7 +274,7 @@ func setHeaderLinks() { if userLinksHypha, ok := GetHyphaData(util.HeaderLinksHypha); !ok { util.SetDefaultHeaderLinks() } else { - contents, err := ioutil.ReadFile(userLinksHypha.textPath) + contents, err := ioutil.ReadFile(userLinksHypha.TextPath) if err != nil || len(contents) == 0 { util.SetDefaultHeaderLinks() } else { @@ -316,13 +313,13 @@ func Index(path string) { hyphae.IncrementCount() } if isText { - hyphaData.textPath = hyphaPartPath + hyphaData.TextPath = hyphaPartPath } else { // Notify the user about binary part collisions. It's a design decision to just use any of them, it's the user's fault that they have screwed up the folder structure, but the engine should at least let them know, right? - if hyphaData.binaryPath != "" { - log.Println("There is a file collision for binary part of a hypha:", hyphaData.binaryPath, "and", hyphaPartPath, "-- going on with the latter") + if hyphaData.BinaryPath != "" { + log.Println("There is a file collision for binary part of a hypha:", hyphaData.BinaryPath, "and", hyphaPartPath, "-- going on with the latter") } - hyphaData.binaryPath = hyphaPartPath + hyphaData.BinaryPath = hyphaPartPath } } diff --git a/hyphae/hyphae.go b/hyphae/hyphae.go new file mode 100644 index 0000000..968d1e6 --- /dev/null +++ b/hyphae/hyphae.go @@ -0,0 +1,43 @@ +package hyphae + +import ( + "sync" +) + +type Hypha struct { + sync.RWMutex + + Name string + Exists bool + TextPath string + BinaryPath string + OutLinks []*Hypha + BackLinks []*Hypha +} + +/* +// Insert inserts the hypha into the mycelium. It overwrites the previous record, if there was any, and returns false. If the was no previous record, return true. +func (h *Hypha) Insert() (justCreated bool) { + var hp *Hypha + hp, justCreated = ByName(h.Name) + + mycm.Lock() + defer mycm.Unlock() + if justCreated { + mycm.byNames[hp.Name] = h + } else { + hp = h + } + + return justCreated +}*/ + +// PhaseOut marks the hypha as non-existent. This is an idempotent operation. +func (h *Hypha) PhaseOut() { + h.Lock() + h.Exists = false + h.OutLinks = make([]*Hypha, 0) + h.TextPath = "" + h.BinaryPath = "" + h.Unlock() +} diff --git a/main.go b/main.go index cf4559f..7395dca 100644 --- a/main.go +++ b/main.go @@ -65,7 +65,7 @@ func handlerList(w http.ResponseWriter, rq *http.Request) { u = user.FromRequest(rq) ) for hyphaName, data := range HyphaStorage { - tbody += templates.HyphaListRowHTML(hyphaName, mimetype.FromExtension(filepath.Ext(data.binaryPath)), data.binaryPath != "") + tbody += templates.HyphaListRowHTML(hyphaName, mimetype.FromExtension(filepath.Ext(data.BinaryPath)), data.BinaryPath != "") } util.HTTP200Page(w, base("List of pages", templates.HyphaListHTML(tbody, pageCount), u)) } From 671f7a05a633a78f2eaa51eeb2a405fe29873d97 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 6 Feb 2021 21:14:57 +0500 Subject: [PATCH 16/53] Make the relative hyphae block look nicer a little --- templates/asset.qtpl.go | 18 +++- templates/default.css | 18 +++- templates/readers.qtpl | 5 +- templates/readers.qtpl.go | 221 +++++++++++++++++++------------------- tree/tree.go | 198 +++++++++++++++++++--------------- 5 files changed, 251 insertions(+), 209 deletions(-) diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index af57b53..9f26407 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -39,7 +39,6 @@ header { width: 100%; margin-bottom: 1rem; } .hypha-tabs__selection { display: inline-block; padding: .25rem; font-weight: bold; } .relative-hyphae { margin-top: .5rem; } -.relative-hyphae > ul { margin: 0; padding: .5rem 1rem; } .relative-hyphae li { list-style-type: none; } @media screen and (max-width: 800px) { @@ -164,6 +163,19 @@ table { border: #ddd 1px solid; border-radius: .25rem; min-width: 4rem; } td { padding: .25rem; } caption { caption-side: top; font-size: small; } +.navitree { padding: 0; margin: 0; } +.navitree__trunk ul { padding-left: 1rem; } +.navitree > .navitree__trunk > ul { padding-left: 2rem; } +.navitree__entry { } +.navitree > .navitree__entry > a::before { display: inline-block; width: .5rem; color: #999; margin: 0 .25rem; } +.navitree > .navitree__entry_infertile > a::before { content: " "} /* nbsp, careful */ +.navitree > .navitree__entry_fertile > a::before { content: "▸"} +.navitree__trunk { border-left: 1px #999 solid; } +.navitree > .navitree__trunk { border-left: none; } +.navitree > .navitree__trunk > a { font-weight: bold; } +.navitree__link { text-decoration: none; display: block; padding: .25rem; } +.navitree__link:hover { background-color: #eee; } + /* Color stuff */ /* Lighter stuff #eee */ article code, @@ -210,10 +222,6 @@ blockquote { border-left: 4px black solid; } .upload-amnt { border: #eee 1px solid; } td { border: #ddd 1px solid; } -.navitree__node { padding-left: 1rem; } -.navitree__link { text-decoration: none; display: block; } -.navitree__link:hover { background-color: #eee; } - /* Dark theme! */ @media (prefers-color-scheme: dark) { html { background: #222; color: #ddd; } diff --git a/templates/default.css b/templates/default.css index c73c5a1..6ab2d95 100644 --- a/templates/default.css +++ b/templates/default.css @@ -14,7 +14,6 @@ header { width: 100%; margin-bottom: 1rem; } .hypha-tabs__selection { display: inline-block; padding: .25rem; font-weight: bold; } .relative-hyphae { margin-top: .5rem; } -.relative-hyphae > ul { margin: 0; padding: .5rem 1rem; } .relative-hyphae li { list-style-type: none; } @media screen and (max-width: 800px) { @@ -139,6 +138,19 @@ table { border: #ddd 1px solid; border-radius: .25rem; min-width: 4rem; } td { padding: .25rem; } caption { caption-side: top; font-size: small; } +.navitree { padding: 0; margin: 0; } +.navitree__trunk ul { padding-left: 1rem; } +.navitree > .navitree__trunk > ul { padding-left: 2rem; } +.navitree__entry { } +.navitree > .navitree__entry > a::before { display: inline-block; width: .5rem; color: #999; margin: 0 .25rem; } +.navitree > .navitree__entry_infertile > a::before { content: " "} /* nbsp, careful */ +.navitree > .navitree__entry_fertile > a::before { content: "▸"} +.navitree__trunk { border-left: 1px #999 solid; } +.navitree > .navitree__trunk { border-left: none; } +.navitree > .navitree__trunk > a { font-weight: bold; } +.navitree__link { text-decoration: none; display: block; padding: .25rem; } +.navitree__link:hover { background-color: #eee; } + /* Color stuff */ /* Lighter stuff #eee */ article code, @@ -185,10 +197,6 @@ blockquote { border-left: 4px black solid; } .upload-amnt { border: #eee 1px solid; } td { border: #ddd 1px solid; } -.navitree__node { padding-left: 1rem; } -.navitree__link { text-decoration: none; display: block; } -.navitree__link:hover { background-color: #eee; } - /* Dark theme! */ @media (prefers-color-scheme: dark) { html { background: #222; color: #ddd; } diff --git a/templates/readers.qtpl b/templates/readers.qtpl index 8c06d2f..57319b3 100644 --- a/templates/readers.qtpl +++ b/templates/readers.qtpl @@ -1,6 +1,7 @@ {% import "net/http" %} {% import "path" %} {% import "github.com/bouncepaw/mycorrhiza/user" %} +{% import "github.com/bouncepaw/mycorrhiza/util" %} {% func HistoryHTML(rq *http.Request, hyphaName, list string) %} {%= navHTML(rq, hyphaName, "history") %} @@ -43,10 +44,10 @@ If `contents` == "", a helpful message is shown instead. </article> <section class="prevnext"> {% if prevHyphaName != "" %} - <a class="prevnext__el prevnext__prev" href="/page/{%s prevHyphaName %}" rel="prev">← {%s path.Base(prevHyphaName) %}</a> + <a class="prevnext__el prevnext__prev" href="/hypha/{%s prevHyphaName %}" rel="prev">← {%s util.BeautifulName(path.Base(prevHyphaName)) %}</a> {% endif %} {% if nextHyphaName != "" %} - <a class="prevnext__el prevnext__next" href="/page/{%s nextHyphaName %}" rel="next">{%s path.Base(nextHyphaName) %} →</a> + <a class="prevnext__el prevnext__next" href="/hypha/{%s nextHyphaName %}" rel="next">{%s util.BeautifulName(path.Base(nextHyphaName)) %} →</a> {% endif %} </section> {% if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" %} diff --git a/templates/readers.qtpl.go b/templates/readers.qtpl.go index ab43ebe..812e65b 100644 --- a/templates/readers.qtpl.go +++ b/templates/readers.qtpl.go @@ -13,246 +13,249 @@ import "path" //line templates/readers.qtpl:3 import "github.com/bouncepaw/mycorrhiza/user" -//line templates/readers.qtpl:5 +//line templates/readers.qtpl:4 +import "github.com/bouncepaw/mycorrhiza/util" + +//line templates/readers.qtpl:6 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/readers.qtpl:5 +//line templates/readers.qtpl:6 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/readers.qtpl:5 +//line templates/readers.qtpl:6 func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/readers.qtpl:5 +//line templates/readers.qtpl:6 qw422016.N().S(` `) -//line templates/readers.qtpl:6 +//line templates/readers.qtpl:7 streamnavHTML(qw422016, rq, hyphaName, "history") -//line templates/readers.qtpl:6 +//line templates/readers.qtpl:7 qw422016.N().S(` <div class="layout"> <main class="main-width"> <article class="history"> <h1>History of `) -//line templates/readers.qtpl:10 +//line templates/readers.qtpl:11 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:10 +//line templates/readers.qtpl:11 qw422016.N().S(`</h1> `) -//line templates/readers.qtpl:11 +//line templates/readers.qtpl:12 qw422016.N().S(list) -//line templates/readers.qtpl:11 +//line templates/readers.qtpl:12 qw422016.N().S(` </article> </main> </div> `) -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 } -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 StreamHistoryHTML(qw422016, rq, hyphaName, list) -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 } -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 func HistoryHTML(rq *http.Request, hyphaName, list string) string { -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 WriteHistoryHTML(qb422016, rq, hyphaName, list) -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 return qs422016 -//line templates/readers.qtpl:15 +//line templates/readers.qtpl:16 } -//line templates/readers.qtpl:17 +//line templates/readers.qtpl:18 func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, revHash string) { -//line templates/readers.qtpl:17 +//line templates/readers.qtpl:18 qw422016.N().S(` `) -//line templates/readers.qtpl:18 +//line templates/readers.qtpl:19 streamnavHTML(qw422016, rq, hyphaName, "revision", revHash) -//line templates/readers.qtpl:18 +//line templates/readers.qtpl:19 qw422016.N().S(` <div class="layout"> <main class="main-width"> <article> <p>Please note that viewing binary parts of hyphae is not supported in history for now.</p> `) -//line templates/readers.qtpl:23 +//line templates/readers.qtpl:24 qw422016.N().S(naviTitle) -//line templates/readers.qtpl:23 +//line templates/readers.qtpl:24 qw422016.N().S(` `) -//line templates/readers.qtpl:24 +//line templates/readers.qtpl:25 qw422016.N().S(contents) -//line templates/readers.qtpl:24 +//line templates/readers.qtpl:25 qw422016.N().S(` </article> </main> `) -//line templates/readers.qtpl:27 +//line templates/readers.qtpl:28 streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:27 +//line templates/readers.qtpl:28 qw422016.N().S(` </div> `) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 } -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, revHash string) { -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, revHash) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 } -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, revHash string) string { -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, revHash) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 return qs422016 -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:30 } // If `contents` == "", a helpful message is shown instead. -//line templates/readers.qtpl:32 +//line templates/readers.qtpl:33 func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/readers.qtpl:32 +//line templates/readers.qtpl:33 qw422016.N().S(` `) -//line templates/readers.qtpl:33 +//line templates/readers.qtpl:34 streamnavHTML(qw422016, rq, hyphaName, "page") -//line templates/readers.qtpl:33 +//line templates/readers.qtpl:34 qw422016.N().S(` <div class="layout"> <main class="main-width"> <article> `) -//line templates/readers.qtpl:37 +//line templates/readers.qtpl:38 qw422016.N().S(naviTitle) -//line templates/readers.qtpl:37 +//line templates/readers.qtpl:38 qw422016.N().S(` `) -//line templates/readers.qtpl:38 +//line templates/readers.qtpl:39 if contents == "" { -//line templates/readers.qtpl:38 +//line templates/readers.qtpl:39 qw422016.N().S(` <p>This hypha has no text. Why not <a href="/edit/`) -//line templates/readers.qtpl:39 +//line templates/readers.qtpl:40 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:39 +//line templates/readers.qtpl:40 qw422016.N().S(`">create it</a>?</p> `) -//line templates/readers.qtpl:40 +//line templates/readers.qtpl:41 } else { -//line templates/readers.qtpl:40 +//line templates/readers.qtpl:41 qw422016.N().S(` `) -//line templates/readers.qtpl:41 +//line templates/readers.qtpl:42 qw422016.N().S(contents) -//line templates/readers.qtpl:41 +//line templates/readers.qtpl:42 qw422016.N().S(` `) -//line templates/readers.qtpl:42 +//line templates/readers.qtpl:43 } -//line templates/readers.qtpl:42 +//line templates/readers.qtpl:43 qw422016.N().S(` </article> <section class="prevnext"> `) -//line templates/readers.qtpl:45 +//line templates/readers.qtpl:46 if prevHyphaName != "" { -//line templates/readers.qtpl:45 +//line templates/readers.qtpl:46 qw422016.N().S(` - <a class="prevnext__el prevnext__prev" href="/page/`) -//line templates/readers.qtpl:46 + <a class="prevnext__el prevnext__prev" href="/hypha/`) +//line templates/readers.qtpl:47 qw422016.E().S(prevHyphaName) -//line templates/readers.qtpl:46 +//line templates/readers.qtpl:47 qw422016.N().S(`" rel="prev">← `) -//line templates/readers.qtpl:46 - qw422016.E().S(path.Base(prevHyphaName)) -//line templates/readers.qtpl:46 +//line templates/readers.qtpl:47 + qw422016.E().S(util.BeautifulName(path.Base(prevHyphaName))) +//line templates/readers.qtpl:47 qw422016.N().S(`</a> `) -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:48 } -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:48 qw422016.N().S(` `) -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:49 if nextHyphaName != "" { -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:49 qw422016.N().S(` - <a class="prevnext__el prevnext__next" href="/page/`) -//line templates/readers.qtpl:49 + <a class="prevnext__el prevnext__next" href="/hypha/`) +//line templates/readers.qtpl:50 qw422016.E().S(nextHyphaName) -//line templates/readers.qtpl:49 +//line templates/readers.qtpl:50 qw422016.N().S(`" rel="next">`) -//line templates/readers.qtpl:49 - qw422016.E().S(path.Base(nextHyphaName)) -//line templates/readers.qtpl:49 +//line templates/readers.qtpl:50 + qw422016.E().S(util.BeautifulName(path.Base(nextHyphaName))) +//line templates/readers.qtpl:50 qw422016.N().S(` →</a> `) -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:51 } -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:51 qw422016.N().S(` </section> `) -//line templates/readers.qtpl:52 +//line templates/readers.qtpl:53 if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" { -//line templates/readers.qtpl:52 +//line templates/readers.qtpl:53 qw422016.N().S(` <form action="/upload-binary/`) -//line templates/readers.qtpl:53 +//line templates/readers.qtpl:54 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:53 +//line templates/readers.qtpl:54 qw422016.N().S(`" method="post" enctype="multipart/form-data" class="upload-amnt"> `) -//line templates/readers.qtpl:56 +//line templates/readers.qtpl:57 if hasAmnt { -//line templates/readers.qtpl:56 +//line templates/readers.qtpl:57 qw422016.N().S(` <a class="upload-amnt__unattach" href="/unattach-ask/`) -//line templates/readers.qtpl:57 +//line templates/readers.qtpl:58 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:57 +//line templates/readers.qtpl:58 qw422016.N().S(`">Unattach current attachment?</a> `) -//line templates/readers.qtpl:58 +//line templates/readers.qtpl:59 } -//line templates/readers.qtpl:58 +//line templates/readers.qtpl:59 qw422016.N().S(` <label for="upload-binary__input">Upload a new attachment</label> <br> @@ -260,43 +263,43 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi <input type="submit"/> </form> `) -//line templates/readers.qtpl:64 +//line templates/readers.qtpl:65 } -//line templates/readers.qtpl:64 +//line templates/readers.qtpl:65 qw422016.N().S(` </main> `) -//line templates/readers.qtpl:66 +//line templates/readers.qtpl:67 streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:66 +//line templates/readers.qtpl:67 qw422016.N().S(` </div> `) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 } -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 } -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName string, hasAmnt bool) string { -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 return qs422016 -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:69 } diff --git a/tree/tree.go b/tree/tree.go index 476b540..45046db 100644 --- a/tree/tree.go +++ b/tree/tree.go @@ -9,100 +9,122 @@ import ( "github.com/bouncepaw/mycorrhiza/util" ) -// If Name == "", the tree is empty. -type tree struct { - name string - exists bool - prevSibling string - nextSibling string - siblings []string - descendants []*tree - root bool - hyphaIterator func(func(string)) +type sibling struct { + name string + hasChildren bool +} + +func (s *sibling) checkThisChild(hyphaName string) { + if !s.hasChildren && path.Dir(hyphaName) == s.name { + s.hasChildren = true + } +} + +func (s *sibling) asHTML() string { + class := "navitree__entry navitree__sibling" + if s.hasChildren { + class += " navitree__sibling_fertile navitree__entry_fertile" + } else { + class += " navitree__sibling_infertile navitree__entry_infertile" + } + return fmt.Sprintf( + `<li class="%s"><a class="navitree__link" href="/hypha/%s">%s</a></li>`, + class, + s.name, + util.BeautifulName(path.Base(s.name)), + ) +} + +type mainFamilyMember struct { + name string + children []*mainFamilyMember +} + +func (m *mainFamilyMember) checkThisChild(hyphaName string) (adopted bool) { + if path.Dir(hyphaName) == m.name { + m.children = append(m.children, &mainFamilyMember{ + name: hyphaName, + children: make([]*mainFamilyMember, 0), + }) + return true + } + return false +} + +func (m *mainFamilyMember) asHTML() string { + if len(m.children) == 0 { + return fmt.Sprintf(`<li class="navitree__entry navitree__entry_infertile navitree__trunk navitree__trunk_infertile"><a class="navitree__link" href="/hypha/%s">%s</a></li>`, m.name, util.BeautifulName(path.Base(m.name))) + } + sort.Slice(m.children, func(i, j int) bool { + return m.children[i].name < m.children[j].name + }) + html := fmt.Sprintf(`<li class="navitree__entry navitree__entry_fertile navitree__trunk navitree__trunk_fertile"><a class="navitree__link" href="/hypha/%s">%s</a><ul>`, m.name, util.BeautifulName(path.Base(m.name))) + for _, child := range m.children { + html += child.asHTML() + } + return html + `</li></ul></li>` +} + +func mainFamilyFromPool(hyphaName string, subhyphaePool map[string]bool) *mainFamilyMember { + var ( + nestLevel = strings.Count(hyphaName, "/") + adopted = make([]*mainFamilyMember, 0) + ) + for subhyphaName, _ := range subhyphaePool { + subnestLevel := strings.Count(subhyphaName, "/") + if subnestLevel-1 == nestLevel && path.Dir(subhyphaName) == hyphaName { + delete(subhyphaePool, subhyphaName) + adopted = append(adopted, mainFamilyFromPool(subhyphaName, subhyphaePool)) + } + } + return &mainFamilyMember{name: hyphaName, children: adopted} } // Tree generates a tree for `hyphaName` as html and returns next and previous hyphae if any. func Tree(hyphaName string, hyphaIterator func(func(string))) (html, prev, next string) { - t := &tree{name: hyphaName, root: true, hyphaIterator: hyphaIterator} - t.fill() - return t.asHtml(), util.BeautifulName(t.prevSibling), util.BeautifulName(t.nextSibling) -} - -// subtree adds a descendant tree to `t` and returns that tree. -func (t *tree) fork(descendantName string) *tree { - subt := &tree{ - name: descendantName, - root: false, - hyphaIterator: t.hyphaIterator, - } - t.descendants = append(t.descendants, subt) - return subt -} - -// Compare current prev next hyphae and decide if any of them should be set to `name2`. -func (t *tree) prevNextDetermine(name2 string) { - if name2 < t.name && (name2 > t.prevSibling || t.prevSibling == "") { - t.prevSibling = name2 - } else if name2 > t.name && (name2 < t.nextSibling || t.nextSibling == "") { - t.nextSibling = name2 - } -} - -// Compares names and does something with them, may generate a subtree. -func (t *tree) compareNamesAndAppend(name2 string) { - switch { - case t.name == name2: - t.exists = true - case t.root && path.Dir(t.name) == path.Dir(name2): - t.prevNextDetermine(name2) - t.siblings = append(t.siblings, name2) - case t.name == path.Dir(name2): - t.fork(name2).fill() - } -} - -// Fills t.siblings and t.descendants, sorts them and does the same to the descendants. -func (t *tree) fill() { - t.hyphaIterator(func(hyphaName string) { - t.compareNamesAndAppend(hyphaName) - }) - sort.Strings(t.siblings) - sort.Slice(t.descendants, func(i, j int) bool { - return t.descendants[i].name < t.descendants[j].name - }) -} - -// asHtml returns HTML representation of a tree. -// It applies itself recursively on the tree's children. -func (t *tree) asHtml() (html string) { - if t.root { - html += navitreeEntry(t.name, "navitree__pagename") - } else { - html += navitreeEntry(t.name, "navitree__name") - } - - for _, subtree := range t.descendants { - html += subtree.asHtml() - } - - if t.root { - for _, siblingName := range t.siblings { - html += navitreeEntry(siblingName, "navitree__sibling") + var ( + // One of the siblings is the hypha with name `hyphaName` + siblings = findSiblings(hyphaName, hyphaIterator) + subhyphaePool = make(map[string]bool) + I int + ) + hyphaIterator(func(otherHyphaName string) { + for _, s := range siblings { + s.checkThisChild(otherHyphaName) } + if strings.HasPrefix(otherHyphaName, hyphaName+"/") { + subhyphaePool[otherHyphaName] = true + } + }) + for i, s := range siblings { + if s.name == hyphaName { + I = i + break + } + html += s.asHTML() } - - return `<ul class="navitree__node">` + html + `</ul>` + html += mainFamilyFromPool(hyphaName, subhyphaePool).asHTML() + for _, s := range siblings[I+1:] { + html += s.asHTML() + } + if I != 0 { + prev = siblings[I-1].name + } + if I != len(siblings)-1 { + next = siblings[I+1].name + } + return fmt.Sprintf(`<ul class="navitree">%s</ul>`, html), prev, next } -// Strip hypha name from all ancestor names, replace _ with spaces, title case -func beautifulName(uglyName string) string { - return strings.Title(strings.ReplaceAll(path.Base(uglyName), "_", " ")) -} - -// navitreeEntry is a small utility function that makes generating html easier. -func navitreeEntry(name, class string) string { - return fmt.Sprintf(`<li class="navitree__entry %s"> - <a class="navitree__link" href="/page/%s">%s</a> -</li> -`, class, name, beautifulName(name)) +func findSiblings(hyphaName string, hyphaIterator func(func(string))) []*sibling { + siblings := []*sibling{&sibling{name: hyphaName, hasChildren: true}} + hyphaIterator(func(otherHyphaName string) { + if path.Dir(hyphaName) == path.Dir(otherHyphaName) && hyphaName != otherHyphaName { + siblings = append(siblings, &sibling{name: otherHyphaName, hasChildren: false}) + } + }) + sort.Slice(siblings, func(i, j int) bool { + return siblings[i].name < siblings[j].name + }) + return siblings } From 02e7cd2bfc86a6cf5d3ee79a8c3a75caa8c90277 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 6 Feb 2021 21:16:21 +0500 Subject: [PATCH 17/53] Strip extra whitespace from links --- link/link.go | 1 + 1 file changed, 1 insertion(+) diff --git a/link/link.go b/link/link.go index 6c7e7b8..8771ca9 100644 --- a/link/link.go +++ b/link/link.go @@ -82,6 +82,7 @@ func (l *Link) ImgSrc() string { // From returns a Link object given these `address` and `display` on relative to given `hyphaName`. func From(address, display, hyphaName string) *Link { + address = strings.TrimSpace(address) link := Link{ SrcAddress: address, SrcDisplay: display, From 70e427bc2309018a918381b4bcec40bab44c0001 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 6 Feb 2021 21:38:48 +0500 Subject: [PATCH 18/53] Rotate a triangle shown in relative hyphae block --- templates/asset.qtpl.go | 3 ++- templates/default.css | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index 9f26407..2d6d279 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -169,7 +169,8 @@ caption { caption-side: top; font-size: small; } .navitree__entry { } .navitree > .navitree__entry > a::before { display: inline-block; width: .5rem; color: #999; margin: 0 .25rem; } .navitree > .navitree__entry_infertile > a::before { content: " "} /* nbsp, careful */ -.navitree > .navitree__entry_fertile > a::before { content: "▸"} +.navitree > .navitree__sibling_fertile > a::before { content: "▸"} +.navitree > .navitree__trunk_fertile > a::before { content: "▾"} .navitree__trunk { border-left: 1px #999 solid; } .navitree > .navitree__trunk { border-left: none; } .navitree > .navitree__trunk > a { font-weight: bold; } diff --git a/templates/default.css b/templates/default.css index 6ab2d95..f9dc2d1 100644 --- a/templates/default.css +++ b/templates/default.css @@ -144,7 +144,8 @@ caption { caption-side: top; font-size: small; } .navitree__entry { } .navitree > .navitree__entry > a::before { display: inline-block; width: .5rem; color: #999; margin: 0 .25rem; } .navitree > .navitree__entry_infertile > a::before { content: " "} /* nbsp, careful */ -.navitree > .navitree__entry_fertile > a::before { content: "▸"} +.navitree > .navitree__sibling_fertile > a::before { content: "▸"} +.navitree > .navitree__trunk_fertile > a::before { content: "▾"} .navitree__trunk { border-left: 1px #999 solid; } .navitree > .navitree__trunk { border-left: none; } .navitree > .navitree__trunk > a { font-weight: bold; } From 5d8ee3a9976883bcb14993cae3b1afba3c76b728 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Mon, 8 Feb 2021 19:59:00 +0500 Subject: [PATCH 19/53] Partially move main.Index to hyphae.Index --- hypha.go | 77 ++++++++++++++++++++++++------------------------- hyphae/files.go | 44 ++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 39 deletions(-) create mode 100644 hyphae/files.go diff --git a/hypha.go b/hypha.go index acfa736..b1437b6 100644 --- a/hypha.go +++ b/hypha.go @@ -284,44 +284,43 @@ func setHeaderLinks() { } } -// Index finds all hypha files in the full `path` and saves them to HyphaStorage. This function is recursive. -func Index(path string) { - nodes, err := ioutil.ReadDir(path) - if err != nil { - log.Fatal(err) - } - - for _, node := range nodes { - // If this hypha looks like it can be a hypha path, go deeper. Do not touch the .git and static folders for they have an admnistrative importance! - if node.IsDir() && isCanonicalName(node.Name()) && node.Name() != ".git" && node.Name() != "static" { - Index(filepath.Join(path, node.Name())) - continue - } - - var ( - hyphaPartPath = filepath.Join(path, node.Name()) - hyphaName, isText, skip = mimetype.DataFromFilename(hyphaPartPath) - hyphaData *HyphaData - ) - if !skip { - // Reuse the entry for existing hyphae, create a new one for those that do not exist yet. - if hd, ok := HyphaStorage[hyphaName]; ok { - hyphaData = hd - } else { - hyphaData = &HyphaData{} - HyphaStorage[hyphaName] = hyphaData - hyphae.IncrementCount() - } - if isText { - hyphaData.TextPath = hyphaPartPath - } else { - // Notify the user about binary part collisions. It's a design decision to just use any of them, it's the user's fault that they have screwed up the folder structure, but the engine should at least let them know, right? - if hyphaData.BinaryPath != "" { - log.Println("There is a file collision for binary part of a hypha:", hyphaData.BinaryPath, "and", hyphaPartPath, "-- going on with the latter") - } - hyphaData.BinaryPath = hyphaPartPath - } - } - +func HyphaToTemporaryWorkaround(h *hyphae.Hypha) *HyphaData { + return &HyphaData{ + Name: h.Name, + TextPath: h.TextPath, + BinaryPath: h.BinaryPath, } } + +// MergeIn merges in content file paths from a different hypha object. Prints warnings sometimes. +func (h *HyphaData) MergeIn(oh *hyphae.Hypha) { + if h.TextPath == "" && oh.TextPath != "" { + h.TextPath = oh.TextPath + } + if oh.BinaryPath != "" { + if h.BinaryPath != "" { + log.Println("There is a file collision for binary part of a hypha:", h.BinaryPath, "and", oh.BinaryPath, "-- going on with the latter") + } + h.BinaryPath = oh.BinaryPath + } +} + +// Index finds all hypha files in the full `path` and saves them to HyphaStorage. This function is recursive. +func Index(path string) { + ch := make(chan *hyphae.Hypha, 5) + + go func() { + hyphae.Index(path, 0, ch) + close(ch) + }() + + for h := range ch { + if oldHypha, ok := HyphaStorage[h.Name]; ok { + oldHypha.MergeIn(h) + } else { + HyphaStorage[h.Name] = HyphaToTemporaryWorkaround(h) + hyphae.IncrementCount() + } + } + +} diff --git a/hyphae/files.go b/hyphae/files.go new file mode 100644 index 0000000..4c97a78 --- /dev/null +++ b/hyphae/files.go @@ -0,0 +1,44 @@ +package hyphae + +import ( + "io/ioutil" + "log" + "path/filepath" + + "github.com/bouncepaw/mycorrhiza/mimetype" + "github.com/bouncepaw/mycorrhiza/util" +) + +// Index finds all hypha files in the full `path` and sends them to the channel. Handling of duplicate entries and attachment and counting them is up to the caller. +func Index(path string, nestLevel uint, ch chan *Hypha) { + nodes, err := ioutil.ReadDir(path) + if err != nil { + log.Fatal(err) + } + + for _, node := range nodes { + // If this hypha looks like it can be a hypha path, go deeper. Do not touch the .git and static folders for they have an admnistrative importance! + if node.IsDir() && + util.IsCanonicalName(node.Name()) && + node.Name() != ".git" && + !(nestLevel == 0 && node.Name() == "static") { + Index(filepath.Join(path, node.Name()), nestLevel+1, ch) + continue + } + + var ( + hyphaPartPath = filepath.Join(path, node.Name()) + hyphaName, isText, skip = mimetype.DataFromFilename(hyphaPartPath) + hypha = &Hypha{Name: hyphaName} + ) + if !skip { + if isText { + hypha.TextPath = hyphaPartPath + } else { + hypha.BinaryPath = hyphaPartPath + } + ch <- hypha + } + + } +} From 5cafaaa3d873e562e52cfc6d83e83e0b44f0e465 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Tue, 9 Feb 2021 19:35:02 +0500 Subject: [PATCH 20/53] Add proof-of-concept Gemini output of /hypha/ --- Makefile | 3 ++ flag.go | 1 + gemini.go | 83 ++++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 ++ go.sum | 4 +++ main.go | 2 ++ markup/mycomarkup.go | 5 +++ metarrhiza | 2 +- name.go | 14 ++++++++ util/util.go | 1 + 10 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 gemini.go diff --git a/Makefile b/Makefile index 5f2d62e..f1d598f 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ run: build run_with_fixed_auth: build ./mycorrhiza -auth-method fixed metarrhiza +run_with_gemini: build + ./mycorrhiza -gemini-cert-path "." metarrhiza + build: go generate go build . diff --git a/flag.go b/flag.go index 47a2134..68e0c42 100644 --- a/flag.go +++ b/flag.go @@ -19,6 +19,7 @@ func init() { flag.StringVar(&util.AuthMethod, "auth-method", "none", "What auth method to use. Variants: \"none\", \"fixed\"") flag.StringVar(&util.FixedCredentialsPath, "fixed-credentials-path", "mycocredentials.json", "Used when -auth-method=fixed. Path to file with user credentials.") flag.StringVar(&util.HeaderLinksHypha, "header-links-hypha", "", "Optional hypha that overrides the header links") + flag.StringVar(&util.GeminiCertPath, "gemini-cert-path", "", "Directory where you store Gemini certificates. Leave empty if you don't want to use Gemini.") } // Do the things related to cli args and die maybe diff --git a/gemini.go b/gemini.go new file mode 100644 index 0000000..3ed4ceb --- /dev/null +++ b/gemini.go @@ -0,0 +1,83 @@ +package main + +import ( + "crypto/tls" + "crypto/x509/pkix" + "io/ioutil" + "log" + "path/filepath" + "time" + + "git.sr.ht/~adnano/go-gemini" + "git.sr.ht/~adnano/go-gemini/certificate" + + "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/util" +) + +func geminiHomeHypha(w *gemini.ResponseWriter, rq *gemini.Request) { + log.Println(rq.URL) + w.Write([]byte(`# MycorrhizaWiki + +You have successfully served the wiki through Gemini. Currently, support is really work-in-progress; you should resort to using Mycorrhiza through the web protocols. + +Visit home hypha: +=> /hypha/` + util.HomePage)) +} + +func geminiHypha(w *gemini.ResponseWriter, rq *gemini.Request) { + log.Println(rq.URL) + var ( + hyphaName = geminiHyphaNameFromRq(rq, "page", "hypha") + data, hyphaExists = HyphaStorage[hyphaName] + hasAmnt = hyphaExists && data.BinaryPath != "" + contents string + ) + if hyphaExists { + fileContentsT, errT := ioutil.ReadFile(data.TextPath) + if errT == nil { + md := markup.Doc(hyphaName, string(fileContentsT)) + contents = md.AsGemtext() + } + } + if hasAmnt { + w.Write([]byte("This hypha has an attachment\n")) + } + w.Write([]byte(contents)) +} + +func handleGemini() { + if util.GeminiCertPath == "" { + return + } + certPath, err := filepath.Abs(util.GeminiCertPath) + if err != nil { + log.Fatal(err) + } + + var server gemini.Server + server.ReadTimeout = 30 * time.Second + server.WriteTimeout = 1 * time.Minute + if err := server.Certificates.Load(certPath); err != nil { + log.Fatal(err) + } + server.CreateCertificate = func(hostname string) (tls.Certificate, error) { + return certificate.Create(certificate.CreateOptions{ + Subject: pkix.Name{ + CommonName: hostname, + }, + DNSNames: []string{hostname}, + Duration: 365 * 24 * time.Hour, + }) + } + + var mux gemini.ServeMux + mux.HandleFunc("/", geminiHomeHypha) + mux.HandleFunc("/hypha/", geminiHypha) + mux.HandleFunc("/page/", geminiHypha) + + server.Handle("localhost", &mux) + if err := server.ListenAndServe(); err != nil { + log.Fatal(err) + } +} diff --git a/go.mod b/go.mod index 137cbae..26dbe9f 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,10 @@ module github.com/bouncepaw/mycorrhiza go 1.14 require ( + git.sr.ht/~adnano/go-gemini v0.1.13 github.com/adrg/xdg v0.2.2 github.com/gorilla/feeds v1.1.1 github.com/kr/pretty v0.2.1 // indirect github.com/valyala/quicktemplate v1.6.3 + tildegit.org/solderpunk/gemcert v0.0.0-20200801165357-fc14deb27512 // indirect ) diff --git a/go.sum b/go.sum index f950cb8..0aa3df2 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +git.sr.ht/~adnano/go-gemini v0.1.13 h1:vzKkkVrOzMpfJ1AAeE/PChg0Rw5Zf+9HrnwsgVxXUT4= +git.sr.ht/~adnano/go-gemini v0.1.13/go.mod h1:If1VxEWcZDrRt5FeAFnGTcM2Ud1E3BXs3VJ5rnZWKq0= github.com/adrg/xdg v0.2.2 h1:A7ZHKRz5KGOLJX/bg7IPzStryhvCzAE1wX+KWawPiAo= github.com/adrg/xdg v0.2.2/go.mod h1:7I2hH/IT30IsupOpKZ5ue7/qNi3CoKzD6tL3HwpaRMQ= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= @@ -33,3 +35,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +tildegit.org/solderpunk/gemcert v0.0.0-20200801165357-fc14deb27512 h1:reGEt1vmGompn/6FitHdBatILTsK9CYnQOCw3weoW/s= +tildegit.org/solderpunk/gemcert v0.0.0-20200801165357-fc14deb27512/go.mod h1:gqBK7AJ5wPR1bpFOuPmlQObYxwXrFdZmNb2vdzquqoA= diff --git a/main.go b/main.go index 7395dca..d35420e 100644 --- a/main.go +++ b/main.go @@ -193,6 +193,8 @@ func main() { history.Start(WikiDir) setHeaderLinks() + go handleGemini() + // See http_readers.go for /page/, /hypha/, /text/, /binary/ // See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/, /unattach-ask/, /unattach-confirm/ // See http_auth.go for /login, /login-data, /logout, /logout-confirm diff --git a/markup/mycomarkup.go b/markup/mycomarkup.go index f15c07b..2fadd4e 100644 --- a/markup/mycomarkup.go +++ b/markup/mycomarkup.go @@ -48,6 +48,11 @@ func (md *MycoDoc) AsHTML() string { return md.html } +// AsGemtext returns a gemtext representation of the document. Currently really limited, just returns source text +func (md *MycoDoc) AsGemtext() string { + return md.contents +} + // Used to clear opengraph description from html tags. This method is usually bad because of dangers of malformed HTML, but I'm going to use it only for Mycorrhiza-generated HTML, so it's okay. The question mark is required; without it the whole string is eaten away. var htmlTagRe = regexp.MustCompile(`<.*?>`) diff --git a/metarrhiza b/metarrhiza index be5b922..e7040f3 160000 --- a/metarrhiza +++ b/metarrhiza @@ -1 +1 @@ -Subproject commit be5b922e9b564551601d21ed45bf7d9ced65c6bb +Subproject commit e7040f3e0dc41809063b77fcbc12fe33b234ea87 diff --git a/name.go b/name.go index 57c860a..b3a296b 100644 --- a/name.go +++ b/name.go @@ -6,6 +6,8 @@ import ( "net/http" "strings" + "git.sr.ht/~adnano/go-gemini" + "github.com/bouncepaw/mycorrhiza/util" ) @@ -58,3 +60,15 @@ func HyphaNameFromRq(rq *http.Request, actions ...string) string { log.Fatal("HyphaNameFromRq: no matching action passed") return "" } + +// geminiHyphaNameFromRq extracts hypha name from gemini request. You have to also pass the action which is embedded in the url or several actions. For url /hypha/hypha, the action would be "hypha". +func geminiHyphaNameFromRq(rq *gemini.Request, actions ...string) string { + p := rq.URL.Path + for _, action := range actions { + if strings.HasPrefix(p, "/"+action+"/") { + return util.CanonicalName(strings.TrimPrefix(p, "/"+action+"/")) + } + } + log.Fatal("HyphaNameFromRq: no matching action passed") + return "" +} diff --git a/util/util.go b/util/util.go index acf0eec..108fa05 100644 --- a/util/util.go +++ b/util/util.go @@ -19,6 +19,7 @@ var ( HeaderLinksHypha string AuthMethod string FixedCredentialsPath string + GeminiCertPath string ) // ShorterPath is used by handlerList to display shorter path to the files. It simply strips WikiDir. From ee02211b3eef99bcc8f614b37a380fc421b77ae8 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Wed, 17 Feb 2021 23:41:35 +0500 Subject: [PATCH 21/53] Start the Great Refactoring --- flag.go | 6 +- gemini.go | 13 +- history/operations.go | 8 + http_auth.go | 3 +- http_mutators.go | 349 ++++++++++++++++++++---------------------- http_readers.go | 41 ++--- hypha.go | 326 --------------------------------------- hyphae/delete.go | 52 +++++++ hyphae/files.go | 29 +++- hyphae/hyphae.go | 166 +++++++++++++++++--- hyphae/rename.go | 122 +++++++++++++++ hyphae/unattach.go | 66 ++++++++ hyphae/upload.go | 122 +++++++++++++++ hyphae/view.go | 72 +++++++++ main.go | 36 ++--- name.go | 14 +- tree/tree.go | 25 +-- util/util.go | 11 -- 18 files changed, 836 insertions(+), 625 deletions(-) delete mode 100644 hypha.go create mode 100644 hyphae/delete.go create mode 100644 hyphae/rename.go create mode 100644 hyphae/unattach.go create mode 100644 hyphae/upload.go create mode 100644 hyphae/view.go diff --git a/flag.go b/flag.go index 68e0c42..77a7d05 100644 --- a/flag.go +++ b/flag.go @@ -42,9 +42,9 @@ func parseCliArgs() { util.URL = "http://0.0.0.0:" + util.ServerPort } - util.HomePage = CanonicalName(util.HomePage) - util.UserHypha = CanonicalName(util.UserHypha) - util.HeaderLinksHypha = CanonicalName(util.HeaderLinksHypha) + util.HomePage = util.CanonicalName(util.HomePage) + util.UserHypha = util.CanonicalName(util.UserHypha) + util.HeaderLinksHypha = util.CanonicalName(util.HeaderLinksHypha) switch util.AuthMethod { case "none": diff --git a/gemini.go b/gemini.go index 3ed4ceb..b86c3a4 100644 --- a/gemini.go +++ b/gemini.go @@ -11,6 +11,7 @@ import ( "git.sr.ht/~adnano/go-gemini" "git.sr.ht/~adnano/go-gemini/certificate" + "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/util" ) @@ -28,13 +29,13 @@ Visit home hypha: func geminiHypha(w *gemini.ResponseWriter, rq *gemini.Request) { log.Println(rq.URL) var ( - hyphaName = geminiHyphaNameFromRq(rq, "page", "hypha") - data, hyphaExists = HyphaStorage[hyphaName] - hasAmnt = hyphaExists && data.BinaryPath != "" - contents string + hyphaName = geminiHyphaNameFromRq(rq, "page", "hypha") + h = hyphae.ByName(hyphaName) + hasAmnt = h.Exists && h.BinaryPath != "" + contents string ) - if hyphaExists { - fileContentsT, errT := ioutil.ReadFile(data.TextPath) + if h.Exists { + fileContentsT, errT := ioutil.ReadFile(h.TextPath) if errT == nil { md := markup.Doc(hyphaName, string(fileContentsT)) contents = md.AsGemtext() diff --git a/history/operations.go b/history/operations.go index a8177ba..b815c28 100644 --- a/history/operations.go +++ b/history/operations.go @@ -134,3 +134,11 @@ func (hop *HistoryOp) WithUser(u *user.User) *HistoryOp { } return hop } + +func (hop *HistoryOp) HasErrors() bool { + return len(hop.Errs) > 0 +} + +func (hop *HistoryOp) FirstErrorText() string { + return hop.Errs[0].Error() +} diff --git a/http_auth.go b/http_auth.go index cfe0799..a9ba5de 100644 --- a/http_auth.go +++ b/http_auth.go @@ -6,6 +6,7 @@ import ( "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" + "github.com/bouncepaw/mycorrhiza/util" ) func init() { @@ -39,7 +40,7 @@ func handlerLogoutConfirm(w http.ResponseWriter, rq *http.Request) { func handlerLoginData(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var ( - username = CanonicalName(rq.PostFormValue("username")) + username = util.CanonicalName(rq.PostFormValue("username")) password = rq.PostFormValue("password") err = user.LoginDataHTTP(w, rq, username, password) ) diff --git a/http_mutators.go b/http_mutators.go index ea37b9c..e4d6bdb 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -5,6 +5,8 @@ import ( "log" "net/http" + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" @@ -25,182 +27,146 @@ func init() { http.HandleFunc("/unattach-confirm/", handlerUnattachConfirm) } -func handlerUnattachAsk(w http.ResponseWriter, rq *http.Request) { - log.Println(rq.URL) - var ( - hyphaName = HyphaNameFromRq(rq, "unattach-ask") - hd, isOld = HyphaStorage[hyphaName] - hasAmnt = hd != nil && hd.BinaryPath != "" - ) - if !hasAmnt { - HttpErr(w, http.StatusBadRequest, hyphaName, "Cannot unattach", "No attachment attached yet, therefore you cannot unattach") - log.Println("Rejected (no amnt):", rq.URL) - return - } else if ok := user.CanProceed(rq, "unattach-confirm"); !ok { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a trusted editor to unattach attachments") - log.Println("Rejected (no rights):", rq.URL) - return - } - util.HTTP200Page(w, base("Unattach "+hyphaName+"?", templates.UnattachAskHTML(rq, hyphaName, isOld), user.FromRequest(rq))) -} - -func handlerUnattachConfirm(w http.ResponseWriter, rq *http.Request) { - log.Println(rq.URL) - var ( - hyphaName = HyphaNameFromRq(rq, "unattach-confirm") - hyphaData, isOld = HyphaStorage[hyphaName] - hasAmnt = hyphaData != nil && hyphaData.BinaryPath != "" - u = user.FromRequest(rq) - ) - if !u.CanProceed("unattach-confirm") { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a trusted editor to unattach attachments") - log.Println("Rejected (no rights):", rq.URL) - return - } - if !hasAmnt { - HttpErr(w, http.StatusBadRequest, hyphaName, "Cannot unattach", "No attachment attached yet, therefore you cannot unattach") - log.Println("Rejected (no amnt):", rq.URL) - return - } else if !isOld { - // The precondition is to have the hypha in the first place. - HttpErr(w, http.StatusPreconditionFailed, hyphaName, - "Error: no such hypha", - "Could not unattach this hypha because it does not exist") - return - } - if hop := hyphaData.UnattachHypha(hyphaName, u); len(hop.Errs) != 0 { - HttpErr(w, http.StatusInternalServerError, hyphaName, - "Error: could not unattach hypha", - fmt.Sprintf("Could not unattach this hypha due to internal errors. Server errors: <code>%v</code>", hop.Errs)) - return - } - http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) -} - -func handlerRenameAsk(w http.ResponseWriter, rq *http.Request) { - log.Println(rq.URL) - var ( - hyphaName = HyphaNameFromRq(rq, "rename-ask") - _, isOld = HyphaStorage[hyphaName] - u = user.FromRequest(rq) - ) - if !u.CanProceed("rename-confirm") { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a trusted editor to rename pages.") - log.Println("Rejected", rq.URL) - return - } - util.HTTP200Page(w, base("Rename "+hyphaName+"?", templates.RenameAskHTML(rq, hyphaName, isOld), u)) -} - -func handlerRenameConfirm(w http.ResponseWriter, rq *http.Request) { - log.Println(rq.URL) - var ( - hyphaName = HyphaNameFromRq(rq, "rename-confirm") - _, isOld = HyphaStorage[hyphaName] - newName = CanonicalName(rq.PostFormValue("new-name")) - _, newNameIsUsed = HyphaStorage[newName] - recursive = rq.PostFormValue("recursive") == "true" - u = user.FromRequest(rq) - ) - switch { - case !u.CanProceed("rename-confirm"): - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a trusted editor to rename pages.") - log.Println("Rejected", rq.URL) - case newNameIsUsed: - HttpErr(w, http.StatusBadRequest, hyphaName, "Error: hypha exists", - fmt.Sprintf("Hypha named <a href='/page/%s'>%s</a> already exists.", hyphaName, hyphaName)) - case newName == "": - HttpErr(w, http.StatusBadRequest, hyphaName, "Error: no name", - "No new name is given.") - case !isOld: - HttpErr(w, http.StatusBadRequest, hyphaName, "Error: no such hypha", - "Cannot rename a hypha that does not exist yet.") - case !HyphaPattern.MatchString(newName): - HttpErr(w, http.StatusBadRequest, hyphaName, "Error: invalid name", - "Invalid new name. Names cannot contain characters <code>^?!:#@><*|\"\\'&%</code>") - default: - if hop := RenameHypha(hyphaName, newName, recursive, u); len(hop.Errs) != 0 { - HttpErr(w, http.StatusInternalServerError, hyphaName, - "Error: could not rename hypha", - fmt.Sprintf("Could not rename this hypha due to an internal error. Server errors: <code>%v</code>", hop.Errs)) - } else { - http.Redirect(w, rq, "/page/"+newName, http.StatusSeeOther) +func factoryHandlerAsker( + actionPath string, + asker func(*hyphae.Hypha, *user.User) (error, string), + succTitleTemplate string, + succPageTemplate func(*http.Request, string, bool) string, +) func(http.ResponseWriter, *http.Request) { + return func(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + var ( + hyphaName = HyphaNameFromRq(rq, actionPath) + h = hyphae.ByName(hyphaName) + u = user.FromRequest(rq) + ) + if err, errtitle := asker(h, u); err != nil { + HttpErr( + w, + http.StatusInternalServerError, + hyphaName, + errtitle, + err.Error()) + return } + util.HTTP200Page( + w, + base( + fmt.Sprintf(succTitleTemplate, hyphaName), + succPageTemplate(rq, hyphaName, h.Exists), + u)) } } -// handlerDeleteAsk shows a delete dialog. -func handlerDeleteAsk(w http.ResponseWriter, rq *http.Request) { - log.Println(rq.URL) - var ( - hyphaName = HyphaNameFromRq(rq, "delete-ask") - _, isOld = HyphaStorage[hyphaName] - u = user.FromRequest(rq) - ) - if !u.CanProceed("delete-ask") { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a moderator to delete pages.") - log.Println("Rejected", rq.URL) - return +var handlerUnattachAsk = factoryHandlerAsker( + "unattach-ask", + func(h *hyphae.Hypha, u *user.User) (error, string) { + return h.CanUnattach(u) + }, + "Unattach %s?", + templates.UnattachAskHTML, +) + +var handlerDeleteAsk = factoryHandlerAsker( + "delete-ask", + func(h *hyphae.Hypha, u *user.User) (error, string) { + return h.CanDelete(u) + }, + "Delete %s?", + templates.DeleteAskHTML, +) + +var handlerRenameAsk = factoryHandlerAsker( + "rename-ask", + func(h *hyphae.Hypha, u *user.User) (error, string) { + return h.CanRename(u) + }, + "Rename %s?", + templates.RenameAskHTML, +) + +func factoryHandlerConfirmer( + actionPath string, + confirmer func(*hyphae.Hypha, *user.User, *http.Request) (*history.HistoryOp, string), +) func(http.ResponseWriter, *http.Request) { + return func(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + var ( + hyphaName = HyphaNameFromRq(rq, "unattach-confirm") + h = hyphae.ByName(hyphaName) + u = user.FromRequest(rq) + ) + if hop, errtitle := confirmer(h, u, rq); hop.HasErrors() { + HttpErr(w, http.StatusInternalServerError, hyphaName, + errtitle, + hop.FirstErrorText()) + return + } + http.Redirect(w, rq, "/hypha/"+hyphaName, http.StatusSeeOther) } - util.HTTP200Page(w, base("Delete "+hyphaName+"?", templates.DeleteAskHTML(rq, hyphaName, isOld), u)) } -// handlerDeleteConfirm deletes a hypha for sure -func handlerDeleteConfirm(w http.ResponseWriter, rq *http.Request) { - log.Println(rq.URL) - var ( - hyphaName = HyphaNameFromRq(rq, "delete-confirm") - hyphaData, isOld = HyphaStorage[hyphaName] - u = user.FromRequest(rq) - ) - if !u.CanProceed("delete-confirm") { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a moderator to delete pages.") - log.Println("Rejected", rq.URL) - return - } - if !isOld { - // The precondition is to have the hypha in the first place. - HttpErr(w, http.StatusPreconditionFailed, hyphaName, - "Error: no such hypha", - "Could not delete this hypha because it does not exist.") - return - } - if hop := hyphaData.DeleteHypha(hyphaName, u); len(hop.Errs) != 0 { - HttpErr(w, http.StatusInternalServerError, hyphaName, - "Error: could not delete hypha", - fmt.Sprintf("Could not delete this hypha due to internal errors. Server errors: <code>%v</code>", hop.Errs)) - return - } - http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) -} +var handlerUnattachConfirm = factoryHandlerConfirmer( + "unattach-confirm", + func(h *hyphae.Hypha, u *user.User, _ *http.Request) (*history.HistoryOp, string) { + return h.UnattachHypha(u) + }, +) + +var handlerDeleteConfirm = factoryHandlerConfirmer( + "delete-confirm", + func(h *hyphae.Hypha, u *user.User, _ *http.Request) (*history.HistoryOp, string) { + return h.DeleteHypha(u) + }, +) + +var handlerRenameConfirm = factoryHandlerConfirmer( + "rename-confirm", + func(oldHypha *hyphae.Hypha, u *user.User, rq *http.Request) (*history.HistoryOp, string) { + var ( + newName = util.CanonicalName(rq.PostFormValue("new-name")) + recursive = rq.PostFormValue("recursive") == "true" + newHypha = hyphae.ByName(newName) + ) + return oldHypha.RenameHypha(newHypha, recursive, u) + }, +) // handlerEdit shows the edit form. It doesn't edit anything actually. func handlerEdit(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var ( - hyphaName = HyphaNameFromRq(rq, "edit") - hyphaData, isOld = HyphaStorage[hyphaName] - warning string - textAreaFill string - err error - u = user.FromRequest(rq) + hyphaName = HyphaNameFromRq(rq, "edit") + h = hyphae.ByName(hyphaName) + warning string + textAreaFill string + err error + u = user.FromRequest(rq) ) - if !u.CanProceed("edit") { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to edit pages.") - log.Println("Rejected", rq.URL) + if err, errtitle := h.CanEdit(u); err != nil { + HttpErr(w, http.StatusInternalServerError, hyphaName, + errtitle, + err.Error()) return } - if isOld { - textAreaFill, err = FetchTextPart(hyphaData) + if h.Exists { + textAreaFill, err = h.FetchTextPart() if err != nil { log.Println(err) - HttpErr(w, http.StatusInternalServerError, hyphaName, "Error", "Could not fetch text data") + HttpErr(w, http.StatusInternalServerError, hyphaName, + "Error", + "Could not fetch text data") return } } else { - warning = `<p>You are creating a new hypha.</p>` + warning = `<p class="warning warning_new-hypha">You are creating a new hypha.</p>` } - util.HTTP200Page(w, base("Edit "+hyphaName, templates.EditHTML(rq, hyphaName, textAreaFill, warning), u)) + util.HTTP200Page( + w, + base( + "Edit "+hyphaName, + templates.EditHTML(rq, hyphaName, textAreaFill, warning), + u)) } // handlerUploadText uploads a new text part for the hypha. @@ -208,62 +174,75 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var ( hyphaName = HyphaNameFromRq(rq, "upload-text") + h = hyphae.ByName(hyphaName) textData = rq.PostFormValue("text") action = rq.PostFormValue("action") u = user.FromRequest(rq) + hop *history.HistoryOp + errtitle string ) - if !u.CanProceed("upload-text") { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to edit pages.") - log.Println("Rejected", rq.URL) - return - } - if textData == "" { - HttpErr(w, http.StatusBadRequest, hyphaName, "Error", "No text data passed") + + if action != "Preview" { + hop, errtitle = h.UploadText([]byte(textData), u) + } + + if hop.HasErrors() { + HttpErr(w, http.StatusForbidden, hyphaName, + errtitle, + hop.FirstErrorText()) return } + if action == "Preview" { - util.HTTP200Page(w, base("Preview "+hyphaName, templates.PreviewHTML(rq, hyphaName, textData, "", markup.Doc(hyphaName, textData).AsHTML()), u)) - } else if hop := UploadText(hyphaName, textData, u); len(hop.Errs) != 0 { - HttpErr(w, http.StatusInternalServerError, hyphaName, "Error", hop.Errs[0].Error()) + util.HTTP200Page( + w, + base( + "Preview "+hyphaName, + templates.PreviewHTML( + rq, + hyphaName, + textData, + "", + markup.Doc(hyphaName, textData).AsHTML()), + u)) } else { - http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) + http.Redirect(w, rq, "/hypha/"+hyphaName, http.StatusSeeOther) } } // handlerUploadBinary uploads a new binary part for the hypha. func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) - var ( - hyphaName = HyphaNameFromRq(rq, "upload-binary") - u = user.FromRequest(rq) - ) - if !u.CanProceed("upload-binary") { - HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to upload attachments.") - log.Println("Rejected", rq.URL) - return - } - rq.ParseMultipartForm(10 << 20) // Set upload limit - file, handler, err := rq.FormFile("binary") - if file != nil { - defer file.Close() + var ( + hyphaName = HyphaNameFromRq(rq, "upload-binary") + h = hyphae.ByName(hyphaName) + u = user.FromRequest(rq) + file, handler, err = rq.FormFile("binary") + ) + if err, errtitle := h.CanAttach(err, u); err != nil { + HttpErr(w, http.StatusInternalServerError, hyphaName, + errtitle, + err.Error()) } // If file is not passed: if err != nil { - HttpErr(w, http.StatusBadRequest, hyphaName, "Error", "No binary data passed") return } // If file is passed: + if file != nil { + defer file.Close() + } var ( - mime = handler.Header.Get("Content-Type") - hop = UploadBinary(hyphaName, mime, file, u) + mime = handler.Header.Get("Content-Type") + hop, errtitle = h.UploadBinary(mime, file, u) ) - if len(hop.Errs) != 0 { - HttpErr(w, http.StatusInternalServerError, hyphaName, "Error", hop.Errs[0].Error()) + if hop.HasErrors() { + HttpErr(w, http.StatusInternalServerError, hyphaName, errtitle, hop.FirstErrorText()) return } - http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) + http.Redirect(w, rq, "/hypha/"+hyphaName, http.StatusSeeOther) } diff --git a/http_readers.go b/http_readers.go index 08a5057..0146c52 100644 --- a/http_readers.go +++ b/http_readers.go @@ -10,6 +10,7 @@ import ( "strings" "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/mimetype" "github.com/bouncepaw/mycorrhiza/templates" @@ -33,7 +34,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { shorterUrl = strings.TrimPrefix(rq.URL.Path, "/rev/") firstSlashIndex = strings.IndexRune(shorterUrl, '/') revHash = shorterUrl[:firstSlashIndex] - hyphaName = CanonicalName(shorterUrl[firstSlashIndex+1:]) + hyphaName = util.CanonicalName(shorterUrl[firstSlashIndex+1:]) contents = fmt.Sprintf(`<p>This hypha had no text at this revision.</p>`) TextPath = hyphaName + ".myco" textContents, err = history.FileAtRevision(TextPath, revHash) @@ -42,7 +43,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { if err == nil { contents = markup.Doc(hyphaName, textContents).AsHTML() } - treeHTML, _, _ := tree.Tree(hyphaName, IterateHyphaNamesWith) + treeHTML, _, _ := tree.Tree(hyphaName) page := templates.RevisionHTML( rq, hyphaName, @@ -60,10 +61,10 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { func handlerText(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) hyphaName := HyphaNameFromRq(rq, "text") - if data, ok := HyphaStorage[hyphaName]; ok { - log.Println("Serving", data.TextPath) + if h := hyphae.ByName(hyphaName); h.Exists { + log.Println("Serving", h.TextPath) w.Header().Set("Content-Type", "text/plain; charset=utf-8") - http.ServeFile(w, rq, data.TextPath) + http.ServeFile(w, rq, h.TextPath) } } @@ -71,10 +72,10 @@ func handlerText(w http.ResponseWriter, rq *http.Request) { func handlerBinary(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) hyphaName := HyphaNameFromRq(rq, "binary") - if data, ok := HyphaStorage[hyphaName]; ok { - log.Println("Serving", data.BinaryPath) - w.Header().Set("Content-Type", mimetype.FromExtension(filepath.Ext(data.BinaryPath))) - http.ServeFile(w, rq, data.BinaryPath) + if h := hyphae.ByName(hyphaName); h.Exists { + log.Println("Serving", h.BinaryPath) + w.Header().Set("Content-Type", mimetype.FromExtension(filepath.Ext(h.BinaryPath))) + http.ServeFile(w, rq, h.BinaryPath) } } @@ -82,26 +83,26 @@ func handlerBinary(w http.ResponseWriter, rq *http.Request) { func handlerHypha(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var ( - hyphaName = HyphaNameFromRq(rq, "page", "hypha") - data, hyphaExists = HyphaStorage[hyphaName] - hasAmnt = hyphaExists && data.BinaryPath != "" - contents string - openGraph string - u = user.FromRequest(rq) + hyphaName = HyphaNameFromRq(rq, "page", "hypha") + h = hyphae.ByName(hyphaName) + hasAmnt = h.Exists && h.BinaryPath != "" + contents string + openGraph string + u = user.FromRequest(rq) ) - if hyphaExists { - fileContentsT, errT := ioutil.ReadFile(data.TextPath) - _, errB := os.Stat(data.BinaryPath) + if h.Exists { + fileContentsT, errT := ioutil.ReadFile(h.TextPath) + _, errB := os.Stat(h.BinaryPath) if errT == nil { md := markup.Doc(hyphaName, string(fileContentsT)) contents = md.AsHTML() openGraph = md.OpenGraphHTML() } if !os.IsNotExist(errB) { - contents = binaryHtmlBlock(hyphaName, data) + contents + contents = h.BinaryHtmlBlock() + contents } } - treeHTML, prevHypha, nextHypha := tree.Tree(hyphaName, IterateHyphaNamesWith) + treeHTML, prevHypha, nextHypha := tree.Tree(hyphaName) util.HTTP200Page(w, templates.BaseHTML( util.BeautifulName(hyphaName), diff --git a/hypha.go b/hypha.go deleted file mode 100644 index b1437b6..0000000 --- a/hypha.go +++ /dev/null @@ -1,326 +0,0 @@ -package main - -import ( - "errors" - "fmt" - "io/ioutil" - "log" - "mime/multipart" - "os" - "path/filepath" - "regexp" - - "github.com/bouncepaw/mycorrhiza/history" - "github.com/bouncepaw/mycorrhiza/hyphae" - "github.com/bouncepaw/mycorrhiza/markup" - "github.com/bouncepaw/mycorrhiza/mimetype" - "github.com/bouncepaw/mycorrhiza/user" - "github.com/bouncepaw/mycorrhiza/util" -) - -func init() { - markup.HyphaExists = func(hyphaName string) bool { - _, hyphaExists := HyphaStorage[hyphaName] - return hyphaExists - } - markup.HyphaAccess = func(hyphaName string) (rawText, binaryBlock string, err error) { - if hyphaData, ok := HyphaStorage[hyphaName]; ok { - rawText, err = FetchTextPart(hyphaData) - if hyphaData.BinaryPath != "" { - binaryBlock = binaryHtmlBlock(hyphaName, hyphaData) - } - } else { - err = errors.New("Hypha " + hyphaName + " does not exist") - } - return - } - markup.HyphaIterate = IterateHyphaNamesWith - markup.HyphaImageForOG = func(hyphaName string) string { - if hd, isOld := GetHyphaData(hyphaName); isOld && hd.BinaryPath != "" { - return util.URL + "/binary/" + hyphaName - } - return util.URL + "/favicon.ico" - } -} - -// GetHyphaData finds a hypha addressed by `hyphaName` and returns its `hyphaData`. `hyphaData` is set to a zero value if this hypha does not exist. `isOld` is false if this hypha does not exist. -func GetHyphaData(hyphaName string) (hyphaData *HyphaData, isOld bool) { - hyphaData, isOld = HyphaStorage[hyphaName] - if hyphaData == nil { - hyphaData = &HyphaData{} - } - return -} - -// HyphaData represents a hypha's meta information: binary and text parts rooted paths and content types. -type HyphaData hyphae.Hypha - -// uploadHelp is a helper function for UploadText and UploadBinary -func uploadHelp(hop *history.HistoryOp, hyphaName, ext string, data []byte, u *user.User) *history.HistoryOp { - var ( - hyphaData, isOld = GetHyphaData(hyphaName) - fullPath = filepath.Join(WikiDir, hyphaName+ext) - originalFullPath = &hyphaData.TextPath - ) - if hop.Type == history.TypeEditBinary { - originalFullPath = &hyphaData.BinaryPath - } - - if err := os.MkdirAll(filepath.Dir(fullPath), 0777); err != nil { - return hop.WithError(err) - } - - if err := ioutil.WriteFile(fullPath, data, 0644); err != nil { - return hop.WithError(err) - } - - if isOld && *originalFullPath != fullPath && *originalFullPath != "" { - if err := history.Rename(*originalFullPath, fullPath); err != nil { - return hop.WithError(err) - } - log.Println("Move", *originalFullPath, "to", fullPath) - } - // New hyphae must be added to the hypha storage - if !isOld { - HyphaStorage[hyphaName] = hyphaData - hyphae.IncrementCount() - } - *originalFullPath = fullPath - if isOld && hop.Type == history.TypeEditText && !history.FileChanged(fullPath) { - return hop.Abort() - } - return hop.WithFiles(fullPath). - WithUser(u). - Apply() -} - -// UploadText loads a new text part from `textData` for hypha `hyphaName`. -func UploadText(hyphaName, textData string, u *user.User) *history.HistoryOp { - return uploadHelp( - history. - Operation(history.TypeEditText). - WithMsg(fmt.Sprintf("Edit ‘%s’", hyphaName)), - hyphaName, ".myco", []byte(textData), u) -} - -// UploadBinary loads a new binary part from `file` for hypha `hyphaName` with `hd`. The contents have the specified `mime` type. It must be marked if the hypha `isOld`. -func UploadBinary(hyphaName, mime string, file multipart.File, u *user.User) *history.HistoryOp { - var ( - hop = history.Operation(history.TypeEditBinary).WithMsg(fmt.Sprintf("Upload binary part for ‘%s’ with type ‘%s’", hyphaName, mime)) - data, err = ioutil.ReadAll(file) - ) - if err != nil { - return hop.WithError(err).Apply() - } - return uploadHelp(hop, hyphaName, mimetype.ToExtension(mime), data, u) -} - -// DeleteHypha deletes hypha and makes a history record about that. -func (hd *HyphaData) DeleteHypha(hyphaName string, u *user.User) *history.HistoryOp { - hop := history.Operation(history.TypeDeleteHypha). - WithFilesRemoved(hd.TextPath, hd.BinaryPath). - WithMsg(fmt.Sprintf("Delete ‘%s’", hyphaName)). - WithUser(u). - Apply() - if len(hop.Errs) == 0 { - delete(HyphaStorage, hyphaName) - hyphae.DecrementCount() - } - return hop -} - -// UnattachHypha unattaches hypha and makes a history record about that. -func (hd *HyphaData) UnattachHypha(hyphaName string, u *user.User) *history.HistoryOp { - hop := history.Operation(history.TypeUnattachHypha). - WithFilesRemoved(hd.BinaryPath). - WithMsg(fmt.Sprintf("Unattach ‘%s’", hyphaName)). - WithUser(u). - Apply() - if len(hop.Errs) == 0 { - hd, ok := HyphaStorage[hyphaName] - if ok { - if hd.BinaryPath != "" { - hd.BinaryPath = "" - } - // If nothing is left of the hypha - if hd.TextPath == "" { - delete(HyphaStorage, hyphaName) - hyphae.DecrementCount() - } - } - } - return hop -} - -func findHyphaeToRename(hyphaName string, recursive bool) []string { - hyphae := []string{hyphaName} - if recursive { - hyphae = append(hyphae, util.FindSubhyphae(hyphaName, IterateHyphaNamesWith)...) - } - return hyphae -} - -func renamingPairs(hyphaNames []string, replaceName func(string) string) (map[string]string, error) { - renameMap := make(map[string]string) - for _, hn := range hyphaNames { - if hd, ok := HyphaStorage[hn]; ok { - if _, nameUsed := HyphaStorage[replaceName(hn)]; nameUsed { - return nil, errors.New("Hypha " + replaceName(hn) + " already exists") - } - if hd.TextPath != "" { - renameMap[hd.TextPath] = replaceName(hd.TextPath) - } - if hd.BinaryPath != "" { - renameMap[hd.BinaryPath] = replaceName(hd.BinaryPath) - } - } - } - return renameMap, nil -} - -// word Data is plural here -func relocateHyphaData(hyphaNames []string, replaceName func(string) string) { - for _, hyphaName := range hyphaNames { - if hd, ok := HyphaStorage[hyphaName]; ok { - hd.TextPath = replaceName(hd.TextPath) - hd.BinaryPath = replaceName(hd.BinaryPath) - HyphaStorage[replaceName(hyphaName)] = hd - delete(HyphaStorage, hyphaName) - } - } -} - -// RenameHypha renames hypha from old name `hyphaName` to `newName` and makes a history record about that. If `recursive` is `true`, its subhyphae will be renamed the same way. -func RenameHypha(hyphaName, newName string, recursive bool, u *user.User) *history.HistoryOp { - var ( - re = regexp.MustCompile(`(?i)` + hyphaName) - replaceName = func(str string) string { - return re.ReplaceAllString(CanonicalName(str), newName) - } - hyphaNames = findHyphaeToRename(hyphaName, recursive) - renameMap, err = renamingPairs(hyphaNames, replaceName) - renameMsg = "Rename ‘%s’ to ‘%s’" - hop = history.Operation(history.TypeRenameHypha) - ) - if err != nil { - hop.Errs = append(hop.Errs, err) - return hop - } - if recursive { - renameMsg += " recursively" - } - hop.WithFilesRenamed(renameMap). - WithMsg(fmt.Sprintf(renameMsg, hyphaName, newName)). - WithUser(u). - Apply() - if len(hop.Errs) == 0 { - relocateHyphaData(hyphaNames, replaceName) - } - return hop -} - -// binaryHtmlBlock creates an html block for binary part of the hypha. -func binaryHtmlBlock(hyphaName string, hd *HyphaData) string { - switch filepath.Ext(hd.BinaryPath) { - case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico": - return fmt.Sprintf(` - <div class="binary-container binary-container_with-img"> - <a href="/binary/%[1]s"><img src="/binary/%[1]s"/></a> - </div>`, hyphaName) - case ".ogg", ".webm", ".mp4": - return fmt.Sprintf(` - <div class="binary-container binary-container_with-video"> - <video> - <source src="/binary/%[1]s"/> - <p>Your browser does not support video. See video's <a href="/binary/%[1]s">direct url</a></p> - </video> - `, hyphaName) - case ".mp3": - return fmt.Sprintf(` - <div class="binary-container binary-container_with-audio"> - <audio> - <source src="/binary/%[1]s"/> - <p>Your browser does not support audio. See audio's <a href="/binary/%[1]s">direct url</a></p> - </audio> - `, hyphaName) - default: - return fmt.Sprintf(` - <div class="binary-container binary-container_with-nothing"> - <p>This hypha's media cannot be rendered. <a href="/binary/%s">Download it</a></p> - </div> - `, hyphaName) - } -} - -// FetchTextPart tries to read text file in the `d`. If there is no file, empty string is returned. -func FetchTextPart(d *HyphaData) (string, error) { - if d.TextPath == "" { - return "", nil - } - _, err := os.Stat(d.TextPath) - if os.IsNotExist(err) { - return "", nil - } else if err != nil { - return "", err - } - text, err := ioutil.ReadFile(d.TextPath) - if err != nil { - return "", err - } - return string(text), nil -} - -func setHeaderLinks() { - if userLinksHypha, ok := GetHyphaData(util.HeaderLinksHypha); !ok { - util.SetDefaultHeaderLinks() - } else { - contents, err := ioutil.ReadFile(userLinksHypha.TextPath) - if err != nil || len(contents) == 0 { - util.SetDefaultHeaderLinks() - } else { - text := string(contents) - util.ParseHeaderLinks(text, markup.Rocketlink) - } - } -} - -func HyphaToTemporaryWorkaround(h *hyphae.Hypha) *HyphaData { - return &HyphaData{ - Name: h.Name, - TextPath: h.TextPath, - BinaryPath: h.BinaryPath, - } -} - -// MergeIn merges in content file paths from a different hypha object. Prints warnings sometimes. -func (h *HyphaData) MergeIn(oh *hyphae.Hypha) { - if h.TextPath == "" && oh.TextPath != "" { - h.TextPath = oh.TextPath - } - if oh.BinaryPath != "" { - if h.BinaryPath != "" { - log.Println("There is a file collision for binary part of a hypha:", h.BinaryPath, "and", oh.BinaryPath, "-- going on with the latter") - } - h.BinaryPath = oh.BinaryPath - } -} - -// Index finds all hypha files in the full `path` and saves them to HyphaStorage. This function is recursive. -func Index(path string) { - ch := make(chan *hyphae.Hypha, 5) - - go func() { - hyphae.Index(path, 0, ch) - close(ch) - }() - - for h := range ch { - if oldHypha, ok := HyphaStorage[h.Name]; ok { - oldHypha.MergeIn(h) - } else { - HyphaStorage[h.Name] = HyphaToTemporaryWorkaround(h) - hyphae.IncrementCount() - } - } - -} diff --git a/hyphae/delete.go b/hyphae/delete.go new file mode 100644 index 0000000..b5c7939 --- /dev/null +++ b/hyphae/delete.go @@ -0,0 +1,52 @@ +package hyphae + +import ( + "errors" + "fmt" + "log" + + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/user" +) + +func rejectDeleteLog(h *Hypha, u *user.User, errmsg string) { + log.Printf("Reject delete ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} + +// CanDelete checks if given user can delete given hypha. +func (h *Hypha) CanDelete(u *user.User) (err error, errtitle string) { + // First, check if can unattach at all + if !u.CanProceed("delete-confirm") { + rejectDeleteLog(h, u, "no rights") + return errors.New("Not enough rights to delete, you must be a moderator"), "Not enough rights" + } + + if !h.Exists { + rejectDeleteLog(h, u, "does not exist") + return errors.New("Cannot delete this hypha because it does not exist"), "Does not exist" + } + + return nil, "" +} + +// DeleteHypha deletes hypha and makes a history record about that. +func (h *Hypha) DeleteHypha(u *user.User) (hop *history.HistoryOp, errtitle string) { + h.Lock() + defer h.Unlock() + hop = history.Operation(history.TypeDeleteHypha) + + if err, errtitle := h.CanDelete(u); errtitle != "" { + hop.WithError(err) + return hop, errtitle + } + + hop. + WithFilesRemoved(h.TextPath, h.BinaryPath). + WithMsg(fmt.Sprintf("Delete ‘%s’", h.Name)). + WithUser(u). + Apply() + if len(hop.Errs) == 0 { + h.delete() + } + return hop, "" +} diff --git a/hyphae/files.go b/hyphae/files.go index 4c97a78..7a55090 100644 --- a/hyphae/files.go +++ b/hyphae/files.go @@ -9,8 +9,28 @@ import ( "github.com/bouncepaw/mycorrhiza/util" ) -// Index finds all hypha files in the full `path` and sends them to the channel. Handling of duplicate entries and attachment and counting them is up to the caller. -func Index(path string, nestLevel uint, ch chan *Hypha) { +// Index finds all hypha files in the full `path` and saves them to the hypha storage. +func Index(path string) { + ch := make(chan *Hypha, 5) + + go func(ch chan *Hypha) { + indexHelper(path, 0, ch) + close(ch) + }(ch) + + for h := range ch { + // At this time it is safe to ignore the mutex, because there is only one worker. + if oldHypha, ok := byNames[h.Name]; ok { + oldHypha.MergeIn(h) + } else { + byNames[h.Name] = h + IncrementCount() + } + } +} + +// indexHelper finds all hypha files in the full `path` and sends them to the channel. Handling of duplicate entries and attachment and counting them is up to the caller. +func indexHelper(path string, nestLevel uint, ch chan *Hypha) { nodes, err := ioutil.ReadDir(path) if err != nil { log.Fatal(err) @@ -22,14 +42,14 @@ func Index(path string, nestLevel uint, ch chan *Hypha) { util.IsCanonicalName(node.Name()) && node.Name() != ".git" && !(nestLevel == 0 && node.Name() == "static") { - Index(filepath.Join(path, node.Name()), nestLevel+1, ch) + indexHelper(filepath.Join(path, node.Name()), nestLevel+1, ch) continue } var ( hyphaPartPath = filepath.Join(path, node.Name()) hyphaName, isText, skip = mimetype.DataFromFilename(hyphaPartPath) - hypha = &Hypha{Name: hyphaName} + hypha = &Hypha{Name: hyphaName, Exists: true} ) if !skip { if isText { @@ -39,6 +59,5 @@ func Index(path string, nestLevel uint, ch chan *Hypha) { } ch <- hypha } - } } diff --git a/hyphae/hyphae.go b/hyphae/hyphae.go index 968d1e6..6fa5853 100644 --- a/hyphae/hyphae.go +++ b/hyphae/hyphae.go @@ -1,9 +1,47 @@ package hyphae import ( + "errors" + "log" + "regexp" + "strings" "sync" + + "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/util" ) +func init() { + markup.HyphaExists = func(hyphaName string) bool { + return ByName(hyphaName).Exists + } + markup.HyphaAccess = func(hyphaName string) (rawText, binaryBlock string, err error) { + if h := ByName(hyphaName); h.Exists { + rawText, err = h.FetchTextPart() + if h.BinaryPath != "" { + binaryBlock = h.BinaryHtmlBlock() + } + } else { + err = errors.New("Hypha " + hyphaName + " does not exist") + } + return + } + markup.HyphaIterate = func(λ func(string)) { + for h := range YieldExistingHyphae() { + λ(h.Name) + } + } + markup.HyphaImageForOG = func(hyphaName string) string { + if h := ByName(hyphaName); h.Exists && h.BinaryPath != "" { + return util.URL + "/binary/" + hyphaName + } + return util.URL + "/favicon.ico" + } +} + +// HyphaPattern is a pattern which all hyphae must match. +var HyphaPattern = regexp.MustCompile(`[^?!:#@><*|"\'&%{}]+`) + type Hypha struct { sync.RWMutex @@ -11,33 +49,125 @@ type Hypha struct { Exists bool TextPath string BinaryPath string - OutLinks []*Hypha - BackLinks []*Hypha + OutLinks []*Hypha // not used yet + BackLinks []*Hypha // not used yet } -/* -// Insert inserts the hypha into the mycelium. It overwrites the previous record, if there was any, and returns false. If the was no previous record, return true. +var byNames = make(map[string]*Hypha) +var byNamesMutex = sync.Mutex{} + +// YieldExistingHyphae iterates over all hyphae and yields all existing ones. +func YieldExistingHyphae() chan *Hypha { + ch := make(chan *Hypha) + go func(ch chan *Hypha) { + for _, h := range byNames { + if h.Exists { + ch <- h + } + } + close(ch) + }(ch) + return ch +} + +// Subhyphae returns slice of subhyphae. +func (h *Hypha) Subhyphae() []*Hypha { + hyphae := []*Hypha{} + for subh := range YieldExistingHyphae() { + if strings.HasPrefix(subh.Name, h.Name+"/") { + hyphae = append(hyphae, subh) + } + } + return hyphae +} + +// AreFreeNames checks if all given `hyphaNames` are not taken. +func AreFreeNames(hyphaNames ...string) (firstFailure string, ok bool) { + for h := range YieldExistingHyphae() { + for _, hn := range hyphaNames { + if hn == h.Name { + return hn, false + } + } + } + return "", true +} + +// EmptyHypha returns an empty hypha struct with given name. +func EmptyHypha(hyphaName string) *Hypha { + return &Hypha{ + Name: hyphaName, + Exists: false, + TextPath: "", + BinaryPath: "", + OutLinks: make([]*Hypha, 0), + BackLinks: make([]*Hypha, 0), + } +} + +// ByName returns a hypha by name. If h.Exists, the returned hypha pointer is known to be part of the hypha index (byNames map). +func ByName(hyphaName string) (h *Hypha) { + byNamesMutex.Lock() + defer byNamesMutex.Unlock() + + h, exists := byNames[hyphaName] + if exists { + return h + } + return EmptyHypha(hyphaName) +} + +// Insert inserts the hypha into the storage. It overwrites the previous record, if there was any, and returns false. If the was no previous record, return true. func (h *Hypha) Insert() (justCreated bool) { var hp *Hypha - hp, justCreated = ByName(h.Name) + hp = ByName(h.Name) - mycm.Lock() - defer mycm.Unlock() - if justCreated { - mycm.byNames[hp.Name] = h - } else { + byNamesMutex.Lock() + defer byNamesMutex.Unlock() + if hp.Exists { hp = h + } else { + byNames[hp.Name] = h } - return justCreated -}*/ + return !hp.Exists +} -// PhaseOut marks the hypha as non-existent. This is an idempotent operation. -func (h *Hypha) PhaseOut() { +func (h *Hypha) InsertIfNew() (justCreated bool) { + if h.Exists { + return h.Insert() + } + return false +} + +func (h *Hypha) delete() { + byNamesMutex.Lock() h.Lock() - h.Exists = false - h.OutLinks = make([]*Hypha, 0) - h.TextPath = "" - h.BinaryPath = "" + delete(byNames, h.Name) + DecrementCount() + byNamesMutex.Unlock() h.Unlock() } + +func (h *Hypha) renameTo(newName string) { + byNamesMutex.Lock() + h.Lock() + delete(byNames, h.Name) + h.Name = newName + byNames[h.Name] = h + byNamesMutex.Unlock() + h.Unlock() +} + +// MergeIn merges in content file paths from a different hypha object. Prints warnings sometimes. +func (h *Hypha) MergeIn(oh *Hypha) { + if h.TextPath == "" && oh.TextPath != "" { + h.TextPath = oh.TextPath + } + if oh.BinaryPath != "" { + if h.BinaryPath != "" { + log.Println("There is a file collision for binary part of a hypha:", h.BinaryPath, "and", oh.BinaryPath, "-- going on with the latter") + } + h.BinaryPath = oh.BinaryPath + } +} diff --git a/hyphae/rename.go b/hyphae/rename.go new file mode 100644 index 0000000..e0f7f1c --- /dev/null +++ b/hyphae/rename.go @@ -0,0 +1,122 @@ +package hyphae + +import ( + "errors" + "fmt" + "log" + "regexp" + + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/user" + "github.com/bouncepaw/mycorrhiza/util" +) + +func rejectRenameLog(h *Hypha, u *user.User, errmsg string) { + log.Printf("Reject rename ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} + +func (h *Hypha) CanRename(u *user.User) (err error, errtitle string) { + if !u.CanProceed("rename-confirm") { + rejectRenameLog(h, u, "no rights") + return errors.New("Not enough rights to rename, you must be a trusted editor"), "Not enough rights" + } + + if !h.Exists { + rejectRenameLog(h, u, "does not exist") + return errors.New("Cannot rename this hypha because it does not exist"), "Does not exist" + } + + return nil, "" +} + +func canRenameThisToThat(oh *Hypha, nh *Hypha, u *user.User) (err error, errtitle string) { + if nh.Exists { + rejectRenameLog(oh, u, fmt.Sprintf("name ‘%s’ taken already", nh.Name)) + return errors.New(fmt.Sprintf("Hypha named <a href='/hypha/%[1]s'>%[1]s</a> already exists, cannot rename", nh.Name)), "Name taken" + } + + if nh.Name == "" { + rejectRenameLog(oh, u, "no new name given") + return errors.New("No new name is given"), "No name given" + } + + if !HyphaPattern.MatchString(nh.Name) { + rejectRenameLog(oh, u, fmt.Sprintf("new name ‘%s’ invalid", nh.Name)) + return errors.New("Invalid new name. Names cannot contain characters <code>^?!:#@><*|\"\\'&%</code>"), "Invalid name" + } + + return nil, "" +} + +// RenameHypha renames hypha from old name `hyphaName` to `newName` and makes a history record about that. If `recursive` is `true`, its subhyphae will be renamed the same way. +func (h *Hypha) RenameHypha(newHypha *Hypha, recursive bool, u *user.User) (hop *history.HistoryOp, errtitle string) { + h.Lock() + defer h.Unlock() + newHypha.Lock() + defer newHypha.Unlock() + hop = history.Operation(history.TypeRenameHypha) + + if err, errtitle := h.CanRename(u); errtitle != "" { + hop.WithError(err) + return hop, errtitle + } + if err, errtitle := canRenameThisToThat(h, newHypha, u); errtitle != "" { + hop.WithError(err) + return hop, errtitle + } + + var ( + re = regexp.MustCompile(`(?i)` + h.Name) + replaceName = func(str string) string { + return re.ReplaceAllString(util.CanonicalName(str), newHypha.Name) + } + hyphaeToRename = findHyphaeToRename(h, recursive) + renameMap, err = renamingPairs(hyphaeToRename, replaceName) + renameMsg = "Rename ‘%s’ to ‘%s’" + ) + if err != nil { + hop.Errs = append(hop.Errs, err) + return hop, hop.FirstErrorText() + } + if recursive && len(hyphaeToRename) > 0 { + renameMsg += " recursively" + } + hop.WithFilesRenamed(renameMap). + WithMsg(fmt.Sprintf(renameMsg, h.Name, newHypha.Name)). + WithUser(u). + Apply() + if len(hop.Errs) == 0 { + for _, h := range hyphaeToRename { + h.renameTo(replaceName(h.Name)) + } + } + return hop, "" +} + +func findHyphaeToRename(superhypha *Hypha, recursive bool) []*Hypha { + hyphae := []*Hypha{superhypha} + if recursive { + hyphae = append(hyphae, superhypha.Subhyphae()...) + } + return hyphae +} + +func renamingPairs(hyphaeToRename []*Hypha, replaceName func(string) string) (map[string]string, error) { + renameMap := make(map[string]string) + newNames := make([]string, len(hyphaeToRename)) + for _, h := range hyphaeToRename { + h.RLock() + newNames = append(newNames, replaceName(h.Name)) + if h.TextPath != "" { + renameMap[h.TextPath] = replaceName(h.TextPath) + } + if h.BinaryPath != "" { + renameMap[h.BinaryPath] = replaceName(h.BinaryPath) + } + h.RUnlock() + } + if firstFailure, ok := AreFreeNames(newNames...); !ok { + return nil, errors.New("Hypha " + firstFailure + " already exists") + } + return renameMap, nil +} diff --git a/hyphae/unattach.go b/hyphae/unattach.go new file mode 100644 index 0000000..dab8dce --- /dev/null +++ b/hyphae/unattach.go @@ -0,0 +1,66 @@ +package hyphae + +import ( + "errors" + "fmt" + "log" + + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/user" +) + +func rejectUnattachLog(h *Hypha, u *user.User, errmsg string) { + log.Printf("Reject unattach ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} + +// CanUnattach checks if given user can unattach given hypha. If they can, `errtitle` is an empty string and `err` is nil. If they cannot, `errtitle` is not an empty string, and `err` is an error. +func (h *Hypha) CanUnattach(u *user.User) (err error, errtitle string) { + if !u.CanProceed("unattach-confirm") { + rejectUnattachLog(h, u, "no rights") + return errors.New("Not enough rights to unattach, you must be a trusted editor"), "Not enough rights" + } + + if !h.Exists { + rejectUnattachLog(h, u, "does not exist") + return errors.New("Cannot unattach this hypha because it does not exist"), "Does not exist" + } + + if h.BinaryPath == "" { + rejectUnattachLog(h, u, "no amnt") + return errors.New("Cannot unattach this hypha because it has no attachment"), "No attachment" + } + + return nil, "" +} + +// UnattachHypha unattaches hypha and makes a history record about that. +func (h *Hypha) UnattachHypha(u *user.User) (hop *history.HistoryOp, errtitle string) { + h.Lock() + defer h.Unlock() + hop = history.Operation(history.TypeUnattachHypha) + + if err, errtitle := h.CanUnattach(u); errtitle != "" { + hop.WithError(err) + return hop, errtitle + } + + hop. + WithFilesRemoved(h.BinaryPath). + WithMsg(fmt.Sprintf("Unattach ‘%s’", h.Name)). + WithUser(u). + Apply() + + if len(hop.Errs) > 0 { + rejectUnattachLog(h, u, "fail") + return hop.WithError(errors.New(fmt.Sprintf("Could not unattach this hypha due to internal server errors: <code>%v</code>", hop.Errs))), "Error" + } + + if h.BinaryPath != "" { + h.BinaryPath = "" + } + // If nothing is left of the hypha + if h.TextPath == "" { + h.delete() + } + return hop, "" +} diff --git a/hyphae/upload.go b/hyphae/upload.go new file mode 100644 index 0000000..c66d942 --- /dev/null +++ b/hyphae/upload.go @@ -0,0 +1,122 @@ +package hyphae + +import ( + "errors" + "fmt" + "io/ioutil" + "log" + "mime/multipart" + "os" + "path/filepath" + + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/mimetype" + "github.com/bouncepaw/mycorrhiza/user" + "github.com/bouncepaw/mycorrhiza/util" +) + +func rejectEditLog(h *Hypha, u *user.User, errmsg string) { + log.Printf("Reject edit ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} + +func rejectAttachLog(h *Hypha, u *user.User, errmsg string) { + log.Printf("Reject attach ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} + +func (h *Hypha) CanEdit(u *user.User) (err error, errtitle string) { + if !u.CanProceed("edit") { + rejectEditLog(h, u, "no rights") + return errors.New("You must be an editor to edit pages."), "Not enough rights" + } + return nil, "" +} + +func (h *Hypha) CanUploadThat(data []byte, u *user.User) (err error, errtitle string) { + if len(data) == 0 { + return errors.New("No text data passed"), "Empty" + } + return nil, "" +} + +func (h *Hypha) UploadText(textData []byte, u *user.User) (hop *history.HistoryOp, errtitle string) { + hop = history.Operation(history.TypeEditText) + if h.Exists { + hop.WithMsg(fmt.Sprintf("Edit ‘%s’", h.Name)) + } else { + hop.WithMsg(fmt.Sprintf("Create ‘%s’", h.Name)) + } + + if err, errtitle := h.CanEdit(u); err != nil { + return hop.WithError(err), errtitle + } + if err, errtitle := h.CanUploadThat(textData, u); err != nil { + return hop.WithError(err), errtitle + } + + return h.uploadHelp(hop, ".myco", textData, u) +} + +func (h *Hypha) CanAttach(err error, u *user.User) (error, string) { + if !u.CanProceed("upload-binary") { + rejectAttachLog(h, u, "no rights") + return errors.New("You must be an editor to upload attachments."), "Not enough rights" + } + + if err != nil { + rejectAttachLog(h, u, err.Error()) + return errors.New("No binary data passed"), err.Error() + } + return nil, "" +} + +func (h *Hypha) UploadBinary(mime string, file multipart.File, u *user.User) (*history.HistoryOp, string) { + var ( + hop = history.Operation(history.TypeEditBinary).WithMsg(fmt.Sprintf("Upload binary part for ‘%s’ with type ‘%s’", h.Name, mime)) + data, err = ioutil.ReadAll(file) + ) + + if err != nil { + return hop.WithError(err), err.Error() + } + if err, errtitle := h.CanEdit(u); err != nil { + return hop.WithError(err), errtitle + } + if err, errtitle := h.CanUploadThat(data, u); err != nil { + return hop.WithError(err), errtitle + } + + return h.uploadHelp(hop, mimetype.ToExtension(mime), data, u) +} + +// uploadHelp is a helper function for UploadText and UploadBinary +func (h *Hypha) uploadHelp(hop *history.HistoryOp, ext string, data []byte, u *user.User) (*history.HistoryOp, string) { + var ( + fullPath = filepath.Join(util.WikiDir, h.Name+ext) + originalFullPath = &h.TextPath + ) + if hop.Type == history.TypeEditBinary { + originalFullPath = &h.BinaryPath + } + + if err := os.MkdirAll(filepath.Dir(fullPath), 0777); err != nil { + return hop.WithError(err), err.Error() + } + + if err := ioutil.WriteFile(fullPath, data, 0644); err != nil { + return hop.WithError(err), err.Error() + } + + if h.Exists && *originalFullPath != fullPath && *originalFullPath != "" { + if err := history.Rename(*originalFullPath, fullPath); err != nil { + return hop.WithError(err), err.Error() + } + log.Println("Move", *originalFullPath, "to", fullPath) + } + + h.InsertIfNew() + *originalFullPath = fullPath + if h.Exists && hop.Type == history.TypeEditText && !history.FileChanged(fullPath) { + return hop.Abort(), "No changes" + } + return hop.WithFiles(fullPath).WithUser(u).Apply(), "" +} diff --git a/hyphae/view.go b/hyphae/view.go new file mode 100644 index 0000000..e53ab4f --- /dev/null +++ b/hyphae/view.go @@ -0,0 +1,72 @@ +package hyphae + +import ( + "fmt" + "io/ioutil" + "os" + "path/filepath" + + "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/util" +) + +// FetchTextPart tries to read text file of the given hypha. If there is no file, empty string is returned. +func (h *Hypha) FetchTextPart() (string, error) { + if h.TextPath == "" { + return "", nil + } + text, err := ioutil.ReadFile(h.TextPath) + if os.IsNotExist(err) { + return "", nil + } else if err != nil { + return "", err + } + return string(text), nil +} + +// binaryHtmlBlock creates an html block for binary part of the hypha. +func (h *Hypha) BinaryHtmlBlock() string { + switch filepath.Ext(h.BinaryPath) { + case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico": + return fmt.Sprintf(` + <div class="binary-container binary-container_with-img"> + <a href="/binary/%[1]s"><img src="/binary/%[1]s"/></a> + </div>`, h.Name) + case ".ogg", ".webm", ".mp4": + return fmt.Sprintf(` + <div class="binary-container binary-container_with-video"> + <video> + <source src="/binary/%[1]s"/> + <p>Your browser does not support video. <a href="/binary/%[1]s">Download video</a></p> + </video> + `, h.Name) + case ".mp3": + return fmt.Sprintf(` + <div class="binary-container binary-container_with-audio"> + <audio> + <source src="/binary/%[1]s"/> + <p>Your browser does not support audio. <a href="/binary/%[1]s">Download audio</a></p> + </audio> + `, h.Name) + default: + return fmt.Sprintf(` + <div class="binary-container binary-container_with-nothing"> + <p><a href="/binary/%s">Download media</a></p> + </div> + `, h.Name) + } +} + +func SetHeaderLinks() { + if userLinksHypha := ByName(util.HeaderLinksHypha); !userLinksHypha.Exists { + util.SetDefaultHeaderLinks() + } else { + contents, err := ioutil.ReadFile(userLinksHypha.TextPath) + if err != nil || len(contents) == 0 { + util.SetDefaultHeaderLinks() + } else { + text := string(contents) + util.ParseHeaderLinks(text, markup.Rocketlink) + } + } +} diff --git a/main.go b/main.go index d35420e..00e5346 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,6 @@ import ( "net/http" "os" "path/filepath" - "regexp" "strings" "github.com/bouncepaw/mycorrhiza/history" @@ -24,19 +23,6 @@ import ( // WikiDir is a rooted path to the wiki storage directory. var WikiDir string -// HyphaPattern is a pattern which all hyphae must match. -var HyphaPattern = regexp.MustCompile(`[^?!:#@><*|"\'&%{}]+`) - -// HyphaStorage is a mapping between canonical hypha names and their meta information. -var HyphaStorage = make(map[string]*HyphaData) - -// IterateHyphaNamesWith is a closure to be passed to subpackages to let them iterate all hypha names read-only. -func IterateHyphaNamesWith(f func(string)) { - for hyphaName := range HyphaStorage { - f(hyphaName) - } -} - // HttpErr is used by many handlers to signal errors in a compact way. func HttpErr(w http.ResponseWriter, status int, name, title, errMsg string) { log.Println(errMsg, "for", name) @@ -64,8 +50,8 @@ func handlerList(w http.ResponseWriter, rq *http.Request) { pageCount = hyphae.Count() u = user.FromRequest(rq) ) - for hyphaName, data := range HyphaStorage { - tbody += templates.HyphaListRowHTML(hyphaName, mimetype.FromExtension(filepath.Ext(data.BinaryPath)), data.BinaryPath != "") + for h := range hyphae.YieldExistingHyphae() { + tbody += templates.HyphaListRowHTML(h.Name, mimetype.FromExtension(filepath.Ext(h.BinaryPath)), h.BinaryPath != "") } util.HTTP200Page(w, base("List of pages", templates.HyphaListHTML(tbody, pageCount), u)) } @@ -82,10 +68,9 @@ func handlerReindex(w http.ResponseWriter, rq *http.Request) { return } hyphae.ResetCount() - HyphaStorage = make(map[string]*HyphaData) log.Println("Wiki storage directory is", WikiDir) log.Println("Start indexing hyphae...") - Index(WikiDir) + hyphae.Index(WikiDir) log.Println("Indexed", hyphae.Count(), "hyphae") http.Redirect(w, rq, "/", http.StatusSeeOther) } @@ -98,7 +83,7 @@ func handlerUpdateHeaderLinks(w http.ResponseWriter, rq *http.Request) { log.Println("Rejected", rq.URL) return } - setHeaderLinks() + hyphae.SetHeaderLinks() http.Redirect(w, rq, "/", http.StatusSeeOther) } @@ -107,14 +92,13 @@ func handlerRandom(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var randomHyphaName string i := rand.Intn(hyphae.Count()) - for hyphaName := range HyphaStorage { + for h := range hyphae.YieldExistingHyphae() { if i == 0 { - randomHyphaName = hyphaName - break + randomHyphaName = h.Name } i-- } - http.Redirect(w, rq, "/page/"+randomHyphaName, http.StatusSeeOther) + http.Redirect(w, rq, "/hypha/"+randomHyphaName, http.StatusSeeOther) } func handlerStyle(w http.ResponseWriter, rq *http.Request) { @@ -187,11 +171,11 @@ func main() { log.Fatal(err) } log.Println("Wiki storage directory is", WikiDir) - Index(WikiDir) + hyphae.Index(WikiDir) log.Println("Indexed", hyphae.Count(), "hyphae") history.Start(WikiDir) - setHeaderLinks() + hyphae.SetHeaderLinks() go handleGemini() @@ -212,7 +196,7 @@ func main() { http.HandleFunc("/static/common.css", handlerStyle) http.HandleFunc("/static/icon/", handlerIcon) http.HandleFunc("/", func(w http.ResponseWriter, rq *http.Request) { - http.Redirect(w, rq, "/page/"+util.HomePage, http.StatusSeeOther) + http.Redirect(w, rq, "/hypha/"+util.HomePage, http.StatusSeeOther) }) http.HandleFunc("/robots.txt", handlerRobotsTxt) log.Fatal(http.ListenAndServe("0.0.0.0:"+util.ServerPort, nil)) diff --git a/name.go b/name.go index b3a296b..e81a25b 100644 --- a/name.go +++ b/name.go @@ -11,23 +11,13 @@ import ( "github.com/bouncepaw/mycorrhiza/util" ) -// isCanonicalName checks if the `name` is canonical. -func isCanonicalName(name string) bool { - return HyphaPattern.MatchString(name) -} - -// CanonicalName makes sure the `name` is canonical. A name is canonical if it is lowercase and all spaces are replaced with underscores. -func CanonicalName(name string) string { - return strings.ToLower(strings.ReplaceAll(name, " ", "_")) -} - // naviTitle turns `canonicalName` into html string with each hypha path parts higlighted as links. // TODO: rework as a template func naviTitle(canonicalName string) string { var ( html = fmt.Sprintf(`<h1 class="navi-title" id="navi-title"> - <a href="/page/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:</span>`, util.HomePage, util.SiteNavIcon) - prevAcc = `/page/` + <a href="/hypha/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:</span>`, util.HomePage, util.SiteNavIcon) + prevAcc = `/hypha/` parts = strings.Split(canonicalName, "/") rel = "up" ) diff --git a/tree/tree.go b/tree/tree.go index 45046db..1c6ccb3 100644 --- a/tree/tree.go +++ b/tree/tree.go @@ -6,6 +6,7 @@ import ( "sort" "strings" + "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/util" ) @@ -81,21 +82,21 @@ func mainFamilyFromPool(hyphaName string, subhyphaePool map[string]bool) *mainFa } // Tree generates a tree for `hyphaName` as html and returns next and previous hyphae if any. -func Tree(hyphaName string, hyphaIterator func(func(string))) (html, prev, next string) { +func Tree(hyphaName string) (html, prev, next string) { var ( // One of the siblings is the hypha with name `hyphaName` - siblings = findSiblings(hyphaName, hyphaIterator) + siblings = findSiblings(hyphaName) subhyphaePool = make(map[string]bool) I int ) - hyphaIterator(func(otherHyphaName string) { + for h := range hyphae.YieldExistingHyphae() { for _, s := range siblings { - s.checkThisChild(otherHyphaName) + s.checkThisChild(h.Name) } - if strings.HasPrefix(otherHyphaName, hyphaName+"/") { - subhyphaePool[otherHyphaName] = true + if strings.HasPrefix(h.Name, hyphaName+"/") { + subhyphaePool[h.Name] = true } - }) + } for i, s := range siblings { if s.name == hyphaName { I = i @@ -116,13 +117,13 @@ func Tree(hyphaName string, hyphaIterator func(func(string))) (html, prev, next return fmt.Sprintf(`<ul class="navitree">%s</ul>`, html), prev, next } -func findSiblings(hyphaName string, hyphaIterator func(func(string))) []*sibling { +func findSiblings(hyphaName string) []*sibling { siblings := []*sibling{&sibling{name: hyphaName, hasChildren: true}} - hyphaIterator(func(otherHyphaName string) { - if path.Dir(hyphaName) == path.Dir(otherHyphaName) && hyphaName != otherHyphaName { - siblings = append(siblings, &sibling{name: otherHyphaName, hasChildren: false}) + for h := range hyphae.YieldExistingHyphae() { + if path.Dir(hyphaName) == path.Dir(h.Name) && hyphaName != h.Name { + siblings = append(siblings, &sibling{name: h.Name, hasChildren: false}) } - }) + } sort.Slice(siblings, func(i, j int) bool { return siblings[i].name < siblings[j].name }) diff --git a/util/util.go b/util/util.go index 108fa05..d7b90a4 100644 --- a/util/util.go +++ b/util/util.go @@ -41,17 +41,6 @@ func HTTP200Page(w http.ResponseWriter, page string) { w.Write([]byte(page)) } -// FindSubhyphae finds names of existing hyphae given the `hyphaIterator`. -func FindSubhyphae(hyphaName string, hyphaIterator func(func(string))) []string { - subhyphae := make([]string, 0) - hyphaIterator(func(otherHyphaName string) { - if strings.HasPrefix(otherHyphaName, hyphaName+"/") { - subhyphae = append(subhyphae, otherHyphaName) - } - }) - return subhyphae -} - func RandomString(n int) (string, error) { bytes := make([]byte, n) if _, err := rand.Read(bytes); err != nil { From c7024da735022d5cc1adfeb7c5831313b17ce481 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Thu, 18 Feb 2021 11:21:38 +0500 Subject: [PATCH 22/53] Fix the locking bug with CRUD operations --- http_mutators.go | 2 +- hyphae/delete.go | 2 -- hyphae/rename.go | 2 -- hyphae/unattach.go | 2 -- name.go | 3 +-- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/http_mutators.go b/http_mutators.go index e4d6bdb..139a0d5 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -92,7 +92,7 @@ func factoryHandlerConfirmer( return func(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var ( - hyphaName = HyphaNameFromRq(rq, "unattach-confirm") + hyphaName = HyphaNameFromRq(rq, actionPath) h = hyphae.ByName(hyphaName) u = user.FromRequest(rq) ) diff --git a/hyphae/delete.go b/hyphae/delete.go index b5c7939..3ca6aac 100644 --- a/hyphae/delete.go +++ b/hyphae/delete.go @@ -31,8 +31,6 @@ func (h *Hypha) CanDelete(u *user.User) (err error, errtitle string) { // DeleteHypha deletes hypha and makes a history record about that. func (h *Hypha) DeleteHypha(u *user.User) (hop *history.HistoryOp, errtitle string) { - h.Lock() - defer h.Unlock() hop = history.Operation(history.TypeDeleteHypha) if err, errtitle := h.CanDelete(u); errtitle != "" { diff --git a/hyphae/rename.go b/hyphae/rename.go index e0f7f1c..deb9881 100644 --- a/hyphae/rename.go +++ b/hyphae/rename.go @@ -50,8 +50,6 @@ func canRenameThisToThat(oh *Hypha, nh *Hypha, u *user.User) (err error, errtitl // RenameHypha renames hypha from old name `hyphaName` to `newName` and makes a history record about that. If `recursive` is `true`, its subhyphae will be renamed the same way. func (h *Hypha) RenameHypha(newHypha *Hypha, recursive bool, u *user.User) (hop *history.HistoryOp, errtitle string) { - h.Lock() - defer h.Unlock() newHypha.Lock() defer newHypha.Unlock() hop = history.Operation(history.TypeRenameHypha) diff --git a/hyphae/unattach.go b/hyphae/unattach.go index dab8dce..75c7baa 100644 --- a/hyphae/unattach.go +++ b/hyphae/unattach.go @@ -35,8 +35,6 @@ func (h *Hypha) CanUnattach(u *user.User) (err error, errtitle string) { // UnattachHypha unattaches hypha and makes a history record about that. func (h *Hypha) UnattachHypha(u *user.User) (hop *history.HistoryOp, errtitle string) { - h.Lock() - defer h.Unlock() hop = history.Operation(history.TypeUnattachHypha) if err, errtitle := h.CanUnattach(u); errtitle != "" { diff --git a/name.go b/name.go index e81a25b..739c166 100644 --- a/name.go +++ b/name.go @@ -47,8 +47,7 @@ func HyphaNameFromRq(rq *http.Request, actions ...string) string { return util.CanonicalName(strings.TrimPrefix(p, "/"+action+"/")) } } - log.Fatal("HyphaNameFromRq: no matching action passed") - return "" + panic("HyphaNameFromRq: no matching action passed") } // geminiHyphaNameFromRq extracts hypha name from gemini request. You have to also pass the action which is embedded in the url or several actions. For url /hypha/hypha, the action would be "hypha". From 77688b38699a74dff12ec0813e680b22e3786fb9 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Thu, 18 Feb 2021 12:12:57 +0500 Subject: [PATCH 23/53] Fix a bug related to hyphae that have amnts but no text --- hyphae/hyphae.go | 12 +++++------- hyphae/upload.go | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/hyphae/hyphae.go b/hyphae/hyphae.go index 6fa5853..8db893d 100644 --- a/hyphae/hyphae.go +++ b/hyphae/hyphae.go @@ -107,9 +107,6 @@ func EmptyHypha(hyphaName string) *Hypha { // ByName returns a hypha by name. If h.Exists, the returned hypha pointer is known to be part of the hypha index (byNames map). func ByName(hyphaName string) (h *Hypha) { - byNamesMutex.Lock() - defer byNamesMutex.Unlock() - h, exists := byNames[hyphaName] if exists { return h @@ -119,22 +116,23 @@ func ByName(hyphaName string) (h *Hypha) { // Insert inserts the hypha into the storage. It overwrites the previous record, if there was any, and returns false. If the was no previous record, return true. func (h *Hypha) Insert() (justCreated bool) { - var hp *Hypha - hp = ByName(h.Name) + hp := ByName(h.Name) byNamesMutex.Lock() defer byNamesMutex.Unlock() if hp.Exists { hp = h } else { - byNames[hp.Name] = h + h.Exists = true + byNames[h.Name] = h + IncrementCount() } return !hp.Exists } func (h *Hypha) InsertIfNew() (justCreated bool) { - if h.Exists { + if !h.Exists { return h.Insert() } return false diff --git a/hyphae/upload.go b/hyphae/upload.go index c66d942..fcf2905 100644 --- a/hyphae/upload.go +++ b/hyphae/upload.go @@ -114,9 +114,9 @@ func (h *Hypha) uploadHelp(hop *history.HistoryOp, ext string, data []byte, u *u } h.InsertIfNew() - *originalFullPath = fullPath - if h.Exists && hop.Type == history.TypeEditText && !history.FileChanged(fullPath) { + if h.Exists && h.TextPath != "" && hop.Type == history.TypeEditText && !history.FileChanged(fullPath) { return hop.Abort(), "No changes" } + *originalFullPath = fullPath return hop.WithFiles(fullPath).WithUser(u).Apply(), "" } From 58ed6ecdfb87369f3c91dc9cfe96d8941e14f9f3 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Thu, 18 Feb 2021 19:50:37 +0500 Subject: [PATCH 24/53] Add /admin/shutdown --- main.go | 11 +++++++++++ user/user.go | 1 + 2 files changed, 12 insertions(+) diff --git a/main.go b/main.go index 00e5346..a19fd18 100644 --- a/main.go +++ b/main.go @@ -75,6 +75,14 @@ func handlerReindex(w http.ResponseWriter, rq *http.Request) { http.Redirect(w, rq, "/", http.StatusSeeOther) } +// Stop the wiki +func handlerAdminShutdown(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + if user.CanProceed(rq, "admin/shutdown") { + log.Fatal("An admin commanded the wiki to shutdown") + } +} + // Update header links by reading the configured hypha, if there is any, or resorting to default values. func handlerUpdateHeaderLinks(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) @@ -195,6 +203,9 @@ func main() { }) http.HandleFunc("/static/common.css", handlerStyle) http.HandleFunc("/static/icon/", handlerIcon) + if user.AuthUsed { + http.HandleFunc("/admin/shutdown", handlerAdminShutdown) + } http.HandleFunc("/", func(w http.ResponseWriter, rq *http.Request) { http.Redirect(w, rq, "/hypha/"+util.HomePage, http.StatusSeeOther) }) diff --git a/user/user.go b/user/user.go index efc0028..aa7a74c 100644 --- a/user/user.go +++ b/user/user.go @@ -26,6 +26,7 @@ var minimalRights = map[string]int{ "delete-ask": 3, "delete-confirm": 3, "reindex": 4, + "admin/shutdown": 4, } // Group — Right From 9d89923ee519f1a4edc3d6c40a906b57f4e0b5be Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Thu, 18 Feb 2021 20:16:15 +0500 Subject: [PATCH 25/53] Implement the admin panel and fix a bug with /reindex --- http_admin.go | 33 +++++++++++++++++ hyphae/files.go | 3 ++ main.go | 13 ++----- templates/admin.qtpl | 30 ++++++++++++++++ templates/admin.qtpl.go | 80 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 10 deletions(-) create mode 100644 http_admin.go create mode 100644 templates/admin.qtpl create mode 100644 templates/admin.qtpl.go diff --git a/http_admin.go b/http_admin.go new file mode 100644 index 0000000..cd3675d --- /dev/null +++ b/http_admin.go @@ -0,0 +1,33 @@ +package main + +import ( + "log" + "net/http" + + "github.com/bouncepaw/mycorrhiza/templates" + "github.com/bouncepaw/mycorrhiza/user" +) + +// This is not init(), because user.AuthUsed is not set at init-stage. +func initAdmin() { + if user.AuthUsed { + http.HandleFunc("/admin", handlerAdmin) + http.HandleFunc("/admin/shutdown", handlerAdminShutdown) + } +} + +func handlerAdmin(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + if user.CanProceed(rq, "admin") { + w.Header().Set("Content-Type", "text/html;charset=utf-8") + w.WriteHeader(http.StatusOK) + w.Write([]byte(base("Admin panel", templates.AdminPanelHTML(), user.FromRequest(rq)))) + } +} + +func handlerAdminShutdown(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + if user.CanProceed(rq, "admin/shutdown") && rq.Method == "POST" { + log.Fatal("An admin commanded the wiki to shutdown") + } +} diff --git a/hyphae/files.go b/hyphae/files.go index 7a55090..56ccda5 100644 --- a/hyphae/files.go +++ b/hyphae/files.go @@ -11,6 +11,9 @@ import ( // Index finds all hypha files in the full `path` and saves them to the hypha storage. func Index(path string) { + byNamesMutex.Lock() + defer byNamesMutex.Unlock() + byNames = make(map[string]*Hypha) ch := make(chan *Hypha, 5) go func(ch chan *Hypha) { diff --git a/main.go b/main.go index a19fd18..e667d8f 100644 --- a/main.go +++ b/main.go @@ -76,12 +76,6 @@ func handlerReindex(w http.ResponseWriter, rq *http.Request) { } // Stop the wiki -func handlerAdminShutdown(w http.ResponseWriter, rq *http.Request) { - log.Println(rq.URL) - if user.CanProceed(rq, "admin/shutdown") { - log.Fatal("An admin commanded the wiki to shutdown") - } -} // Update header links by reading the configured hypha, if there is any, or resorting to default values. func handlerUpdateHeaderLinks(w http.ResponseWriter, rq *http.Request) { @@ -187,6 +181,8 @@ func main() { go handleGemini() + // See http_admin.go for /admin, /admin/* + initAdmin() // See http_readers.go for /page/, /hypha/, /text/, /binary/ // See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/, /unattach-ask/, /unattach-confirm/ // See http_auth.go for /login, /login-data, /logout, /logout-confirm @@ -203,12 +199,9 @@ func main() { }) http.HandleFunc("/static/common.css", handlerStyle) http.HandleFunc("/static/icon/", handlerIcon) - if user.AuthUsed { - http.HandleFunc("/admin/shutdown", handlerAdminShutdown) - } + http.HandleFunc("/robots.txt", handlerRobotsTxt) http.HandleFunc("/", func(w http.ResponseWriter, rq *http.Request) { http.Redirect(w, rq, "/hypha/"+util.HomePage, http.StatusSeeOther) }) - http.HandleFunc("/robots.txt", handlerRobotsTxt) log.Fatal(http.ListenAndServe("0.0.0.0:"+util.ServerPort, nil)) } diff --git a/templates/admin.qtpl b/templates/admin.qtpl new file mode 100644 index 0000000..8932da7 --- /dev/null +++ b/templates/admin.qtpl @@ -0,0 +1,30 @@ +{% func AdminPanelHTML() %} +<div class="layout"> +<main class="main-width"> + <h1>Admininstrative functions</h1> + <section> + <h2>Safe things</h2> + <ul> + <li><a href="/about">About this wiki<a></li> + <li><a href="/user-list">User list</a></li> + <li><a href="/update-header-links">Update header links</a></li> + </ul> + </section> + <section> + <h2>Dangerous things</h2> + <form action="/admin/shutdown" method="POST" style="float:left"> + <fieldset> + <legend>Shutdown wiki</legend> + <input type="submit"> + </fieldset> + </form> + <form action="/reindex" method="GET" style="float:left"> + <fieldset> + <legend>Reindex hyphae</legend> + <input type="submit"> + </fieldset> + </form> + </section> +</main> +</div> +{% endfunc %} diff --git a/templates/admin.qtpl.go b/templates/admin.qtpl.go new file mode 100644 index 0000000..c017c8d --- /dev/null +++ b/templates/admin.qtpl.go @@ -0,0 +1,80 @@ +// Code generated by qtc from "admin.qtpl". DO NOT EDIT. +// See https://github.com/valyala/quicktemplate for details. + +//line templates/admin.qtpl:1 +package templates + +//line templates/admin.qtpl:1 +import ( + qtio422016 "io" + + qt422016 "github.com/valyala/quicktemplate" +) + +//line templates/admin.qtpl:1 +var ( + _ = qtio422016.Copy + _ = qt422016.AcquireByteBuffer +) + +//line templates/admin.qtpl:1 +func StreamAdminPanelHTML(qw422016 *qt422016.Writer) { +//line templates/admin.qtpl:1 + qw422016.N().S(` +<div class="layout"> +<main class="main-width"> + <h1>Admininstrative functions</h1> + <section> + <h2>Safe things</h2> + <ul> + <li><a href="/about">About this wiki<a></li> + <li><a href="/user-list">User list</a></li> + <li><a href="/update-header-links">Update header links</a></li> + </ul> + </section> + <section> + <h2>Dangerous things</h2> + <form action="/admin/shutdown" method="POST" style="float:left"> + <fieldset> + <legend>Shutdown wiki</legend> + <input type="submit"> + </fieldset> + </form> + <form action="/reindex" method="GET" style="float:left"> + <fieldset> + <legend>Reindex hyphae</legend> + <input type="submit"> + </fieldset> + </form> + </section> +</main> +</div> +`) +//line templates/admin.qtpl:30 +} + +//line templates/admin.qtpl:30 +func WriteAdminPanelHTML(qq422016 qtio422016.Writer) { +//line templates/admin.qtpl:30 + qw422016 := qt422016.AcquireWriter(qq422016) +//line templates/admin.qtpl:30 + StreamAdminPanelHTML(qw422016) +//line templates/admin.qtpl:30 + qt422016.ReleaseWriter(qw422016) +//line templates/admin.qtpl:30 +} + +//line templates/admin.qtpl:30 +func AdminPanelHTML() string { +//line templates/admin.qtpl:30 + qb422016 := qt422016.AcquireByteBuffer() +//line templates/admin.qtpl:30 + WriteAdminPanelHTML(qb422016) +//line templates/admin.qtpl:30 + qs422016 := string(qb422016.B) +//line templates/admin.qtpl:30 + qt422016.ReleaseByteBuffer(qb422016) +//line templates/admin.qtpl:30 + return qs422016 +//line templates/admin.qtpl:30 +} From d9cc757546d5f5ffd5710b09811931335cce5cdd Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Fri, 19 Feb 2021 14:23:57 +0500 Subject: [PATCH 26/53] Find backlinks on wiki start --- http_readers.go | 1 + hyphae/backlink.go | 72 +++++++++++++++++++++++++++++++++++++++ hyphae/hyphae.go | 34 +++++++++++++++--- main.go | 2 ++ markup/lexer.go | 2 +- markup/outlink.go | 56 ++++++++++++++++++++++++++++++ templates/common.qtpl | 13 ++++++- templates/common.qtpl.go | 48 +++++++++++++++++++++++++- templates/readers.qtpl | 3 +- templates/readers.qtpl.go | 41 ++++++++++++---------- 10 files changed, 246 insertions(+), 26 deletions(-) create mode 100644 hyphae/backlink.go create mode 100644 markup/outlink.go diff --git a/http_readers.go b/http_readers.go index 0146c52..3153f4d 100644 --- a/http_readers.go +++ b/http_readers.go @@ -110,6 +110,7 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { naviTitle(hyphaName), contents, treeHTML, + h.BackLinkEntriesHTML(), prevHypha, nextHypha, hasAmnt), u, diff --git a/hyphae/backlink.go b/hyphae/backlink.go new file mode 100644 index 0000000..21c79ad --- /dev/null +++ b/hyphae/backlink.go @@ -0,0 +1,72 @@ +package hyphae + +import ( + "fmt" + "io/ioutil" + + "github.com/bouncepaw/mycorrhiza/link" + "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/util" +) + +func (h *Hypha) BackLinkEntriesHTML() (html string) { + for _, backlinkHypha := range h.BackLinks { + _ = link.Link{} + html += fmt.Sprintf(`<li class="backlinks__entry"> + <a class="backlinks__link" href="/hypha/%s">%s</a>`, backlinkHypha.Name, util.BeautifulName(backlinkHypha.Name)) + } + return +} + +func (h *Hypha) outlinksThis(oh *Hypha) bool { + for _, outlink := range h.OutLinks { + if outlink == oh { + return true + } + } + return false +} + +func (h *Hypha) backlinkedBy(oh *Hypha) bool { + for _, backlink := range h.BackLinks { + if backlink == oh { + return true + } + } + return false +} + +// FindAllBacklinks iterates over all hyphae that have text parts, sets their outlinks and then sets backlinks. +func FindAllBacklinks() { + for h := range FilterTextHyphae(YieldExistingHyphae()) { + findBacklinkWorker(h) + } +} + +func findBacklinkWorker(h *Hypha) { + h.Lock() + defer h.Unlock() + + textContents, err := ioutil.ReadFile(h.TextPath) + if err == nil { + for outlink := range markup.Doc(h.Name, string(textContents)).OutLinks() { + outlink := outlink + outlinkHypha := ByName(outlink) + if outlinkHypha == h { + continue + } + + outlinkHypha.Lock() + if !outlinkHypha.backlinkedBy(h) { + outlinkHypha.BackLinks = append(outlinkHypha.BackLinks, h) + outlinkHypha.InsertIfNewKeepExistence() + } + outlinkHypha.Unlock() + + // Insert outlinkHypha if unique + if !h.outlinksThis(outlinkHypha) { + h.OutLinks = append(h.OutLinks, outlinkHypha) + } + } + } +} diff --git a/hyphae/hyphae.go b/hyphae/hyphae.go index 8db893d..1c4496c 100644 --- a/hyphae/hyphae.go +++ b/hyphae/hyphae.go @@ -49,8 +49,8 @@ type Hypha struct { Exists bool TextPath string BinaryPath string - OutLinks []*Hypha // not used yet - BackLinks []*Hypha // not used yet + OutLinks []*Hypha + BackLinks []*Hypha } var byNames = make(map[string]*Hypha) @@ -59,17 +59,31 @@ var byNamesMutex = sync.Mutex{} // YieldExistingHyphae iterates over all hyphae and yields all existing ones. func YieldExistingHyphae() chan *Hypha { ch := make(chan *Hypha) - go func(ch chan *Hypha) { + go func() { for _, h := range byNames { if h.Exists { ch <- h } } close(ch) - }(ch) + }() return ch } +// FilterTextHyphae filters the source channel and yields only those hyphae than have text parts. +func FilterTextHyphae(src chan *Hypha) chan *Hypha { + sink := make(chan *Hypha) + go func() { + for h := range src { + if h.TextPath != "" { + sink <- h + } + } + close(sink) + }() + return sink +} + // Subhyphae returns slice of subhyphae. func (h *Hypha) Subhyphae() []*Hypha { hyphae := []*Hypha{} @@ -138,6 +152,18 @@ func (h *Hypha) InsertIfNew() (justCreated bool) { return false } +func (h *Hypha) InsertIfNewKeepExistence() { + hp := ByName(h.Name) + + byNamesMutex.Lock() + defer byNamesMutex.Unlock() + if hp.Exists { + hp = h + } else { + byNames[h.Name] = h + } +} + func (h *Hypha) delete() { byNamesMutex.Lock() h.Lock() diff --git a/main.go b/main.go index e667d8f..9e7ce22 100644 --- a/main.go +++ b/main.go @@ -175,6 +175,8 @@ func main() { log.Println("Wiki storage directory is", WikiDir) hyphae.Index(WikiDir) log.Println("Indexed", hyphae.Count(), "hyphae") + hyphae.FindAllBacklinks() + log.Println("Found all backlinks") history.Start(WikiDir) hyphae.SetHeaderLinks() diff --git a/markup/lexer.go b/markup/lexer.go index 4516eb0..607393f 100644 --- a/markup/lexer.go +++ b/markup/lexer.go @@ -166,7 +166,7 @@ launchpadState: switch { case startsWith("=>"): href, text, class := Rocketlink(line, state.name) - state.buf += fmt.Sprintf(` <li class="launchpad__entry"><a class="rocketlink %s" href="%s">%s</a></li>`, class, href, text) + state.buf += fmt.Sprintf(` <li class="launchpad__entry"><a href="%s" class="rocketlink %s">%s</a></li>`, href, class, text) case startsWith("```"): state.where = "pre" addLine(state.buf + "</ul>") diff --git a/markup/outlink.go b/markup/outlink.go new file mode 100644 index 0000000..0580371 --- /dev/null +++ b/markup/outlink.go @@ -0,0 +1,56 @@ +package markup + +import ( + "regexp" + "strings" + + "github.com/bouncepaw/mycorrhiza/link" +) + +// OutLinks returns a channel of names of hyphae this mycodocument links. +// Links include: +// * Regular links +// * Rocketlinks +// * Transclusion +// * Image galleries +func (md *MycoDoc) OutLinks() chan string { + ch := make(chan string) + if !md.parsedAlready { + md.Lex(0) + } + go func() { + for _, line := range md.ast { + switch v := line.contents.(type) { + case string: + if strings.HasPrefix(v, "<p") || strings.HasPrefix(v, "<ul class='launchpad'") { + extractLinks(v, ch) + } + case Transclusion: + ch <- v.name + case Img: + extractImageLinks(v, ch) + } + } + close(ch) + }() + return ch +} + +var reLinks = regexp.MustCompile(`<a href="/hypha/([^"]*)".*?</a>`) + +func extractLinks(html string, ch chan string) { + if results := reLinks.FindAllStringSubmatch(html, -1); results != nil { + for _, result := range results { + // result[0] is always present at this point and is not needed, because it is the whole matched substring (which we don't need) + ch <- result[1] + } + } +} + +func extractImageLinks(img Img, ch chan string) { + for _, entry := range img.entries { + if entry.srclink.Kind == link.LinkLocalHypha { + ch <- entry.srclink.Address + } + } +} diff --git a/templates/common.qtpl b/templates/common.qtpl index 1e02c6d..1109b93 100644 --- a/templates/common.qtpl +++ b/templates/common.qtpl @@ -58,7 +58,18 @@ var navEntries = []navEntry{ {% func relativeHyphae(relatives string) %} <aside class="relative-hyphae layout-card"> - <h1 class="relative-hyphae__title layout-card__title">Relative hyphae</h1> + <h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2> {%s= relatives %} </aside> {% endfunc %} + +{% func backlinks(backlinkEntries string) %} +<aside class="backlinks layout-card"> + <h2 class="backlinks__title layout-card__title">Backlinks</h2> + <nav class="backlinks__nav"> + <ul class="backlinks__list"> + {%s= backlinkEntries %} + </ul> + </nav> +</aside> +{% endfunc %} diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go index 587d599..209e68e 100644 --- a/templates/common.qtpl.go +++ b/templates/common.qtpl.go @@ -217,7 +217,7 @@ func streamrelativeHyphae(qw422016 *qt422016.Writer, relatives string) { //line templates/common.qtpl:59 qw422016.N().S(` <aside class="relative-hyphae layout-card"> - <h1 class="relative-hyphae__title layout-card__title">Relative hyphae</h1> + <h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2> `) //line templates/common.qtpl:62 qw422016.N().S(relatives) @@ -253,3 +253,49 @@ func relativeHyphae(relatives string) string { return qs422016 //line templates/common.qtpl:64 } + +//line templates/common.qtpl:66 +func streambacklinks(qw422016 *qt422016.Writer, backlinkEntries string) { +//line templates/common.qtpl:66 + qw422016.N().S(` +<aside class="backlinks layout-card"> + <h2 class="backlinks__title layout-card__title">Backlinks</h2> + <nav class="backlinks__nav"> + <ul class="backlinks__list"> + `) +//line templates/common.qtpl:71 + qw422016.N().S(backlinkEntries) +//line templates/common.qtpl:71 + qw422016.N().S(` + </ul> + </nav> +</aside> +`) +//line templates/common.qtpl:75 +} + +//line templates/common.qtpl:75 +func writebacklinks(qq422016 qtio422016.Writer, backlinkEntries string) { +//line templates/common.qtpl:75 + qw422016 := qt422016.AcquireWriter(qq422016) +//line templates/common.qtpl:75 + streambacklinks(qw422016, backlinkEntries) +//line templates/common.qtpl:75 + qt422016.ReleaseWriter(qw422016) +//line templates/common.qtpl:75 +} + +//line templates/common.qtpl:75 +func backlinks(backlinkEntries string) string { +//line templates/common.qtpl:75 + qb422016 := qt422016.AcquireByteBuffer() +//line templates/common.qtpl:75 + writebacklinks(qb422016, backlinkEntries) +//line templates/common.qtpl:75 + qs422016 := string(qb422016.B) +//line templates/common.qtpl:75 + qt422016.ReleaseByteBuffer(qb422016) +//line templates/common.qtpl:75 + return qs422016 +//line templates/common.qtpl:75 +} diff --git a/templates/readers.qtpl b/templates/readers.qtpl index 57319b3..9a509ab 100644 --- a/templates/readers.qtpl +++ b/templates/readers.qtpl @@ -30,7 +30,7 @@ {% endfunc %} If `contents` == "", a helpful message is shown instead. -{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName string, hasAmnt bool) %} +{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) %} {%= navHTML(rq, hyphaName, "page") %} <div class="layout"> <main class="main-width"> @@ -65,5 +65,6 @@ If `contents` == "", a helpful message is shown instead. {% endif %} </main> {%= relativeHyphae(relatives) %} +{%= backlinks(backlinkEntries) %} </div> {% endfunc %} diff --git a/templates/readers.qtpl.go b/templates/readers.qtpl.go index 812e65b..084ab2c 100644 --- a/templates/readers.qtpl.go +++ b/templates/readers.qtpl.go @@ -148,7 +148,7 @@ func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, r // If `contents` == "", a helpful message is shown instead. //line templates/readers.qtpl:33 -func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName string, hasAmnt bool) { +func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { //line templates/readers.qtpl:33 qw422016.N().S(` `) @@ -273,33 +273,38 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi streamrelativeHyphae(qw422016, relatives) //line templates/readers.qtpl:67 qw422016.N().S(` +`) +//line templates/readers.qtpl:68 + streambacklinks(qw422016, backlinkEntries) +//line templates/readers.qtpl:68 + qw422016.N().S(` </div> `) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 } -//line templates/readers.qtpl:69 -func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 +func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { +//line templates/readers.qtpl:70 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:69 - StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 + StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) +//line templates/readers.qtpl:70 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 } -//line templates/readers.qtpl:69 -func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName string, hasAmnt bool) string { -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 +func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) string { +//line templates/readers.qtpl:70 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:69 - WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 + WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) +//line templates/readers.qtpl:70 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 return qs422016 -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:70 } From 20ef0fade427ad2d2a83bf0424f55706bfaf3986 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Fri, 19 Feb 2021 21:56:31 +0500 Subject: [PATCH 27/53] Make visual layout better --- main.go | 2 +- templates/asset.qtpl.go | 31 +++++++++++++++++++++---------- templates/default.css | 31 +++++++++++++++++++++---------- 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/main.go b/main.go index 9e7ce22..7db388c 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ func HttpErr(w http.ResponseWriter, status int, name, title, errMsg string) { base( title, fmt.Sprintf( - `<main><p>%s. <a href="/page/%s">Go back to the hypha.<a></p></main>`, + `<main class="main-width"><p>%s. <a href="/page/%s">Go back to the hypha.<a></p></main>`, errMsg, name, ), diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index 2d6d279..bab8eb6 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -25,6 +25,7 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) { //line templates/asset.qtpl:2 qw422016.N().S(`/* General element positions, from small to big */ /* Phones and whatnot */ +.layout { display: grid; row-gap: 1rem; } header { width: 100%; margin-bottom: 1rem; } .header-links__list, .hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; } .header-links__entry, .hypha-tabs__tab { list-style-type: none; } @@ -38,10 +39,12 @@ header { width: 100%; margin-bottom: 1rem; } .hypha-tabs__link { display: inline-block; padding: .25rem; text-decoration: none; } .hypha-tabs__selection { display: inline-block; padding: .25rem; font-weight: bold; } -.relative-hyphae { margin-top: .5rem; } -.relative-hyphae li { list-style-type: none; } +.layout-card li { list-style-type: none; } +.backlinks__list { padding: 0; margin: 0; } +.backlinks__link { text-decoration: none; display: block; padding: .25rem; padding-left: 1.25rem; } @media screen and (max-width: 800px) { + .layout { grid-template-column: auto; grid-template-row: auto auto auto; } .main-width { width: 100%; } main { padding: 1rem; margin: 0; } } @@ -50,7 +53,7 @@ header { width: 100%; margin-bottom: 1rem; } @media screen and (min-width: 801px) { .main-width { padding: 1rem 2rem; width: 800px; margin: 0 auto; } main { border-radius: .25rem; } - .relative-hyphae { margin: .5rem auto 0 auto; } + .layout-card { width: 800px; margin: 0 auto; } .header-links { padding: 0; } .header-links__entry { margin-right: 1.5rem; } @@ -65,18 +68,24 @@ header { width: 100%; margin-bottom: 1rem; } } /* Wide enough to fit two columns ok */ -@media screen and (min-width: 1200px) { - .layout { display: grid; grid-template-columns: auto 1fr; column-gap: 1rem; margin: 0 1rem; } +@media screen and (min-width: 1100px) { + .layout { display: grid; grid-template-columns: auto 1fr; column-gap: 1rem; margin: 0 1rem; row-gap: 1rem; } .main-width { margin: 0; } main { grid-column: 1 / span 1; grid-row: 1 / span 2; } - .relative-hyphae { grid-column: 2 / span 1; grid-row: 1 / span 1; min-width: 10rem; max-width: 18rem; margin: 0 auto 0 0; } + .relative-hyphae { grid-column: 2 / span 1; grid-row: 1 / span 1; } + .layout-card { width: 100%; } } -@media screen and (min-width: 1300px) { +@media screen and (min-width: 1250px) { .layout { grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr); } + .layout-card { max-width: 16rem; } .main-width { margin: 0 auto; } + .backlinks { grid-column: 1 / span 1; margin-right: 0; } main { grid-column: 2 / span 1; } - .relative-hyphae { grid-column: 3 / span 1; } + .relative-hyphae { grid-column: 3 / span 1; margin-left: 0; } + + .backlinks__title { text-align: right; } + .backlinks__link { text-align: right; padding-right: 1.25rem; padding-left: .25rem; } } *, *::before, *::after {box-sizing: border-box;} @@ -175,7 +184,7 @@ caption { caption-side: top; font-size: small; } .navitree > .navitree__trunk { border-left: none; } .navitree > .navitree__trunk > a { font-weight: bold; } .navitree__link { text-decoration: none; display: block; padding: .25rem; } -.navitree__link:hover { background-color: #eee; } + /* Color stuff */ /* Lighter stuff #eee */ @@ -223,6 +232,8 @@ blockquote { border-left: 4px black solid; } .upload-amnt { border: #eee 1px solid; } td { border: #ddd 1px solid; } +.navitree__link:hover, .backlinks__link:hover { background-color: #eee; } + /* Dark theme! */ @media (prefers-color-scheme: dark) { html { background: #222; color: #ddd; } @@ -231,7 +242,7 @@ main, article, .hypha-tabs__tab, header, .layout-card { background-color: #3434 a, .wikilink_external { color: #f1fa8c; } a:visited, .wikilink_external:visited { color: #ffb86c; } .wikilink_new, .wikilink_new:visited { color: #dd4444; } -.navitree__link:hover { background-color: #444; } +.navitree__link:hover, .backlinks__link:hover { background-color: #444; } .header-links__link, .header-links__link:visited, .prevnext__el, .prevnext__el:visited { color: #ddd; } diff --git a/templates/default.css b/templates/default.css index f9dc2d1..e224ed8 100644 --- a/templates/default.css +++ b/templates/default.css @@ -1,5 +1,6 @@ /* General element positions, from small to big */ /* Phones and whatnot */ +.layout { display: grid; row-gap: 1rem; } header { width: 100%; margin-bottom: 1rem; } .header-links__list, .hypha-tabs__flex { margin: 0; padding: 0; display: flex; flex-wrap: wrap; } .header-links__entry, .hypha-tabs__tab { list-style-type: none; } @@ -13,10 +14,12 @@ header { width: 100%; margin-bottom: 1rem; } .hypha-tabs__link { display: inline-block; padding: .25rem; text-decoration: none; } .hypha-tabs__selection { display: inline-block; padding: .25rem; font-weight: bold; } -.relative-hyphae { margin-top: .5rem; } -.relative-hyphae li { list-style-type: none; } +.layout-card li { list-style-type: none; } +.backlinks__list { padding: 0; margin: 0; } +.backlinks__link { text-decoration: none; display: block; padding: .25rem; padding-left: 1.25rem; } @media screen and (max-width: 800px) { + .layout { grid-template-column: auto; grid-template-row: auto auto auto; } .main-width { width: 100%; } main { padding: 1rem; margin: 0; } } @@ -25,7 +28,7 @@ header { width: 100%; margin-bottom: 1rem; } @media screen and (min-width: 801px) { .main-width { padding: 1rem 2rem; width: 800px; margin: 0 auto; } main { border-radius: .25rem; } - .relative-hyphae { margin: .5rem auto 0 auto; } + .layout-card { width: 800px; margin: 0 auto; } .header-links { padding: 0; } .header-links__entry { margin-right: 1.5rem; } @@ -40,18 +43,24 @@ header { width: 100%; margin-bottom: 1rem; } } /* Wide enough to fit two columns ok */ -@media screen and (min-width: 1200px) { - .layout { display: grid; grid-template-columns: auto 1fr; column-gap: 1rem; margin: 0 1rem; } +@media screen and (min-width: 1100px) { + .layout { display: grid; grid-template-columns: auto 1fr; column-gap: 1rem; margin: 0 1rem; row-gap: 1rem; } .main-width { margin: 0; } main { grid-column: 1 / span 1; grid-row: 1 / span 2; } - .relative-hyphae { grid-column: 2 / span 1; grid-row: 1 / span 1; min-width: 10rem; max-width: 18rem; margin: 0 auto 0 0; } + .relative-hyphae { grid-column: 2 / span 1; grid-row: 1 / span 1; } + .layout-card { width: 100%; } } -@media screen and (min-width: 1300px) { +@media screen and (min-width: 1250px) { .layout { grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr); } + .layout-card { max-width: 16rem; } .main-width { margin: 0 auto; } + .backlinks { grid-column: 1 / span 1; margin-right: 0; } main { grid-column: 2 / span 1; } - .relative-hyphae { grid-column: 3 / span 1; } + .relative-hyphae { grid-column: 3 / span 1; margin-left: 0; } + + .backlinks__title { text-align: right; } + .backlinks__link { text-align: right; padding-right: 1.25rem; padding-left: .25rem; } } *, *::before, *::after {box-sizing: border-box;} @@ -150,7 +159,7 @@ caption { caption-side: top; font-size: small; } .navitree > .navitree__trunk { border-left: none; } .navitree > .navitree__trunk > a { font-weight: bold; } .navitree__link { text-decoration: none; display: block; padding: .25rem; } -.navitree__link:hover { background-color: #eee; } + /* Color stuff */ /* Lighter stuff #eee */ @@ -198,6 +207,8 @@ blockquote { border-left: 4px black solid; } .upload-amnt { border: #eee 1px solid; } td { border: #ddd 1px solid; } +.navitree__link:hover, .backlinks__link:hover { background-color: #eee; } + /* Dark theme! */ @media (prefers-color-scheme: dark) { html { background: #222; color: #ddd; } @@ -206,7 +217,7 @@ main, article, .hypha-tabs__tab, header, .layout-card { background-color: #3434 a, .wikilink_external { color: #f1fa8c; } a:visited, .wikilink_external:visited { color: #ffb86c; } .wikilink_new, .wikilink_new:visited { color: #dd4444; } -.navitree__link:hover { background-color: #444; } +.navitree__link:hover, .backlinks__link:hover { background-color: #444; } .header-links__link, .header-links__link:visited, .prevnext__el, .prevnext__el:visited { color: #ddd; } From 2d9e3b4a54e10728e938120725470c52c1fb62c8 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Fri, 19 Feb 2021 23:12:36 +0500 Subject: [PATCH 28/53] Move subhyphae to the bottom --- http_readers.go | 6 +- templates/asset.qtpl.go | 15 ++- templates/common.qtpl | 14 ++ templates/common.qtpl.go | 271 +++++++++++++++++++++++--------------- templates/default.css | 15 ++- templates/readers.qtpl | 6 +- templates/readers.qtpl.go | 182 +++++++++++++------------ tree/tree.go | 29 ++-- 8 files changed, 320 insertions(+), 218 deletions(-) diff --git a/http_readers.go b/http_readers.go index 3153f4d..c33025c 100644 --- a/http_readers.go +++ b/http_readers.go @@ -43,13 +43,14 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { if err == nil { contents = markup.Doc(hyphaName, textContents).AsHTML() } - treeHTML, _, _ := tree.Tree(hyphaName) + treeHTML, subhyphae, _, _ := tree.Tree(hyphaName) page := templates.RevisionHTML( rq, hyphaName, naviTitle(hyphaName), contents, treeHTML, + subhyphae, revHash, ) w.Header().Set("Content-Type", "text/html;charset=utf-8") @@ -102,7 +103,7 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { contents = h.BinaryHtmlBlock() + contents } } - treeHTML, prevHypha, nextHypha := tree.Tree(hyphaName) + treeHTML, subhyphaeHTML, prevHypha, nextHypha := tree.Tree(hyphaName) util.HTTP200Page(w, templates.BaseHTML( util.BeautifulName(hyphaName), @@ -110,6 +111,7 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { naviTitle(hyphaName), contents, treeHTML, + subhyphaeHTML, h.BackLinkEntriesHTML(), prevHypha, nextHypha, hasAmnt), diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index bab8eb6..1725377 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -115,7 +115,7 @@ blockquote { margin-left: 0; padding-left: 1rem; } .wikilink_mailto::before { content: url("/static/icon/mailto"); } article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; } -article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; } +main h1, main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; } article p { margin: .5rem 0; } article ul, ol { padding-left: 1.5rem; margin: .5rem 0; } article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; } @@ -133,6 +133,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25 .binary-container_with-video video, .binary-container_with-audio audio {width: 100%} +.subhyphae__title { padding-bottom: .5rem; } .navi-title { padding-bottom: .5rem; margin: .25rem 0; } .navi-title a {text-decoration:none; } .navi-title__separator { margin: 0 .25rem; } @@ -172,18 +173,20 @@ table { border: #ddd 1px solid; border-radius: .25rem; min-width: 4rem; } td { padding: .25rem; } caption { caption-side: top; font-size: small; } +.subhyphae__list, .subhyphae__list ul { display: flex; padding: 0; margin: 0; flex-wrap: wrap; } +.subhyphae__entry { list-style-type: none; border: 1px solid #999; padding: 0; margin: .125rem; border-radius: .25rem; } +.subhyphae__link { display: block; padding: .25rem; text-decoration: none; } +.subhyphae__link:hover { background: #eee; } + .navitree { padding: 0; margin: 0; } -.navitree__trunk ul { padding-left: 1rem; } -.navitree > .navitree__trunk > ul { padding-left: 2rem; } .navitree__entry { } .navitree > .navitree__entry > a::before { display: inline-block; width: .5rem; color: #999; margin: 0 .25rem; } .navitree > .navitree__entry_infertile > a::before { content: " "} /* nbsp, careful */ .navitree > .navitree__sibling_fertile > a::before { content: "▸"} -.navitree > .navitree__trunk_fertile > a::before { content: "▾"} .navitree__trunk { border-left: 1px #999 solid; } -.navitree > .navitree__trunk { border-left: none; } -.navitree > .navitree__trunk > a { font-weight: bold; } .navitree__link { text-decoration: none; display: block; padding: .25rem; } +.navitree__entry_this > span { display: block; padding: .25rem; font-weight: bold; } +.navitree__entry_this > span::before { content: " "; display: inline-block; width: 1rem; } /* Color stuff */ diff --git a/templates/common.qtpl b/templates/common.qtpl index 1109b93..6b094d1 100644 --- a/templates/common.qtpl +++ b/templates/common.qtpl @@ -1,4 +1,5 @@ {% import "net/http" %} +{% import "strings" %} {% import "github.com/bouncepaw/mycorrhiza/user" %} {% import "github.com/bouncepaw/mycorrhiza/util" %} @@ -73,3 +74,16 @@ var navEntries = []navEntry{ </nav> </aside> {% endfunc %} + +{% func subhyphaeMatrix(subhyphae string) %} +{% if strings.TrimSpace(subhyphae) != "" %} +<section class="subhyphae"> + <h2 class="subhyphae__title">Subhyphae</h2> + <nav class="subhyphae__nav"> + <ul class="subhyphae__list"> + {%s= subhyphae %} + </ul> + </nav> +</section> +{% endif %} +{% endfunc %} diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go index 209e68e..788b784 100644 --- a/templates/common.qtpl.go +++ b/templates/common.qtpl.go @@ -8,27 +8,30 @@ package templates import "net/http" //line templates/common.qtpl:2 -import "github.com/bouncepaw/mycorrhiza/user" +import "strings" //line templates/common.qtpl:3 +import "github.com/bouncepaw/mycorrhiza/user" + +//line templates/common.qtpl:4 import "github.com/bouncepaw/mycorrhiza/util" // This is the <nav> seen on top of many pages. -//line templates/common.qtpl:6 +//line templates/common.qtpl:7 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/common.qtpl:6 +//line templates/common.qtpl:7 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/common.qtpl:7 +//line templates/common.qtpl:8 type navEntry struct { path string title string @@ -44,258 +47,314 @@ var navEntries = []navEntry{ {"text", "Raw text"}, } -//line templates/common.qtpl:22 +//line templates/common.qtpl:23 func streamnavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line templates/common.qtpl:22 +//line templates/common.qtpl:23 qw422016.N().S(` `) -//line templates/common.qtpl:24 +//line templates/common.qtpl:25 u := user.FromRequest(rq) -//line templates/common.qtpl:25 +//line templates/common.qtpl:26 qw422016.N().S(` <nav class="hypha-tabs main-width"> <ul class="hypha-tabs__flex"> `) -//line templates/common.qtpl:28 +//line templates/common.qtpl:29 for _, entry := range navEntries { -//line templates/common.qtpl:29 +//line templates/common.qtpl:30 if navType == "revision" && entry.path == "revision" { -//line templates/common.qtpl:29 +//line templates/common.qtpl:30 qw422016.N().S(` <li class="hypha-tabs__tab hypha-tabs__tab_active"> <span class="hypha-tabs__selection">`) -//line templates/common.qtpl:31 +//line templates/common.qtpl:32 qw422016.E().S(revisionHash[0]) -//line templates/common.qtpl:31 +//line templates/common.qtpl:32 qw422016.N().S(`</span> </li> `) -//line templates/common.qtpl:33 +//line templates/common.qtpl:34 } else if navType == entry.path { -//line templates/common.qtpl:33 +//line templates/common.qtpl:34 qw422016.N().S(` <li class="hypha-tabs__tab hypha-tabs__tab_active"> <span class="hypha-tabs__selection">`) -//line templates/common.qtpl:35 +//line templates/common.qtpl:36 qw422016.E().S(entry.title) -//line templates/common.qtpl:35 +//line templates/common.qtpl:36 qw422016.N().S(`</span> </li> `) -//line templates/common.qtpl:37 +//line templates/common.qtpl:38 } else if entry.path != "revision" && u.CanProceed(entry.path) { -//line templates/common.qtpl:37 +//line templates/common.qtpl:38 qw422016.N().S(` <li class="hypha-tabs__tab"> <a class="hypha-tabs__link" href="/`) -//line templates/common.qtpl:39 +//line templates/common.qtpl:40 qw422016.E().S(entry.path) -//line templates/common.qtpl:39 +//line templates/common.qtpl:40 qw422016.N().S(`/`) -//line templates/common.qtpl:39 +//line templates/common.qtpl:40 qw422016.E().S(hyphaName) -//line templates/common.qtpl:39 +//line templates/common.qtpl:40 qw422016.N().S(`">`) -//line templates/common.qtpl:39 +//line templates/common.qtpl:40 qw422016.E().S(entry.title) -//line templates/common.qtpl:39 +//line templates/common.qtpl:40 qw422016.N().S(`</a> </li> `) -//line templates/common.qtpl:41 +//line templates/common.qtpl:42 } -//line templates/common.qtpl:42 +//line templates/common.qtpl:43 } -//line templates/common.qtpl:42 +//line templates/common.qtpl:43 qw422016.N().S(` </ul> </nav> `) -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 } -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 func writenavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 streamnavHTML(qw422016, rq, hyphaName, navType, revisionHash...) -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 } -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string { -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 writenavHTML(qb422016, rq, hyphaName, navType, revisionHash...) -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 qs422016 := string(qb422016.B) -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 return qs422016 -//line templates/common.qtpl:45 +//line templates/common.qtpl:46 } -//line templates/common.qtpl:47 +//line templates/common.qtpl:48 func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) { -//line templates/common.qtpl:47 +//line templates/common.qtpl:48 qw422016.N().S(` `) -//line templates/common.qtpl:48 +//line templates/common.qtpl:49 if user.AuthUsed { -//line templates/common.qtpl:48 +//line templates/common.qtpl:49 qw422016.N().S(` <li class="header-links__entry header-links__entry_user"> `) -//line templates/common.qtpl:50 +//line templates/common.qtpl:51 if u.Group == "anon" { -//line templates/common.qtpl:50 +//line templates/common.qtpl:51 qw422016.N().S(` <a href="/login" class="header-links__link">Login</a> `) -//line templates/common.qtpl:52 +//line templates/common.qtpl:53 } else { -//line templates/common.qtpl:52 +//line templates/common.qtpl:53 qw422016.N().S(` <a href="/page/`) -//line templates/common.qtpl:53 +//line templates/common.qtpl:54 qw422016.E().S(util.UserHypha) -//line templates/common.qtpl:53 +//line templates/common.qtpl:54 qw422016.N().S(`/`) -//line templates/common.qtpl:53 +//line templates/common.qtpl:54 qw422016.E().S(u.Name) -//line templates/common.qtpl:53 +//line templates/common.qtpl:54 qw422016.N().S(`" class="header-links__link">`) -//line templates/common.qtpl:53 +//line templates/common.qtpl:54 qw422016.E().S(u.Name) -//line templates/common.qtpl:53 +//line templates/common.qtpl:54 qw422016.N().S(`</a> `) -//line templates/common.qtpl:54 +//line templates/common.qtpl:55 } -//line templates/common.qtpl:54 +//line templates/common.qtpl:55 qw422016.N().S(` </li> `) -//line templates/common.qtpl:56 +//line templates/common.qtpl:57 } -//line templates/common.qtpl:56 +//line templates/common.qtpl:57 qw422016.N().S(` `) -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 } -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) { -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 streamuserMenuHTML(qw422016, u) -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 } -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 func userMenuHTML(u *user.User) string { -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 writeuserMenuHTML(qb422016, u) -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 qs422016 := string(qb422016.B) -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 return qs422016 -//line templates/common.qtpl:57 +//line templates/common.qtpl:58 } -//line templates/common.qtpl:59 +//line templates/common.qtpl:60 func streamrelativeHyphae(qw422016 *qt422016.Writer, relatives string) { -//line templates/common.qtpl:59 +//line templates/common.qtpl:60 qw422016.N().S(` <aside class="relative-hyphae layout-card"> <h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2> `) -//line templates/common.qtpl:62 +//line templates/common.qtpl:63 qw422016.N().S(relatives) -//line templates/common.qtpl:62 +//line templates/common.qtpl:63 qw422016.N().S(` </aside> `) -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 } -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 func writerelativeHyphae(qq422016 qtio422016.Writer, relatives string) { -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 streamrelativeHyphae(qw422016, relatives) -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 } -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 func relativeHyphae(relatives string) string { -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 writerelativeHyphae(qb422016, relatives) -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 qs422016 := string(qb422016.B) -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 return qs422016 -//line templates/common.qtpl:64 +//line templates/common.qtpl:65 } -//line templates/common.qtpl:66 +//line templates/common.qtpl:67 func streambacklinks(qw422016 *qt422016.Writer, backlinkEntries string) { -//line templates/common.qtpl:66 +//line templates/common.qtpl:67 qw422016.N().S(` <aside class="backlinks layout-card"> <h2 class="backlinks__title layout-card__title">Backlinks</h2> <nav class="backlinks__nav"> <ul class="backlinks__list"> `) -//line templates/common.qtpl:71 +//line templates/common.qtpl:72 qw422016.N().S(backlinkEntries) -//line templates/common.qtpl:71 +//line templates/common.qtpl:72 qw422016.N().S(` </ul> </nav> </aside> `) -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 } -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 func writebacklinks(qq422016 qtio422016.Writer, backlinkEntries string) { -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 streambacklinks(qw422016, backlinkEntries) -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 } -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 func backlinks(backlinkEntries string) string { -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 writebacklinks(qb422016, backlinkEntries) -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 qs422016 := string(qb422016.B) -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 return qs422016 -//line templates/common.qtpl:75 +//line templates/common.qtpl:76 +} + +//line templates/common.qtpl:78 +func streamsubhyphaeMatrix(qw422016 *qt422016.Writer, subhyphae string) { +//line templates/common.qtpl:78 + qw422016.N().S(` +`) +//line templates/common.qtpl:79 + if strings.TrimSpace(subhyphae) != "" { +//line templates/common.qtpl:79 + qw422016.N().S(` +<section class="subhyphae"> + <h2 class="subhyphae__title">Subhyphae</h2> + <nav class="subhyphae__nav"> + <ul class="subhyphae__list"> + `) +//line templates/common.qtpl:84 + qw422016.N().S(subhyphae) +//line templates/common.qtpl:84 + qw422016.N().S(` + </ul> + </nav> +</section> +`) +//line templates/common.qtpl:88 + } +//line templates/common.qtpl:88 + qw422016.N().S(` +`) +//line templates/common.qtpl:89 +} + +//line templates/common.qtpl:89 +func writesubhyphaeMatrix(qq422016 qtio422016.Writer, subhyphae string) { +//line templates/common.qtpl:89 + qw422016 := qt422016.AcquireWriter(qq422016) +//line templates/common.qtpl:89 + streamsubhyphaeMatrix(qw422016, subhyphae) +//line templates/common.qtpl:89 + qt422016.ReleaseWriter(qw422016) +//line templates/common.qtpl:89 +} + +//line templates/common.qtpl:89 +func subhyphaeMatrix(subhyphae string) string { +//line templates/common.qtpl:89 + qb422016 := qt422016.AcquireByteBuffer() +//line templates/common.qtpl:89 + writesubhyphaeMatrix(qb422016, subhyphae) +//line templates/common.qtpl:89 + qs422016 := string(qb422016.B) +//line templates/common.qtpl:89 + qt422016.ReleaseByteBuffer(qb422016) +//line templates/common.qtpl:89 + return qs422016 +//line templates/common.qtpl:89 } diff --git a/templates/default.css b/templates/default.css index e224ed8..daddf05 100644 --- a/templates/default.css +++ b/templates/default.css @@ -90,7 +90,7 @@ blockquote { margin-left: 0; padding-left: 1rem; } .wikilink_mailto::before { content: url("/static/icon/mailto"); } article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; } -article h1, article h2, article h3, article h4, article h5, article h6 { margin: 1.5rem 0 0 0; } +main h1, main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; } article p { margin: .5rem 0; } article ul, ol { padding-left: 1.5rem; margin: .5rem 0; } article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; } @@ -108,6 +108,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25 .binary-container_with-video video, .binary-container_with-audio audio {width: 100%} +.subhyphae__title { padding-bottom: .5rem; } .navi-title { padding-bottom: .5rem; margin: .25rem 0; } .navi-title a {text-decoration:none; } .navi-title__separator { margin: 0 .25rem; } @@ -147,18 +148,20 @@ table { border: #ddd 1px solid; border-radius: .25rem; min-width: 4rem; } td { padding: .25rem; } caption { caption-side: top; font-size: small; } +.subhyphae__list, .subhyphae__list ul { display: flex; padding: 0; margin: 0; flex-wrap: wrap; } +.subhyphae__entry { list-style-type: none; border: 1px solid #999; padding: 0; margin: .125rem; border-radius: .25rem; } +.subhyphae__link { display: block; padding: .25rem; text-decoration: none; } +.subhyphae__link:hover { background: #eee; } + .navitree { padding: 0; margin: 0; } -.navitree__trunk ul { padding-left: 1rem; } -.navitree > .navitree__trunk > ul { padding-left: 2rem; } .navitree__entry { } .navitree > .navitree__entry > a::before { display: inline-block; width: .5rem; color: #999; margin: 0 .25rem; } .navitree > .navitree__entry_infertile > a::before { content: " "} /* nbsp, careful */ .navitree > .navitree__sibling_fertile > a::before { content: "▸"} -.navitree > .navitree__trunk_fertile > a::before { content: "▾"} .navitree__trunk { border-left: 1px #999 solid; } -.navitree > .navitree__trunk { border-left: none; } -.navitree > .navitree__trunk > a { font-weight: bold; } .navitree__link { text-decoration: none; display: block; padding: .25rem; } +.navitree__entry_this > span { display: block; padding: .25rem; font-weight: bold; } +.navitree__entry_this > span::before { content: " "; display: inline-block; width: 1rem; } /* Color stuff */ diff --git a/templates/readers.qtpl b/templates/readers.qtpl index 9a509ab..3bedb30 100644 --- a/templates/readers.qtpl +++ b/templates/readers.qtpl @@ -15,7 +15,7 @@ </div> {% endfunc %} -{% func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, revHash string) %} +{% func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) %} {%= navHTML(rq, hyphaName, "revision", revHash) %} <div class="layout"> <main class="main-width"> @@ -24,13 +24,14 @@ {%s= naviTitle %} {%s= contents %} </article> +{%= subhyphaeMatrix(subhyphae) %} </main> {%= relativeHyphae(relatives) %} </div> {% endfunc %} If `contents` == "", a helpful message is shown instead. -{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) %} +{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) %} {%= navHTML(rq, hyphaName, "page") %} <div class="layout"> <main class="main-width"> @@ -63,6 +64,7 @@ If `contents` == "", a helpful message is shown instead. <input type="submit"/> </form> {% endif %} +{%= subhyphaeMatrix(subhyphae) %} </main> {%= relativeHyphae(relatives) %} {%= backlinks(backlinkEntries) %} diff --git a/templates/readers.qtpl.go b/templates/readers.qtpl.go index 084ab2c..5ea91a1 100644 --- a/templates/readers.qtpl.go +++ b/templates/readers.qtpl.go @@ -85,7 +85,7 @@ func HistoryHTML(rq *http.Request, hyphaName, list string) string { } //line templates/readers.qtpl:18 -func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, revHash string) { +func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) { //line templates/readers.qtpl:18 qw422016.N().S(` `) @@ -108,154 +108,159 @@ func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, //line templates/readers.qtpl:25 qw422016.N().S(` </article> +`) +//line templates/readers.qtpl:27 + streamsubhyphaeMatrix(qw422016, subhyphae) +//line templates/readers.qtpl:27 + qw422016.N().S(` </main> `) -//line templates/readers.qtpl:28 +//line templates/readers.qtpl:29 streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:28 +//line templates/readers.qtpl:29 qw422016.N().S(` </div> `) -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 } -//line templates/readers.qtpl:30 -func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, revHash string) { -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 +func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) { +//line templates/readers.qtpl:31 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:30 - StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, revHash) -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 + StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, revHash) +//line templates/readers.qtpl:31 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 } -//line templates/readers.qtpl:30 -func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, revHash string) string { -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 +func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) string { +//line templates/readers.qtpl:31 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:30 - WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, revHash) -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 + WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, revHash) +//line templates/readers.qtpl:31 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 return qs422016 -//line templates/readers.qtpl:30 +//line templates/readers.qtpl:31 } // If `contents` == "", a helpful message is shown instead. -//line templates/readers.qtpl:33 -func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/readers.qtpl:33 +//line templates/readers.qtpl:34 +func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { +//line templates/readers.qtpl:34 qw422016.N().S(` `) -//line templates/readers.qtpl:34 +//line templates/readers.qtpl:35 streamnavHTML(qw422016, rq, hyphaName, "page") -//line templates/readers.qtpl:34 +//line templates/readers.qtpl:35 qw422016.N().S(` <div class="layout"> <main class="main-width"> <article> `) -//line templates/readers.qtpl:38 +//line templates/readers.qtpl:39 qw422016.N().S(naviTitle) -//line templates/readers.qtpl:38 +//line templates/readers.qtpl:39 qw422016.N().S(` `) -//line templates/readers.qtpl:39 +//line templates/readers.qtpl:40 if contents == "" { -//line templates/readers.qtpl:39 +//line templates/readers.qtpl:40 qw422016.N().S(` <p>This hypha has no text. Why not <a href="/edit/`) -//line templates/readers.qtpl:40 +//line templates/readers.qtpl:41 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:40 +//line templates/readers.qtpl:41 qw422016.N().S(`">create it</a>?</p> `) -//line templates/readers.qtpl:41 +//line templates/readers.qtpl:42 } else { -//line templates/readers.qtpl:41 +//line templates/readers.qtpl:42 qw422016.N().S(` `) -//line templates/readers.qtpl:42 +//line templates/readers.qtpl:43 qw422016.N().S(contents) -//line templates/readers.qtpl:42 +//line templates/readers.qtpl:43 qw422016.N().S(` `) -//line templates/readers.qtpl:43 +//line templates/readers.qtpl:44 } -//line templates/readers.qtpl:43 +//line templates/readers.qtpl:44 qw422016.N().S(` </article> <section class="prevnext"> `) -//line templates/readers.qtpl:46 +//line templates/readers.qtpl:47 if prevHyphaName != "" { -//line templates/readers.qtpl:46 +//line templates/readers.qtpl:47 qw422016.N().S(` <a class="prevnext__el prevnext__prev" href="/hypha/`) -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:48 qw422016.E().S(prevHyphaName) -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:48 qw422016.N().S(`" rel="prev">← `) -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:48 qw422016.E().S(util.BeautifulName(path.Base(prevHyphaName))) -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:48 qw422016.N().S(`</a> `) -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:49 } -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:49 qw422016.N().S(` `) -//line templates/readers.qtpl:49 +//line templates/readers.qtpl:50 if nextHyphaName != "" { -//line templates/readers.qtpl:49 +//line templates/readers.qtpl:50 qw422016.N().S(` <a class="prevnext__el prevnext__next" href="/hypha/`) -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:51 qw422016.E().S(nextHyphaName) -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:51 qw422016.N().S(`" rel="next">`) -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:51 qw422016.E().S(util.BeautifulName(path.Base(nextHyphaName))) -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:51 qw422016.N().S(` →</a> `) -//line templates/readers.qtpl:51 +//line templates/readers.qtpl:52 } -//line templates/readers.qtpl:51 +//line templates/readers.qtpl:52 qw422016.N().S(` </section> `) -//line templates/readers.qtpl:53 +//line templates/readers.qtpl:54 if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" { -//line templates/readers.qtpl:53 +//line templates/readers.qtpl:54 qw422016.N().S(` <form action="/upload-binary/`) -//line templates/readers.qtpl:54 +//line templates/readers.qtpl:55 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:54 +//line templates/readers.qtpl:55 qw422016.N().S(`" method="post" enctype="multipart/form-data" class="upload-amnt"> `) -//line templates/readers.qtpl:57 +//line templates/readers.qtpl:58 if hasAmnt { -//line templates/readers.qtpl:57 +//line templates/readers.qtpl:58 qw422016.N().S(` <a class="upload-amnt__unattach" href="/unattach-ask/`) -//line templates/readers.qtpl:58 +//line templates/readers.qtpl:59 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:58 +//line templates/readers.qtpl:59 qw422016.N().S(`">Unattach current attachment?</a> `) -//line templates/readers.qtpl:59 +//line templates/readers.qtpl:60 } -//line templates/readers.qtpl:59 +//line templates/readers.qtpl:60 qw422016.N().S(` <label for="upload-binary__input">Upload a new attachment</label> <br> @@ -263,48 +268,53 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi <input type="submit"/> </form> `) -//line templates/readers.qtpl:65 +//line templates/readers.qtpl:66 } -//line templates/readers.qtpl:65 +//line templates/readers.qtpl:66 + qw422016.N().S(` +`) +//line templates/readers.qtpl:67 + streamsubhyphaeMatrix(qw422016, subhyphae) +//line templates/readers.qtpl:67 qw422016.N().S(` </main> `) -//line templates/readers.qtpl:67 +//line templates/readers.qtpl:69 streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:67 +//line templates/readers.qtpl:69 qw422016.N().S(` `) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:70 streambacklinks(qw422016, backlinkEntries) -//line templates/readers.qtpl:68 +//line templates/readers.qtpl:70 qw422016.N().S(` </div> `) -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 } -//line templates/readers.qtpl:70 -func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 +func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { +//line templates/readers.qtpl:72 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:70 - StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 + StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) +//line templates/readers.qtpl:72 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 } -//line templates/readers.qtpl:70 -func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) string { -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 +func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) string { +//line templates/readers.qtpl:72 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:70 - WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 + WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) +//line templates/readers.qtpl:72 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 return qs422016 -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 } diff --git a/tree/tree.go b/tree/tree.go index 1c6ccb3..ab56d5f 100644 --- a/tree/tree.go +++ b/tree/tree.go @@ -54,12 +54,12 @@ func (m *mainFamilyMember) checkThisChild(hyphaName string) (adopted bool) { func (m *mainFamilyMember) asHTML() string { if len(m.children) == 0 { - return fmt.Sprintf(`<li class="navitree__entry navitree__entry_infertile navitree__trunk navitree__trunk_infertile"><a class="navitree__link" href="/hypha/%s">%s</a></li>`, m.name, util.BeautifulName(path.Base(m.name))) + return fmt.Sprintf(`<li class="subhyphae__entry"><a class="subhyphae__link" href="/hypha/%s">%s</a></li>`, m.name, util.BeautifulName(path.Base(m.name))) } sort.Slice(m.children, func(i, j int) bool { return m.children[i].name < m.children[j].name }) - html := fmt.Sprintf(`<li class="navitree__entry navitree__entry_fertile navitree__trunk navitree__trunk_fertile"><a class="navitree__link" href="/hypha/%s">%s</a><ul>`, m.name, util.BeautifulName(path.Base(m.name))) + html := fmt.Sprintf(`<li class="subhyphae__entry"><a class="subhyphae__link" href="/hypha/%s">%s</a><ul>`, m.name, util.BeautifulName(path.Base(m.name))) for _, child := range m.children { html += child.asHTML() } @@ -81,8 +81,20 @@ func mainFamilyFromPool(hyphaName string, subhyphaePool map[string]bool) *mainFa return &mainFamilyMember{name: hyphaName, children: adopted} } +func subhyphaeMatrix(hyphaName string, subhyphaePool map[string]bool) string { + var html string + children := mainFamilyFromPool(hyphaName, subhyphaePool).children + sort.Slice(children, func(i, j int) bool { + return children[i].name < children[j].name + }) + for _, child := range children { + html += child.asHTML() + } + return html +} + // Tree generates a tree for `hyphaName` as html and returns next and previous hyphae if any. -func Tree(hyphaName string) (html, prev, next string) { +func Tree(hyphaName string) (relatives, subhyphae, prev, next string) { var ( // One of the siblings is the hypha with name `hyphaName` siblings = findSiblings(hyphaName) @@ -100,13 +112,10 @@ func Tree(hyphaName string) (html, prev, next string) { for i, s := range siblings { if s.name == hyphaName { I = i - break + relatives += fmt.Sprintf(`<li class="navitree__entry navitree__entry_this"><span>%s</span></li>`, util.BeautifulName(hyphaName)) + } else { + relatives += s.asHTML() } - html += s.asHTML() - } - html += mainFamilyFromPool(hyphaName, subhyphaePool).asHTML() - for _, s := range siblings[I+1:] { - html += s.asHTML() } if I != 0 { prev = siblings[I-1].name @@ -114,7 +123,7 @@ func Tree(hyphaName string) (html, prev, next string) { if I != len(siblings)-1 { next = siblings[I+1].name } - return fmt.Sprintf(`<ul class="navitree">%s</ul>`, html), prev, next + return fmt.Sprintf(`<ul class="navitree">%s</ul>`, relatives), subhyphaeMatrix(hyphaName, subhyphaePool), prev, next } func findSiblings(hyphaName string) []*sibling { From 345efef35a45d451b93a89b0403fb0df5243a9f3 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 11:48:27 +0500 Subject: [PATCH 29/53] Fix the renaming bug --- hyphae/rename.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hyphae/rename.go b/hyphae/rename.go index deb9881..4831a21 100644 --- a/hyphae/rename.go +++ b/hyphae/rename.go @@ -86,6 +86,10 @@ func (h *Hypha) RenameHypha(newHypha *Hypha, recursive bool, u *user.User) (hop if len(hop.Errs) == 0 { for _, h := range hyphaeToRename { h.renameTo(replaceName(h.Name)) + h.Lock() + h.TextPath = replaceName(h.TextPath) + h.BinaryPath = replaceName(h.BinaryPath) + h.Unlock() } } return hop, "" From 0467f3a773397cb143774d10f2f8b00db2a65b67 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 19:03:54 +0500 Subject: [PATCH 30/53] Split module hyphae into two modules --- http_mutators.go | 38 +++++------ http_readers.go | 5 +- hyphae/backlink.go | 72 --------------------- hyphae/count.go | 13 ++-- hyphae/delete.go | 50 -------------- hyphae/hyphae.go | 117 +++++++++------------------------ hyphae/iterators.go | 57 ++++++++++++++++ hyphae/unattach.go | 64 ------------------ hyphae/upload.go | 122 ----------------------------------- main.go | 7 +- shroom/backlink.go | 55 ++++++++++++++++ shroom/can.go | 92 ++++++++++++++++++++++++++ shroom/delete.go | 29 +++++++++ shroom/init.go | 37 +++++++++++ shroom/log.go | 24 +++++++ {hyphae => shroom}/rename.go | 40 ++++-------- shroom/unattach.go | 40 ++++++++++++ shroom/upload.go | 87 +++++++++++++++++++++++++ {hyphae => shroom}/view.go | 13 ++-- 19 files changed, 502 insertions(+), 460 deletions(-) delete mode 100644 hyphae/backlink.go delete mode 100644 hyphae/delete.go create mode 100644 hyphae/iterators.go delete mode 100644 hyphae/unattach.go delete mode 100644 hyphae/upload.go create mode 100644 shroom/backlink.go create mode 100644 shroom/can.go create mode 100644 shroom/delete.go create mode 100644 shroom/init.go create mode 100644 shroom/log.go rename {hyphae => shroom}/rename.go (68%) create mode 100644 shroom/unattach.go create mode 100644 shroom/upload.go rename {hyphae => shroom}/view.go (86%) diff --git a/http_mutators.go b/http_mutators.go index 139a0d5..3e29066 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -8,6 +8,7 @@ import ( "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" @@ -29,7 +30,7 @@ func init() { func factoryHandlerAsker( actionPath string, - asker func(*hyphae.Hypha, *user.User) (error, string), + asker func(*user.User, *hyphae.Hypha) (error, string), succTitleTemplate string, succPageTemplate func(*http.Request, string, bool) string, ) func(http.ResponseWriter, *http.Request) { @@ -40,7 +41,7 @@ func factoryHandlerAsker( h = hyphae.ByName(hyphaName) u = user.FromRequest(rq) ) - if err, errtitle := asker(h, u); err != nil { + if err, errtitle := asker(u, h); err != nil { HttpErr( w, http.StatusInternalServerError, @@ -60,27 +61,21 @@ func factoryHandlerAsker( var handlerUnattachAsk = factoryHandlerAsker( "unattach-ask", - func(h *hyphae.Hypha, u *user.User) (error, string) { - return h.CanUnattach(u) - }, + shroom.CanUnattach, "Unattach %s?", templates.UnattachAskHTML, ) var handlerDeleteAsk = factoryHandlerAsker( "delete-ask", - func(h *hyphae.Hypha, u *user.User) (error, string) { - return h.CanDelete(u) - }, + shroom.CanDelete, "Delete %s?", templates.DeleteAskHTML, ) var handlerRenameAsk = factoryHandlerAsker( "rename-ask", - func(h *hyphae.Hypha, u *user.User) (error, string) { - return h.CanRename(u) - }, + shroom.CanRename, "Rename %s?", templates.RenameAskHTML, ) @@ -109,14 +104,14 @@ func factoryHandlerConfirmer( var handlerUnattachConfirm = factoryHandlerConfirmer( "unattach-confirm", func(h *hyphae.Hypha, u *user.User, _ *http.Request) (*history.HistoryOp, string) { - return h.UnattachHypha(u) + return shroom.UnattachHypha(u, h) }, ) var handlerDeleteConfirm = factoryHandlerConfirmer( "delete-confirm", func(h *hyphae.Hypha, u *user.User, _ *http.Request) (*history.HistoryOp, string) { - return h.DeleteHypha(u) + return shroom.DeleteHypha(u, h) }, ) @@ -128,7 +123,7 @@ var handlerRenameConfirm = factoryHandlerConfirmer( recursive = rq.PostFormValue("recursive") == "true" newHypha = hyphae.ByName(newName) ) - return oldHypha.RenameHypha(newHypha, recursive, u) + return shroom.RenameHypha(oldHypha, newHypha, recursive, u) }, ) @@ -143,14 +138,14 @@ func handlerEdit(w http.ResponseWriter, rq *http.Request) { err error u = user.FromRequest(rq) ) - if err, errtitle := h.CanEdit(u); err != nil { + if err, errtitle := shroom.CanEdit(u, h); err != nil { HttpErr(w, http.StatusInternalServerError, hyphaName, errtitle, err.Error()) return } if h.Exists { - textAreaFill, err = h.FetchTextPart() + textAreaFill, err = shroom.FetchTextPart(h) if err != nil { log.Println(err) HttpErr(w, http.StatusInternalServerError, hyphaName, @@ -183,7 +178,7 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) { ) if action != "Preview" { - hop, errtitle = h.UploadText([]byte(textData), u) + hop, errtitle = shroom.UploadText(h, []byte(textData), u) } if hop.HasErrors() { @@ -220,7 +215,12 @@ func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) { u = user.FromRequest(rq) file, handler, err = rq.FormFile("binary") ) - if err, errtitle := h.CanAttach(err, u); err != nil { + if err != nil { + HttpErr(w, http.StatusInternalServerError, hyphaName, + "Error", + err.Error()) + } + if err, errtitle := shroom.CanAttach(u, h); err != nil { HttpErr(w, http.StatusInternalServerError, hyphaName, errtitle, err.Error()) @@ -237,7 +237,7 @@ func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) { } var ( mime = handler.Header.Get("Content-Type") - hop, errtitle = h.UploadBinary(mime, file, u) + hop, errtitle = shroom.UploadBinary(h, mime, file, u) ) if hop.HasErrors() { diff --git a/http_readers.go b/http_readers.go index c33025c..d99a865 100644 --- a/http_readers.go +++ b/http_readers.go @@ -13,6 +13,7 @@ import ( "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/mimetype" + "github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/tree" "github.com/bouncepaw/mycorrhiza/user" @@ -100,7 +101,7 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { openGraph = md.OpenGraphHTML() } if !os.IsNotExist(errB) { - contents = h.BinaryHtmlBlock() + contents + contents = shroom.BinaryHtmlBlock(h) + contents } } treeHTML, subhyphaeHTML, prevHypha, nextHypha := tree.Tree(hyphaName) @@ -112,7 +113,7 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { contents, treeHTML, subhyphaeHTML, - h.BackLinkEntriesHTML(), + shroom.BackLinkEntriesHTML(h), prevHypha, nextHypha, hasAmnt), u, diff --git a/hyphae/backlink.go b/hyphae/backlink.go deleted file mode 100644 index 21c79ad..0000000 --- a/hyphae/backlink.go +++ /dev/null @@ -1,72 +0,0 @@ -package hyphae - -import ( - "fmt" - "io/ioutil" - - "github.com/bouncepaw/mycorrhiza/link" - "github.com/bouncepaw/mycorrhiza/markup" - "github.com/bouncepaw/mycorrhiza/util" -) - -func (h *Hypha) BackLinkEntriesHTML() (html string) { - for _, backlinkHypha := range h.BackLinks { - _ = link.Link{} - html += fmt.Sprintf(`<li class="backlinks__entry"> - <a class="backlinks__link" href="/hypha/%s">%s</a>`, backlinkHypha.Name, util.BeautifulName(backlinkHypha.Name)) - } - return -} - -func (h *Hypha) outlinksThis(oh *Hypha) bool { - for _, outlink := range h.OutLinks { - if outlink == oh { - return true - } - } - return false -} - -func (h *Hypha) backlinkedBy(oh *Hypha) bool { - for _, backlink := range h.BackLinks { - if backlink == oh { - return true - } - } - return false -} - -// FindAllBacklinks iterates over all hyphae that have text parts, sets their outlinks and then sets backlinks. -func FindAllBacklinks() { - for h := range FilterTextHyphae(YieldExistingHyphae()) { - findBacklinkWorker(h) - } -} - -func findBacklinkWorker(h *Hypha) { - h.Lock() - defer h.Unlock() - - textContents, err := ioutil.ReadFile(h.TextPath) - if err == nil { - for outlink := range markup.Doc(h.Name, string(textContents)).OutLinks() { - outlink := outlink - outlinkHypha := ByName(outlink) - if outlinkHypha == h { - continue - } - - outlinkHypha.Lock() - if !outlinkHypha.backlinkedBy(h) { - outlinkHypha.BackLinks = append(outlinkHypha.BackLinks, h) - outlinkHypha.InsertIfNewKeepExistence() - } - outlinkHypha.Unlock() - - // Insert outlinkHypha if unique - if !h.outlinksThis(outlinkHypha) { - h.OutLinks = append(h.OutLinks, outlinkHypha) - } - } - } -} diff --git a/hyphae/count.go b/hyphae/count.go index d090606..7d20f93 100644 --- a/hyphae/count.go +++ b/hyphae/count.go @@ -10,21 +10,21 @@ var count = struct { sync.Mutex }{} -// Set the value of hyphae count to zero. +// Set the value of hyphae count to zero. Use when reloading hyphae. func ResetCount() { - count.Lock() - count.value = 0 - count.Unlock() + count.Lock() + count.value = 0 + count.Unlock() } -// Increment the value of hyphae count. +// Increment the value of the hyphae counter. Use when creating new hyphae or loading hyphae from disk. func IncrementCount() { count.Lock() count.value++ count.Unlock() } -// Decrement the value of hyphae count. +// Decrement the value of the hyphae counter. Use when deleting existing hyphae. func DecrementCount() { count.Lock() count.value-- @@ -33,6 +33,5 @@ func DecrementCount() { // Count how many hyphae there are. func Count() int { - // it is concurrent-safe to not lock here, right? return count.value } diff --git a/hyphae/delete.go b/hyphae/delete.go deleted file mode 100644 index 3ca6aac..0000000 --- a/hyphae/delete.go +++ /dev/null @@ -1,50 +0,0 @@ -package hyphae - -import ( - "errors" - "fmt" - "log" - - "github.com/bouncepaw/mycorrhiza/history" - "github.com/bouncepaw/mycorrhiza/user" -) - -func rejectDeleteLog(h *Hypha, u *user.User, errmsg string) { - log.Printf("Reject delete ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) -} - -// CanDelete checks if given user can delete given hypha. -func (h *Hypha) CanDelete(u *user.User) (err error, errtitle string) { - // First, check if can unattach at all - if !u.CanProceed("delete-confirm") { - rejectDeleteLog(h, u, "no rights") - return errors.New("Not enough rights to delete, you must be a moderator"), "Not enough rights" - } - - if !h.Exists { - rejectDeleteLog(h, u, "does not exist") - return errors.New("Cannot delete this hypha because it does not exist"), "Does not exist" - } - - return nil, "" -} - -// DeleteHypha deletes hypha and makes a history record about that. -func (h *Hypha) DeleteHypha(u *user.User) (hop *history.HistoryOp, errtitle string) { - hop = history.Operation(history.TypeDeleteHypha) - - if err, errtitle := h.CanDelete(u); errtitle != "" { - hop.WithError(err) - return hop, errtitle - } - - hop. - WithFilesRemoved(h.TextPath, h.BinaryPath). - WithMsg(fmt.Sprintf("Delete ‘%s’", h.Name)). - WithUser(u). - Apply() - if len(hop.Errs) == 0 { - h.delete() - } - return hop, "" -} diff --git a/hyphae/hyphae.go b/hyphae/hyphae.go index 1c4496c..ce2a3d9 100644 --- a/hyphae/hyphae.go +++ b/hyphae/hyphae.go @@ -1,44 +1,12 @@ +// The `hyphae` package is for the Hypha type, hypha storage and stuff like that. It shall not depend on mycorrhiza modules other than util. package hyphae import ( - "errors" "log" "regexp" - "strings" "sync" - - "github.com/bouncepaw/mycorrhiza/markup" - "github.com/bouncepaw/mycorrhiza/util" ) -func init() { - markup.HyphaExists = func(hyphaName string) bool { - return ByName(hyphaName).Exists - } - markup.HyphaAccess = func(hyphaName string) (rawText, binaryBlock string, err error) { - if h := ByName(hyphaName); h.Exists { - rawText, err = h.FetchTextPart() - if h.BinaryPath != "" { - binaryBlock = h.BinaryHtmlBlock() - } - } else { - err = errors.New("Hypha " + hyphaName + " does not exist") - } - return - } - markup.HyphaIterate = func(λ func(string)) { - for h := range YieldExistingHyphae() { - λ(h.Name) - } - } - markup.HyphaImageForOG = func(hyphaName string) string { - if h := ByName(hyphaName); h.Exists && h.BinaryPath != "" { - return util.URL + "/binary/" + hyphaName - } - return util.URL + "/favicon.ico" - } -} - // HyphaPattern is a pattern which all hyphae must match. var HyphaPattern = regexp.MustCompile(`[^?!:#@><*|"\'&%{}]+`) @@ -56,57 +24,6 @@ type Hypha struct { var byNames = make(map[string]*Hypha) var byNamesMutex = sync.Mutex{} -// YieldExistingHyphae iterates over all hyphae and yields all existing ones. -func YieldExistingHyphae() chan *Hypha { - ch := make(chan *Hypha) - go func() { - for _, h := range byNames { - if h.Exists { - ch <- h - } - } - close(ch) - }() - return ch -} - -// FilterTextHyphae filters the source channel and yields only those hyphae than have text parts. -func FilterTextHyphae(src chan *Hypha) chan *Hypha { - sink := make(chan *Hypha) - go func() { - for h := range src { - if h.TextPath != "" { - sink <- h - } - } - close(sink) - }() - return sink -} - -// Subhyphae returns slice of subhyphae. -func (h *Hypha) Subhyphae() []*Hypha { - hyphae := []*Hypha{} - for subh := range YieldExistingHyphae() { - if strings.HasPrefix(subh.Name, h.Name+"/") { - hyphae = append(hyphae, subh) - } - } - return hyphae -} - -// AreFreeNames checks if all given `hyphaNames` are not taken. -func AreFreeNames(hyphaNames ...string) (firstFailure string, ok bool) { - for h := range YieldExistingHyphae() { - for _, hn := range hyphaNames { - if hn == h.Name { - return hn, false - } - } - } - return "", true -} - // EmptyHypha returns an empty hypha struct with given name. func EmptyHypha(hyphaName string) *Hypha { return &Hypha{ @@ -164,7 +81,7 @@ func (h *Hypha) InsertIfNewKeepExistence() { } } -func (h *Hypha) delete() { +func (h *Hypha) Delete() { byNamesMutex.Lock() h.Lock() delete(byNames, h.Name) @@ -173,7 +90,7 @@ func (h *Hypha) delete() { h.Unlock() } -func (h *Hypha) renameTo(newName string) { +func (h *Hypha) RenameTo(newName string) { byNamesMutex.Lock() h.Lock() delete(byNames, h.Name) @@ -195,3 +112,31 @@ func (h *Hypha) MergeIn(oh *Hypha) { h.BinaryPath = oh.BinaryPath } } + +// Link related stuff: + +func (h *Hypha) AddOutLink(oh *Hypha) (added bool) { + h.Lock() + defer h.Unlock() + + for _, outlink := range h.OutLinks { + if outlink == oh { + return false + } + } + h.OutLinks = append(h.OutLinks, oh) + return true +} + +func (h *Hypha) AddBackLink(bh *Hypha) (added bool) { + h.Lock() + defer h.Unlock() + + for _, backlink := range h.BackLinks { + if backlink == h { + return false + } + } + h.BackLinks = append(h.BackLinks, bh) + return true +} diff --git a/hyphae/iterators.go b/hyphae/iterators.go new file mode 100644 index 0000000..8e5fcd5 --- /dev/null +++ b/hyphae/iterators.go @@ -0,0 +1,57 @@ +// File `iterators.go` contains stuff that iterates over hyphae. +package hyphae + +import ( + "strings" +) + +// YieldExistingHyphae iterates over all hyphae and yields all existing ones. +func YieldExistingHyphae() chan *Hypha { + ch := make(chan *Hypha) + go func() { + for _, h := range byNames { + if h.Exists { + ch <- h + } + } + close(ch) + }() + return ch +} + +// FilterTextHyphae filters the source channel and yields only those hyphae than have text parts. +func FilterTextHyphae(src chan *Hypha) chan *Hypha { + sink := make(chan *Hypha) + go func() { + for h := range src { + if h.TextPath != "" { + sink <- h + } + } + close(sink) + }() + return sink +} + +// Subhyphae returns slice of subhyphae. +func (h *Hypha) Subhyphae() []*Hypha { + hyphae := []*Hypha{} + for subh := range YieldExistingHyphae() { + if strings.HasPrefix(subh.Name, h.Name+"/") { + hyphae = append(hyphae, subh) + } + } + return hyphae +} + +// AreFreeNames checks if all given `hyphaNames` are not taken. If they are not taken, `ok` is true. If not, `firstFailure` is the name of the first met hypha that is not free. +func AreFreeNames(hyphaNames ...string) (firstFailure string, ok bool) { + for h := range YieldExistingHyphae() { + for _, hn := range hyphaNames { + if hn == h.Name { + return hn, false + } + } + } + return "", true +} diff --git a/hyphae/unattach.go b/hyphae/unattach.go deleted file mode 100644 index 75c7baa..0000000 --- a/hyphae/unattach.go +++ /dev/null @@ -1,64 +0,0 @@ -package hyphae - -import ( - "errors" - "fmt" - "log" - - "github.com/bouncepaw/mycorrhiza/history" - "github.com/bouncepaw/mycorrhiza/user" -) - -func rejectUnattachLog(h *Hypha, u *user.User, errmsg string) { - log.Printf("Reject unattach ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) -} - -// CanUnattach checks if given user can unattach given hypha. If they can, `errtitle` is an empty string and `err` is nil. If they cannot, `errtitle` is not an empty string, and `err` is an error. -func (h *Hypha) CanUnattach(u *user.User) (err error, errtitle string) { - if !u.CanProceed("unattach-confirm") { - rejectUnattachLog(h, u, "no rights") - return errors.New("Not enough rights to unattach, you must be a trusted editor"), "Not enough rights" - } - - if !h.Exists { - rejectUnattachLog(h, u, "does not exist") - return errors.New("Cannot unattach this hypha because it does not exist"), "Does not exist" - } - - if h.BinaryPath == "" { - rejectUnattachLog(h, u, "no amnt") - return errors.New("Cannot unattach this hypha because it has no attachment"), "No attachment" - } - - return nil, "" -} - -// UnattachHypha unattaches hypha and makes a history record about that. -func (h *Hypha) UnattachHypha(u *user.User) (hop *history.HistoryOp, errtitle string) { - hop = history.Operation(history.TypeUnattachHypha) - - if err, errtitle := h.CanUnattach(u); errtitle != "" { - hop.WithError(err) - return hop, errtitle - } - - hop. - WithFilesRemoved(h.BinaryPath). - WithMsg(fmt.Sprintf("Unattach ‘%s’", h.Name)). - WithUser(u). - Apply() - - if len(hop.Errs) > 0 { - rejectUnattachLog(h, u, "fail") - return hop.WithError(errors.New(fmt.Sprintf("Could not unattach this hypha due to internal server errors: <code>%v</code>", hop.Errs))), "Error" - } - - if h.BinaryPath != "" { - h.BinaryPath = "" - } - // If nothing is left of the hypha - if h.TextPath == "" { - h.delete() - } - return hop, "" -} diff --git a/hyphae/upload.go b/hyphae/upload.go deleted file mode 100644 index fcf2905..0000000 --- a/hyphae/upload.go +++ /dev/null @@ -1,122 +0,0 @@ -package hyphae - -import ( - "errors" - "fmt" - "io/ioutil" - "log" - "mime/multipart" - "os" - "path/filepath" - - "github.com/bouncepaw/mycorrhiza/history" - "github.com/bouncepaw/mycorrhiza/mimetype" - "github.com/bouncepaw/mycorrhiza/user" - "github.com/bouncepaw/mycorrhiza/util" -) - -func rejectEditLog(h *Hypha, u *user.User, errmsg string) { - log.Printf("Reject edit ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) -} - -func rejectAttachLog(h *Hypha, u *user.User, errmsg string) { - log.Printf("Reject attach ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) -} - -func (h *Hypha) CanEdit(u *user.User) (err error, errtitle string) { - if !u.CanProceed("edit") { - rejectEditLog(h, u, "no rights") - return errors.New("You must be an editor to edit pages."), "Not enough rights" - } - return nil, "" -} - -func (h *Hypha) CanUploadThat(data []byte, u *user.User) (err error, errtitle string) { - if len(data) == 0 { - return errors.New("No text data passed"), "Empty" - } - return nil, "" -} - -func (h *Hypha) UploadText(textData []byte, u *user.User) (hop *history.HistoryOp, errtitle string) { - hop = history.Operation(history.TypeEditText) - if h.Exists { - hop.WithMsg(fmt.Sprintf("Edit ‘%s’", h.Name)) - } else { - hop.WithMsg(fmt.Sprintf("Create ‘%s’", h.Name)) - } - - if err, errtitle := h.CanEdit(u); err != nil { - return hop.WithError(err), errtitle - } - if err, errtitle := h.CanUploadThat(textData, u); err != nil { - return hop.WithError(err), errtitle - } - - return h.uploadHelp(hop, ".myco", textData, u) -} - -func (h *Hypha) CanAttach(err error, u *user.User) (error, string) { - if !u.CanProceed("upload-binary") { - rejectAttachLog(h, u, "no rights") - return errors.New("You must be an editor to upload attachments."), "Not enough rights" - } - - if err != nil { - rejectAttachLog(h, u, err.Error()) - return errors.New("No binary data passed"), err.Error() - } - return nil, "" -} - -func (h *Hypha) UploadBinary(mime string, file multipart.File, u *user.User) (*history.HistoryOp, string) { - var ( - hop = history.Operation(history.TypeEditBinary).WithMsg(fmt.Sprintf("Upload binary part for ‘%s’ with type ‘%s’", h.Name, mime)) - data, err = ioutil.ReadAll(file) - ) - - if err != nil { - return hop.WithError(err), err.Error() - } - if err, errtitle := h.CanEdit(u); err != nil { - return hop.WithError(err), errtitle - } - if err, errtitle := h.CanUploadThat(data, u); err != nil { - return hop.WithError(err), errtitle - } - - return h.uploadHelp(hop, mimetype.ToExtension(mime), data, u) -} - -// uploadHelp is a helper function for UploadText and UploadBinary -func (h *Hypha) uploadHelp(hop *history.HistoryOp, ext string, data []byte, u *user.User) (*history.HistoryOp, string) { - var ( - fullPath = filepath.Join(util.WikiDir, h.Name+ext) - originalFullPath = &h.TextPath - ) - if hop.Type == history.TypeEditBinary { - originalFullPath = &h.BinaryPath - } - - if err := os.MkdirAll(filepath.Dir(fullPath), 0777); err != nil { - return hop.WithError(err), err.Error() - } - - if err := ioutil.WriteFile(fullPath, data, 0644); err != nil { - return hop.WithError(err), err.Error() - } - - if h.Exists && *originalFullPath != fullPath && *originalFullPath != "" { - if err := history.Rename(*originalFullPath, fullPath); err != nil { - return hop.WithError(err), err.Error() - } - log.Println("Move", *originalFullPath, "to", fullPath) - } - - h.InsertIfNew() - if h.Exists && h.TextPath != "" && hop.Type == history.TypeEditText && !history.FileChanged(fullPath) { - return hop.Abort(), "No changes" - } - *originalFullPath = fullPath - return hop.WithFiles(fullPath).WithUser(u).Apply(), "" -} diff --git a/main.go b/main.go index 7db388c..f35ff55 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ import ( "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/mimetype" + "github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" @@ -85,7 +86,7 @@ func handlerUpdateHeaderLinks(w http.ResponseWriter, rq *http.Request) { log.Println("Rejected", rq.URL) return } - hyphae.SetHeaderLinks() + shroom.SetHeaderLinks() http.Redirect(w, rq, "/", http.StatusSeeOther) } @@ -175,11 +176,11 @@ func main() { log.Println("Wiki storage directory is", WikiDir) hyphae.Index(WikiDir) log.Println("Indexed", hyphae.Count(), "hyphae") - hyphae.FindAllBacklinks() + shroom.FindAllBacklinks() log.Println("Found all backlinks") history.Start(WikiDir) - hyphae.SetHeaderLinks() + shroom.SetHeaderLinks() go handleGemini() diff --git a/shroom/backlink.go b/shroom/backlink.go new file mode 100644 index 0000000..1d8714a --- /dev/null +++ b/shroom/backlink.go @@ -0,0 +1,55 @@ +package shroom + +import ( + "fmt" + "io/ioutil" + "log" + "sync" + + "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/link" + "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/util" +) + +func BackLinkEntriesHTML(h *hyphae.Hypha) (html string) { + for _, backlinkHypha := range h.BackLinks { + _ = link.Link{} + html += fmt.Sprintf(`<li class="backlinks__entry"> + <a class="backlinks__link" href="/hypha/%s">%s</a>`, backlinkHypha.Name, util.BeautifulName(backlinkHypha.Name)) + } + return +} + +// FindAllBacklinks iterates over all hyphae that have text parts, sets their outlinks and then sets backlinks. +func FindAllBacklinks() { + for h := range hyphae.FilterTextHyphae(hyphae.YieldExistingHyphae()) { + findBacklinkWorker(h) + } +} + +func findBacklinkWorker(h *hyphae.Hypha) { + var ( + wg sync.WaitGroup + textContents, err = ioutil.ReadFile(h.TextPath) + ) + if err == nil { + for outlink := range markup.Doc(h.Name, string(textContents)).OutLinks() { + go func() { + wg.Add(1) + outlinkHypha := hyphae.ByName(outlink) + if outlinkHypha == h { + return + } + + outlinkHypha.AddBackLink(h) + outlinkHypha.InsertIfNewKeepExistence() + h.AddOutLink(outlinkHypha) + wg.Done() + }() + } + wg.Wait() + } else { + log.Println("Error when reading text contents of ‘%s’: %s", h.Name, err.Error()) + } +} diff --git a/shroom/can.go b/shroom/can.go new file mode 100644 index 0000000..152d896 --- /dev/null +++ b/shroom/can.go @@ -0,0 +1,92 @@ +package shroom + +import ( + "errors" + + "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/user" +) + +func canFactory( + rejectLogger func(*hyphae.Hypha, *user.User, string), + action string, + dispatcher func(*hyphae.Hypha, *user.User) (string, string), + noRightsMsg string, + notExistsMsg string, + careAboutExistince bool, +) func(*user.User, *hyphae.Hypha) (error, string) { + return func(u *user.User, h *hyphae.Hypha) (error, string) { + if !u.CanProceed(action) { + rejectLogger(h, u, "no rights") + return errors.New(noRightsMsg), "Not enough rights" + } + + if careAboutExistince && !h.Exists { + rejectLogger(h, u, "does not exist") + return errors.New(notExistsMsg), "Does not exist" + } + + if dispatcher == nil { + return nil, "" + } + errmsg, errtitle := dispatcher(h, u) + if errtitle == "" { + return nil, "" + } + return errors.New(errmsg), errtitle + } +} + +var ( + CanDelete = canFactory( + rejectDeleteLog, + "delete-confirm", + nil, + "Not enough rights to delete, you must be a moderator", + "Cannot delete this hypha because it does not exist", + true, + ) + + CanRename = canFactory( + rejectRenameLog, + "rename-confirm", + nil, + "Not enough rights to rename, you must be a trusted editor", + "Cannot rename this hypha because it does not exist", + true, + ) + + CanUnattach = canFactory( + rejectUnattachLog, + "unattach-confirm", + func(h *hyphae.Hypha, u *user.User) (errmsg, errtitle string) { + if h.BinaryPath == "" { + rejectUnattachLog(h, u, "no amnt") + return "Cannot unattach this hypha because it has no attachment", "No attachment" + } + + return "", "" + }, + "Not enough rights to unattach, you must be a trusted editor", + "Cannot unattach this hypha because it does not exist", + true, + ) + + CanEdit = canFactory( + rejectEditLog, + "upload-text", + nil, + "You must be an editor to edit a hypha", + "You cannot edit a hypha that does not exist", + false, + ) + + CanAttach = canFactory( + rejectAttachLog, + "upload-binary", + nil, + "You must be an editor to attach a hypha", + "You cannot attach a hypha that does not exist", + false, + ) +) diff --git a/shroom/delete.go b/shroom/delete.go new file mode 100644 index 0000000..f88f017 --- /dev/null +++ b/shroom/delete.go @@ -0,0 +1,29 @@ +package shroom + +import ( + "fmt" + + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/user" +) + +// DeleteHypha deletes hypha and makes a history record about that. +func DeleteHypha(u *user.User, h *hyphae.Hypha) (hop *history.HistoryOp, errtitle string) { + hop = history.Operation(history.TypeDeleteHypha) + + if err, errtitle := CanDelete(u, h); errtitle != "" { + hop.WithError(err).Abort() + return hop, errtitle + } + + hop. + WithFilesRemoved(h.TextPath, h.BinaryPath). + WithMsg(fmt.Sprintf("Delete ‘%s’", h.Name)). + WithUser(u). + Apply() + if !hop.HasErrors() { + h.Delete() + } + return hop, "" +} diff --git a/shroom/init.go b/shroom/init.go new file mode 100644 index 0000000..c3c4cc1 --- /dev/null +++ b/shroom/init.go @@ -0,0 +1,37 @@ +package shroom + +import ( + "errors" + + "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/util" +) + +func init() { + markup.HyphaExists = func(hyphaName string) bool { + return hyphae.ByName(hyphaName).Exists + } + markup.HyphaAccess = func(hyphaName string) (rawText, binaryBlock string, err error) { + if h := hyphae.ByName(hyphaName); h.Exists { + rawText, err = FetchTextPart(h) + if h.BinaryPath != "" { + binaryBlock = BinaryHtmlBlock(h) + } + } else { + err = errors.New("Hypha " + hyphaName + " does not exist") + } + return + } + markup.HyphaIterate = func(λ func(string)) { + for h := range hyphae.YieldExistingHyphae() { + λ(h.Name) + } + } + markup.HyphaImageForOG = func(hyphaName string) string { + if h := hyphae.ByName(hyphaName); h.Exists && h.BinaryPath != "" { + return util.URL + "/binary/" + hyphaName + } + return util.URL + "/favicon.ico" + } +} diff --git a/shroom/log.go b/shroom/log.go new file mode 100644 index 0000000..0bfee28 --- /dev/null +++ b/shroom/log.go @@ -0,0 +1,24 @@ +package shroom + +import ( + "log" + + "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/user" +) + +func rejectDeleteLog(h *hyphae.Hypha, u *user.User, errmsg string) { + log.Printf("Reject delete ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} +func rejectRenameLog(h *hyphae.Hypha, u *user.User, errmsg string) { + log.Printf("Reject rename ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} +func rejectUnattachLog(h *hyphae.Hypha, u *user.User, errmsg string) { + log.Printf("Reject unattach ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} +func rejectEditLog(h *hyphae.Hypha, u *user.User, errmsg string) { + log.Printf("Reject edit ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} +func rejectAttachLog(h *hyphae.Hypha, u *user.User, errmsg string) { + log.Printf("Reject attach ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) +} diff --git a/hyphae/rename.go b/shroom/rename.go similarity index 68% rename from hyphae/rename.go rename to shroom/rename.go index 4831a21..7689538 100644 --- a/hyphae/rename.go +++ b/shroom/rename.go @@ -1,35 +1,17 @@ -package hyphae +package shroom import ( "errors" "fmt" - "log" "regexp" "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" ) -func rejectRenameLog(h *Hypha, u *user.User, errmsg string) { - log.Printf("Reject rename ‘%s’ by @%s: %s\n", h.Name, u.Name, errmsg) -} - -func (h *Hypha) CanRename(u *user.User) (err error, errtitle string) { - if !u.CanProceed("rename-confirm") { - rejectRenameLog(h, u, "no rights") - return errors.New("Not enough rights to rename, you must be a trusted editor"), "Not enough rights" - } - - if !h.Exists { - rejectRenameLog(h, u, "does not exist") - return errors.New("Cannot rename this hypha because it does not exist"), "Does not exist" - } - - return nil, "" -} - -func canRenameThisToThat(oh *Hypha, nh *Hypha, u *user.User) (err error, errtitle string) { +func canRenameThisToThat(oh *hyphae.Hypha, nh *hyphae.Hypha, u *user.User) (err error, errtitle string) { if nh.Exists { rejectRenameLog(oh, u, fmt.Sprintf("name ‘%s’ taken already", nh.Name)) return errors.New(fmt.Sprintf("Hypha named <a href='/hypha/%[1]s'>%[1]s</a> already exists, cannot rename", nh.Name)), "Name taken" @@ -40,7 +22,7 @@ func canRenameThisToThat(oh *Hypha, nh *Hypha, u *user.User) (err error, errtitl return errors.New("No new name is given"), "No name given" } - if !HyphaPattern.MatchString(nh.Name) { + if !hyphae.HyphaPattern.MatchString(nh.Name) { rejectRenameLog(oh, u, fmt.Sprintf("new name ‘%s’ invalid", nh.Name)) return errors.New("Invalid new name. Names cannot contain characters <code>^?!:#@><*|\"\\'&%</code>"), "Invalid name" } @@ -49,12 +31,12 @@ func canRenameThisToThat(oh *Hypha, nh *Hypha, u *user.User) (err error, errtitl } // RenameHypha renames hypha from old name `hyphaName` to `newName` and makes a history record about that. If `recursive` is `true`, its subhyphae will be renamed the same way. -func (h *Hypha) RenameHypha(newHypha *Hypha, recursive bool, u *user.User) (hop *history.HistoryOp, errtitle string) { +func RenameHypha(h *hyphae.Hypha, newHypha *hyphae.Hypha, recursive bool, u *user.User) (hop *history.HistoryOp, errtitle string) { newHypha.Lock() defer newHypha.Unlock() hop = history.Operation(history.TypeRenameHypha) - if err, errtitle := h.CanRename(u); errtitle != "" { + if err, errtitle := CanRename(u, h); errtitle != "" { hop.WithError(err) return hop, errtitle } @@ -85,7 +67,7 @@ func (h *Hypha) RenameHypha(newHypha *Hypha, recursive bool, u *user.User) (hop Apply() if len(hop.Errs) == 0 { for _, h := range hyphaeToRename { - h.renameTo(replaceName(h.Name)) + h.RenameTo(replaceName(h.Name)) h.Lock() h.TextPath = replaceName(h.TextPath) h.BinaryPath = replaceName(h.BinaryPath) @@ -95,15 +77,15 @@ func (h *Hypha) RenameHypha(newHypha *Hypha, recursive bool, u *user.User) (hop return hop, "" } -func findHyphaeToRename(superhypha *Hypha, recursive bool) []*Hypha { - hyphae := []*Hypha{superhypha} +func findHyphaeToRename(superhypha *hyphae.Hypha, recursive bool) []*hyphae.Hypha { + hyphae := []*hyphae.Hypha{superhypha} if recursive { hyphae = append(hyphae, superhypha.Subhyphae()...) } return hyphae } -func renamingPairs(hyphaeToRename []*Hypha, replaceName func(string) string) (map[string]string, error) { +func renamingPairs(hyphaeToRename []*hyphae.Hypha, replaceName func(string) string) (map[string]string, error) { renameMap := make(map[string]string) newNames := make([]string, len(hyphaeToRename)) for _, h := range hyphaeToRename { @@ -117,7 +99,7 @@ func renamingPairs(hyphaeToRename []*Hypha, replaceName func(string) string) (ma } h.RUnlock() } - if firstFailure, ok := AreFreeNames(newNames...); !ok { + if firstFailure, ok := hyphae.AreFreeNames(newNames...); !ok { return nil, errors.New("Hypha " + firstFailure + " already exists") } return renameMap, nil diff --git a/shroom/unattach.go b/shroom/unattach.go new file mode 100644 index 0000000..5ed5b0f --- /dev/null +++ b/shroom/unattach.go @@ -0,0 +1,40 @@ +package shroom + +import ( + "errors" + "fmt" + + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/user" +) + +// UnattachHypha unattaches hypha and makes a history record about that. +func UnattachHypha(u *user.User, h *hyphae.Hypha) (hop *history.HistoryOp, errtitle string) { + hop = history.Operation(history.TypeUnattachHypha) + + if err, errtitle := CanUnattach(u, h); errtitle != "" { + hop.WithError(err).Abort() + return hop, errtitle + } + + hop. + WithFilesRemoved(h.BinaryPath). + WithMsg(fmt.Sprintf("Unattach ‘%s’", h.Name)). + WithUser(u). + Apply() + + if len(hop.Errs) > 0 { + rejectUnattachLog(h, u, "fail") + return hop.WithError(errors.New(fmt.Sprintf("Could not unattach this hypha due to internal server errors: <code>%v</code>", hop.Errs))), "Error" + } + + if h.BinaryPath != "" { + h.BinaryPath = "" + } + // If nothing is left of the hypha + if h.TextPath == "" { + h.Delete() + } + return hop, "" +} diff --git a/shroom/upload.go b/shroom/upload.go new file mode 100644 index 0000000..08634b2 --- /dev/null +++ b/shroom/upload.go @@ -0,0 +1,87 @@ +package shroom + +import ( + "errors" + "fmt" + "io/ioutil" + "log" + "mime/multipart" + "os" + "path/filepath" + + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/hyphae" + "github.com/bouncepaw/mycorrhiza/mimetype" + "github.com/bouncepaw/mycorrhiza/user" + "github.com/bouncepaw/mycorrhiza/util" +) + +func UploadText(h *hyphae.Hypha, data []byte, u *user.User) (hop *history.HistoryOp, errtitle string) { + hop = history.Operation(history.TypeEditText) + if h.Exists { + hop.WithMsg(fmt.Sprintf("Edit ‘%s’", h.Name)) + } else { + hop.WithMsg(fmt.Sprintf("Create ‘%s’", h.Name)) + } + + if err, errtitle := CanEdit(u, h); err != nil { + return hop.WithError(err), errtitle + } + if len(data) == 0 { + return hop.WithError(errors.New("No data passed")), "Empty" + } + + return uploadHelp(h, hop, ".myco", data, u) +} + +func UploadBinary(h *hyphae.Hypha, mime string, file multipart.File, u *user.User) (*history.HistoryOp, string) { + var ( + hop = history.Operation(history.TypeEditBinary).WithMsg(fmt.Sprintf("Upload binary part for ‘%s’ with type ‘%s’", h.Name, mime)) + data, err = ioutil.ReadAll(file) + ) + + if err != nil { + return hop.WithError(err), err.Error() + } + if err, errtitle := CanAttach(u, h); err != nil { + return hop.WithError(err), errtitle + } + if len(data) == 0 { + return hop.WithError(errors.New("No data passed")), "Empty" + } + + return uploadHelp(h, hop, mimetype.ToExtension(mime), data, u) +} + +// uploadHelp is a helper function for UploadText and UploadBinary +func uploadHelp(h *hyphae.Hypha, hop *history.HistoryOp, ext string, data []byte, u *user.User) (*history.HistoryOp, string) { + var ( + fullPath = filepath.Join(util.WikiDir, h.Name+ext) + originalFullPath = &h.TextPath + ) + if hop.Type == history.TypeEditBinary { + originalFullPath = &h.BinaryPath + } + + if err := os.MkdirAll(filepath.Dir(fullPath), 0777); err != nil { + return hop.WithError(err), err.Error() + } + + if err := ioutil.WriteFile(fullPath, data, 0644); err != nil { + return hop.WithError(err), err.Error() + } + + if h.Exists && *originalFullPath != fullPath && *originalFullPath != "" { + if err := history.Rename(*originalFullPath, fullPath); err != nil { + return hop.WithError(err), err.Error() + } + log.Println("Move", *originalFullPath, "to", fullPath) + } + + h.InsertIfNew() + if h.Exists && h.TextPath != "" && hop.Type == history.TypeEditText && !history.FileChanged(fullPath) { + return hop.Abort(), "No changes" + } + *originalFullPath = fullPath + return hop.WithFiles(fullPath).WithUser(u).Apply(), "" +} diff --git a/hyphae/view.go b/shroom/view.go similarity index 86% rename from hyphae/view.go rename to shroom/view.go index e53ab4f..eca6751 100644 --- a/hyphae/view.go +++ b/shroom/view.go @@ -1,4 +1,4 @@ -package hyphae +package shroom import ( "fmt" @@ -6,12 +6,13 @@ import ( "os" "path/filepath" + "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/util" ) // FetchTextPart tries to read text file of the given hypha. If there is no file, empty string is returned. -func (h *Hypha) FetchTextPart() (string, error) { +func FetchTextPart(h *hyphae.Hypha) (string, error) { if h.TextPath == "" { return "", nil } @@ -25,7 +26,7 @@ func (h *Hypha) FetchTextPart() (string, error) { } // binaryHtmlBlock creates an html block for binary part of the hypha. -func (h *Hypha) BinaryHtmlBlock() string { +func BinaryHtmlBlock(h *hyphae.Hypha) string { switch filepath.Ext(h.BinaryPath) { case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico": return fmt.Sprintf(` @@ -35,7 +36,7 @@ func (h *Hypha) BinaryHtmlBlock() string { case ".ogg", ".webm", ".mp4": return fmt.Sprintf(` <div class="binary-container binary-container_with-video"> - <video> + <video controls> <source src="/binary/%[1]s"/> <p>Your browser does not support video. <a href="/binary/%[1]s">Download video</a></p> </video> @@ -43,7 +44,7 @@ func (h *Hypha) BinaryHtmlBlock() string { case ".mp3": return fmt.Sprintf(` <div class="binary-container binary-container_with-audio"> - <audio> + <audio controls> <source src="/binary/%[1]s"/> <p>Your browser does not support audio. <a href="/binary/%[1]s">Download audio</a></p> </audio> @@ -58,7 +59,7 @@ func (h *Hypha) BinaryHtmlBlock() string { } func SetHeaderLinks() { - if userLinksHypha := ByName(util.HeaderLinksHypha); !userLinksHypha.Exists { + if userLinksHypha := hyphae.ByName(util.HeaderLinksHypha); !userLinksHypha.Exists { util.SetDefaultHeaderLinks() } else { contents, err := ioutil.ReadFile(userLinksHypha.TextPath) From bcaa1de6b7c5e42f7123e74428fbe295aa1605d6 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 20:48:51 +0500 Subject: [PATCH 31/53] Move navititle, attachment block, backlinks sidebar to the new views module --- http_readers.go | 18 +-- main.go | 1 + name.go | 29 ---- shroom/backlink.go | 12 -- shroom/init.go | 3 +- shroom/view.go | 35 ----- templates/common.qtpl | 11 -- templates/common.qtpl.go | 86 +++-------- templates/readers.qtpl | 24 +-- templates/readers.qtpl.go | 266 +++++++++++++++++----------------- views/hypha.qtpl | 81 +++++++++++ views/hypha.qtpl.go | 297 ++++++++++++++++++++++++++++++++++++++ 12 files changed, 557 insertions(+), 306 deletions(-) create mode 100644 views/hypha.qtpl create mode 100644 views/hypha.qtpl.go diff --git a/http_readers.go b/http_readers.go index d99a865..9cc1351 100644 --- a/http_readers.go +++ b/http_readers.go @@ -13,11 +13,11 @@ import ( "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/mimetype" - "github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/tree" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" + "github.com/bouncepaw/mycorrhiza/views" ) func init() { @@ -36,9 +36,9 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { firstSlashIndex = strings.IndexRune(shorterUrl, '/') revHash = shorterUrl[:firstSlashIndex] hyphaName = util.CanonicalName(shorterUrl[firstSlashIndex+1:]) + h = hyphae.ByName(hyphaName) contents = fmt.Sprintf(`<p>This hypha had no text at this revision.</p>`) - TextPath = hyphaName + ".myco" - textContents, err = history.FileAtRevision(TextPath, revHash) + textContents, err = history.FileAtRevision(h.TextPath, revHash) u = user.FromRequest(rq) ) if err == nil { @@ -47,8 +47,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { treeHTML, subhyphae, _, _ := tree.Tree(hyphaName) page := templates.RevisionHTML( rq, - hyphaName, - naviTitle(hyphaName), + h, contents, treeHTML, subhyphae, @@ -87,7 +86,6 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { var ( hyphaName = HyphaNameFromRq(rq, "page", "hypha") h = hyphae.ByName(hyphaName) - hasAmnt = h.Exists && h.BinaryPath != "" contents string openGraph string u = user.FromRequest(rq) @@ -101,21 +99,19 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { openGraph = md.OpenGraphHTML() } if !os.IsNotExist(errB) { - contents = shroom.BinaryHtmlBlock(h) + contents + contents = views.AttachmentHTML(h) + contents } } treeHTML, subhyphaeHTML, prevHypha, nextHypha := tree.Tree(hyphaName) util.HTTP200Page(w, templates.BaseHTML( util.BeautifulName(hyphaName), - templates.PageHTML(rq, hyphaName, - naviTitle(hyphaName), + templates.PageHTML(rq, h, contents, treeHTML, subhyphaeHTML, - shroom.BackLinkEntriesHTML(h), prevHypha, nextHypha, - hasAmnt), + ), u, openGraph)) } diff --git a/main.go b/main.go index f35ff55..e36233d 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,6 @@ //go:generate go get -u github.com/valyala/quicktemplate/qtc //go:generate qtc -dir=templates +//go:generate qtc -dir=views package main import ( diff --git a/name.go b/name.go index 739c166..7da76ba 100644 --- a/name.go +++ b/name.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "log" "net/http" "strings" @@ -11,34 +10,6 @@ import ( "github.com/bouncepaw/mycorrhiza/util" ) -// naviTitle turns `canonicalName` into html string with each hypha path parts higlighted as links. -// TODO: rework as a template -func naviTitle(canonicalName string) string { - var ( - html = fmt.Sprintf(`<h1 class="navi-title" id="navi-title"> - <a href="/hypha/%s">%s</a><span aria-hidden="true" class="navi-title__colon">:</span>`, util.HomePage, util.SiteNavIcon) - prevAcc = `/hypha/` - parts = strings.Split(canonicalName, "/") - rel = "up" - ) - for i, part := range parts { - if i > 0 { - html += `<span aria-hidden="true" class="navi-title__separator">/</span>` - } - if i == len(parts)-1 { - rel = "bookmark" - } - html += fmt.Sprintf( - `<a href="%s" rel="%s">%s</a>`, - prevAcc+part, - rel, - util.BeautifulName(part), - ) - prevAcc += part + "/" - } - return html + "</h1>" -} - // HyphaNameFromRq extracts hypha name from http request. You have to also pass the action which is embedded in the url or several actions. For url /hypha/hypha, the action would be "hypha". func HyphaNameFromRq(rq *http.Request, actions ...string) string { p := rq.URL.Path diff --git a/shroom/backlink.go b/shroom/backlink.go index 1d8714a..8335fc2 100644 --- a/shroom/backlink.go +++ b/shroom/backlink.go @@ -1,26 +1,14 @@ package shroom import ( - "fmt" "io/ioutil" "log" "sync" "github.com/bouncepaw/mycorrhiza/hyphae" - "github.com/bouncepaw/mycorrhiza/link" "github.com/bouncepaw/mycorrhiza/markup" - "github.com/bouncepaw/mycorrhiza/util" ) -func BackLinkEntriesHTML(h *hyphae.Hypha) (html string) { - for _, backlinkHypha := range h.BackLinks { - _ = link.Link{} - html += fmt.Sprintf(`<li class="backlinks__entry"> - <a class="backlinks__link" href="/hypha/%s">%s</a>`, backlinkHypha.Name, util.BeautifulName(backlinkHypha.Name)) - } - return -} - // FindAllBacklinks iterates over all hyphae that have text parts, sets their outlinks and then sets backlinks. func FindAllBacklinks() { for h := range hyphae.FilterTextHyphae(hyphae.YieldExistingHyphae()) { diff --git a/shroom/init.go b/shroom/init.go index c3c4cc1..96a6195 100644 --- a/shroom/init.go +++ b/shroom/init.go @@ -6,6 +6,7 @@ import ( "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/util" + "github.com/bouncepaw/mycorrhiza/views" ) func init() { @@ -16,7 +17,7 @@ func init() { if h := hyphae.ByName(hyphaName); h.Exists { rawText, err = FetchTextPart(h) if h.BinaryPath != "" { - binaryBlock = BinaryHtmlBlock(h) + binaryBlock = views.AttachmentHTML(h) } } else { err = errors.New("Hypha " + hyphaName + " does not exist") diff --git a/shroom/view.go b/shroom/view.go index eca6751..05becb9 100644 --- a/shroom/view.go +++ b/shroom/view.go @@ -1,10 +1,8 @@ package shroom import ( - "fmt" "io/ioutil" "os" - "path/filepath" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" @@ -25,39 +23,6 @@ func FetchTextPart(h *hyphae.Hypha) (string, error) { return string(text), nil } -// binaryHtmlBlock creates an html block for binary part of the hypha. -func BinaryHtmlBlock(h *hyphae.Hypha) string { - switch filepath.Ext(h.BinaryPath) { - case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico": - return fmt.Sprintf(` - <div class="binary-container binary-container_with-img"> - <a href="/binary/%[1]s"><img src="/binary/%[1]s"/></a> - </div>`, h.Name) - case ".ogg", ".webm", ".mp4": - return fmt.Sprintf(` - <div class="binary-container binary-container_with-video"> - <video controls> - <source src="/binary/%[1]s"/> - <p>Your browser does not support video. <a href="/binary/%[1]s">Download video</a></p> - </video> - `, h.Name) - case ".mp3": - return fmt.Sprintf(` - <div class="binary-container binary-container_with-audio"> - <audio controls> - <source src="/binary/%[1]s"/> - <p>Your browser does not support audio. <a href="/binary/%[1]s">Download audio</a></p> - </audio> - `, h.Name) - default: - return fmt.Sprintf(` - <div class="binary-container binary-container_with-nothing"> - <p><a href="/binary/%s">Download media</a></p> - </div> - `, h.Name) - } -} - func SetHeaderLinks() { if userLinksHypha := hyphae.ByName(util.HeaderLinksHypha); !userLinksHypha.Exists { util.SetDefaultHeaderLinks() diff --git a/templates/common.qtpl b/templates/common.qtpl index 6b094d1..57dea92 100644 --- a/templates/common.qtpl +++ b/templates/common.qtpl @@ -64,17 +64,6 @@ var navEntries = []navEntry{ </aside> {% endfunc %} -{% func backlinks(backlinkEntries string) %} -<aside class="backlinks layout-card"> - <h2 class="backlinks__title layout-card__title">Backlinks</h2> - <nav class="backlinks__nav"> - <ul class="backlinks__list"> - {%s= backlinkEntries %} - </ul> - </nav> -</aside> -{% endfunc %} - {% func subhyphaeMatrix(subhyphae string) %} {% if strings.TrimSpace(subhyphae) != "" %} <section class="subhyphae"> diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go index 788b784..b168af2 100644 --- a/templates/common.qtpl.go +++ b/templates/common.qtpl.go @@ -258,103 +258,57 @@ func relativeHyphae(relatives string) string { } //line templates/common.qtpl:67 -func streambacklinks(qw422016 *qt422016.Writer, backlinkEntries string) { +func streamsubhyphaeMatrix(qw422016 *qt422016.Writer, subhyphae string) { //line templates/common.qtpl:67 qw422016.N().S(` -<aside class="backlinks layout-card"> - <h2 class="backlinks__title layout-card__title">Backlinks</h2> - <nav class="backlinks__nav"> - <ul class="backlinks__list"> - `) -//line templates/common.qtpl:72 - qw422016.N().S(backlinkEntries) -//line templates/common.qtpl:72 - qw422016.N().S(` - </ul> - </nav> -</aside> `) -//line templates/common.qtpl:76 -} - -//line templates/common.qtpl:76 -func writebacklinks(qq422016 qtio422016.Writer, backlinkEntries string) { -//line templates/common.qtpl:76 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:76 - streambacklinks(qw422016, backlinkEntries) -//line templates/common.qtpl:76 - qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:76 -} - -//line templates/common.qtpl:76 -func backlinks(backlinkEntries string) string { -//line templates/common.qtpl:76 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:76 - writebacklinks(qb422016, backlinkEntries) -//line templates/common.qtpl:76 - qs422016 := string(qb422016.B) -//line templates/common.qtpl:76 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:76 - return qs422016 -//line templates/common.qtpl:76 -} - -//line templates/common.qtpl:78 -func streamsubhyphaeMatrix(qw422016 *qt422016.Writer, subhyphae string) { -//line templates/common.qtpl:78 - qw422016.N().S(` -`) -//line templates/common.qtpl:79 +//line templates/common.qtpl:68 if strings.TrimSpace(subhyphae) != "" { -//line templates/common.qtpl:79 +//line templates/common.qtpl:68 qw422016.N().S(` <section class="subhyphae"> <h2 class="subhyphae__title">Subhyphae</h2> <nav class="subhyphae__nav"> <ul class="subhyphae__list"> `) -//line templates/common.qtpl:84 +//line templates/common.qtpl:73 qw422016.N().S(subhyphae) -//line templates/common.qtpl:84 +//line templates/common.qtpl:73 qw422016.N().S(` </ul> </nav> </section> `) -//line templates/common.qtpl:88 +//line templates/common.qtpl:77 } -//line templates/common.qtpl:88 +//line templates/common.qtpl:77 qw422016.N().S(` `) -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 } -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 func writesubhyphaeMatrix(qq422016 qtio422016.Writer, subhyphae string) { -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 streamsubhyphaeMatrix(qw422016, subhyphae) -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 } -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 func subhyphaeMatrix(subhyphae string) string { -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 writesubhyphaeMatrix(qb422016, subhyphae) -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 qs422016 := string(qb422016.B) -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 return qs422016 -//line templates/common.qtpl:89 +//line templates/common.qtpl:78 } diff --git a/templates/readers.qtpl b/templates/readers.qtpl index 3bedb30..3a7e1e1 100644 --- a/templates/readers.qtpl +++ b/templates/readers.qtpl @@ -1,7 +1,9 @@ {% import "net/http" %} {% import "path" %} +{% import "github.com/bouncepaw/mycorrhiza/hyphae" %} {% import "github.com/bouncepaw/mycorrhiza/user" %} {% import "github.com/bouncepaw/mycorrhiza/util" %} +{% import "github.com/bouncepaw/mycorrhiza/views" %} {% func HistoryHTML(rq *http.Request, hyphaName, list string) %} {%= navHTML(rq, hyphaName, "history") %} @@ -15,13 +17,13 @@ </div> {% endfunc %} -{% func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) %} -{%= navHTML(rq, hyphaName, "revision", revHash) %} +{% func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) %} +{%= navHTML(rq, h.Name, "revision", revHash) %} <div class="layout"> <main class="main-width"> <article> <p>Please note that viewing binary parts of hyphae is not supported in history for now.</p> - {%s= naviTitle %} + {%s= views.NaviTitleHTML(h) %} {%s= contents %} </article> {%= subhyphaeMatrix(subhyphae) %} @@ -31,14 +33,14 @@ {% endfunc %} If `contents` == "", a helpful message is shown instead. -{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) %} -{%= navHTML(rq, hyphaName, "page") %} +{% func PageHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) %} +{%= navHTML(rq, h.Name, "page") %} <div class="layout"> <main class="main-width"> <article> - {%s= naviTitle %} + {%s= views.NaviTitleHTML(h) %} {% if contents == "" %} - <p>This hypha has no text. Why not <a href="/edit/{%s hyphaName %}">create it</a>?</p> + <p>This hypha has no text. Why not <a href="/edit/{%s h.Name %}">create it</a>?</p> {% else %} {%s= contents %} {% endif %} @@ -52,11 +54,11 @@ If `contents` == "", a helpful message is shown instead. {% endif %} </section> {% if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" %} - <form action="/upload-binary/{%s hyphaName %}" + <form action="/upload-binary/{%s h.Name %}" method="post" enctype="multipart/form-data" class="upload-amnt"> - {% if hasAmnt %} - <a class="upload-amnt__unattach" href="/unattach-ask/{%s hyphaName %}">Unattach current attachment?</a> + {% if h.Exists && h.BinaryPath != "" %} + <a class="upload-amnt__unattach" href="/unattach-ask/{%s h.Name %}">Unattach current attachment?</a> {% endif %} <label for="upload-binary__input">Upload a new attachment</label> <br> @@ -67,6 +69,6 @@ If `contents` == "", a helpful message is shown instead. {%= subhyphaeMatrix(subhyphae) %} </main> {%= relativeHyphae(relatives) %} -{%= backlinks(backlinkEntries) %} +{%= views.BackLinksHTML(h) %} </div> {% endfunc %} diff --git a/templates/readers.qtpl.go b/templates/readers.qtpl.go index 5ea91a1..fed0a7f 100644 --- a/templates/readers.qtpl.go +++ b/templates/readers.qtpl.go @@ -11,256 +11,262 @@ import "net/http" import "path" //line templates/readers.qtpl:3 -import "github.com/bouncepaw/mycorrhiza/user" +import "github.com/bouncepaw/mycorrhiza/hyphae" //line templates/readers.qtpl:4 +import "github.com/bouncepaw/mycorrhiza/user" + +//line templates/readers.qtpl:5 import "github.com/bouncepaw/mycorrhiza/util" //line templates/readers.qtpl:6 +import "github.com/bouncepaw/mycorrhiza/views" + +//line templates/readers.qtpl:8 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/readers.qtpl:6 +//line templates/readers.qtpl:8 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/readers.qtpl:6 +//line templates/readers.qtpl:8 func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/readers.qtpl:6 +//line templates/readers.qtpl:8 qw422016.N().S(` `) -//line templates/readers.qtpl:7 +//line templates/readers.qtpl:9 streamnavHTML(qw422016, rq, hyphaName, "history") -//line templates/readers.qtpl:7 +//line templates/readers.qtpl:9 qw422016.N().S(` <div class="layout"> <main class="main-width"> <article class="history"> <h1>History of `) -//line templates/readers.qtpl:11 +//line templates/readers.qtpl:13 qw422016.E().S(hyphaName) -//line templates/readers.qtpl:11 +//line templates/readers.qtpl:13 qw422016.N().S(`</h1> `) -//line templates/readers.qtpl:12 +//line templates/readers.qtpl:14 qw422016.N().S(list) -//line templates/readers.qtpl:12 +//line templates/readers.qtpl:14 qw422016.N().S(` </article> </main> </div> `) -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 } -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 StreamHistoryHTML(qw422016, rq, hyphaName, list) -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 } -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 func HistoryHTML(rq *http.Request, hyphaName, list string) string { -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 WriteHistoryHTML(qb422016, rq, hyphaName, list) -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 return qs422016 -//line templates/readers.qtpl:16 +//line templates/readers.qtpl:18 } -//line templates/readers.qtpl:18 -func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) { -//line templates/readers.qtpl:18 +//line templates/readers.qtpl:20 +func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) { +//line templates/readers.qtpl:20 qw422016.N().S(` `) -//line templates/readers.qtpl:19 - streamnavHTML(qw422016, rq, hyphaName, "revision", revHash) -//line templates/readers.qtpl:19 +//line templates/readers.qtpl:21 + streamnavHTML(qw422016, rq, h.Name, "revision", revHash) +//line templates/readers.qtpl:21 qw422016.N().S(` <div class="layout"> <main class="main-width"> <article> <p>Please note that viewing binary parts of hyphae is not supported in history for now.</p> `) -//line templates/readers.qtpl:24 - qw422016.N().S(naviTitle) -//line templates/readers.qtpl:24 +//line templates/readers.qtpl:26 + qw422016.N().S(views.NaviTitleHTML(h)) +//line templates/readers.qtpl:26 qw422016.N().S(` `) -//line templates/readers.qtpl:25 +//line templates/readers.qtpl:27 qw422016.N().S(contents) -//line templates/readers.qtpl:25 +//line templates/readers.qtpl:27 qw422016.N().S(` </article> `) -//line templates/readers.qtpl:27 +//line templates/readers.qtpl:29 streamsubhyphaeMatrix(qw422016, subhyphae) -//line templates/readers.qtpl:27 +//line templates/readers.qtpl:29 qw422016.N().S(` </main> `) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:31 streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:29 +//line templates/readers.qtpl:31 qw422016.N().S(` </div> `) -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 } -//line templates/readers.qtpl:31 -func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) { -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 +func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) { +//line templates/readers.qtpl:33 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:31 - StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, revHash) -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 + StreamRevisionHTML(qw422016, rq, h, contents, relatives, subhyphae, revHash) +//line templates/readers.qtpl:33 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 } -//line templates/readers.qtpl:31 -func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, revHash string) string { -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 +func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) string { +//line templates/readers.qtpl:33 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:31 - WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, revHash) -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 + WriteRevisionHTML(qb422016, rq, h, contents, relatives, subhyphae, revHash) +//line templates/readers.qtpl:33 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 return qs422016 -//line templates/readers.qtpl:31 +//line templates/readers.qtpl:33 } // If `contents` == "", a helpful message is shown instead. -//line templates/readers.qtpl:34 -func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/readers.qtpl:34 +//line templates/readers.qtpl:36 +func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) { +//line templates/readers.qtpl:36 qw422016.N().S(` `) -//line templates/readers.qtpl:35 - streamnavHTML(qw422016, rq, hyphaName, "page") -//line templates/readers.qtpl:35 +//line templates/readers.qtpl:37 + streamnavHTML(qw422016, rq, h.Name, "page") +//line templates/readers.qtpl:37 qw422016.N().S(` <div class="layout"> <main class="main-width"> <article> `) -//line templates/readers.qtpl:39 - qw422016.N().S(naviTitle) -//line templates/readers.qtpl:39 +//line templates/readers.qtpl:41 + qw422016.N().S(views.NaviTitleHTML(h)) +//line templates/readers.qtpl:41 qw422016.N().S(` `) -//line templates/readers.qtpl:40 +//line templates/readers.qtpl:42 if contents == "" { -//line templates/readers.qtpl:40 +//line templates/readers.qtpl:42 qw422016.N().S(` <p>This hypha has no text. Why not <a href="/edit/`) -//line templates/readers.qtpl:41 - qw422016.E().S(hyphaName) -//line templates/readers.qtpl:41 +//line templates/readers.qtpl:43 + qw422016.E().S(h.Name) +//line templates/readers.qtpl:43 qw422016.N().S(`">create it</a>?</p> `) -//line templates/readers.qtpl:42 +//line templates/readers.qtpl:44 } else { -//line templates/readers.qtpl:42 +//line templates/readers.qtpl:44 qw422016.N().S(` `) -//line templates/readers.qtpl:43 +//line templates/readers.qtpl:45 qw422016.N().S(contents) -//line templates/readers.qtpl:43 +//line templates/readers.qtpl:45 qw422016.N().S(` `) -//line templates/readers.qtpl:44 +//line templates/readers.qtpl:46 } -//line templates/readers.qtpl:44 +//line templates/readers.qtpl:46 qw422016.N().S(` </article> <section class="prevnext"> `) -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:49 if prevHyphaName != "" { -//line templates/readers.qtpl:47 +//line templates/readers.qtpl:49 qw422016.N().S(` <a class="prevnext__el prevnext__prev" href="/hypha/`) -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:50 qw422016.E().S(prevHyphaName) -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:50 qw422016.N().S(`" rel="prev">← `) -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:50 qw422016.E().S(util.BeautifulName(path.Base(prevHyphaName))) -//line templates/readers.qtpl:48 +//line templates/readers.qtpl:50 qw422016.N().S(`</a> `) -//line templates/readers.qtpl:49 +//line templates/readers.qtpl:51 } -//line templates/readers.qtpl:49 +//line templates/readers.qtpl:51 qw422016.N().S(` `) -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:52 if nextHyphaName != "" { -//line templates/readers.qtpl:50 +//line templates/readers.qtpl:52 qw422016.N().S(` <a class="prevnext__el prevnext__next" href="/hypha/`) -//line templates/readers.qtpl:51 +//line templates/readers.qtpl:53 qw422016.E().S(nextHyphaName) -//line templates/readers.qtpl:51 +//line templates/readers.qtpl:53 qw422016.N().S(`" rel="next">`) -//line templates/readers.qtpl:51 +//line templates/readers.qtpl:53 qw422016.E().S(util.BeautifulName(path.Base(nextHyphaName))) -//line templates/readers.qtpl:51 +//line templates/readers.qtpl:53 qw422016.N().S(` →</a> `) -//line templates/readers.qtpl:52 +//line templates/readers.qtpl:54 } -//line templates/readers.qtpl:52 +//line templates/readers.qtpl:54 qw422016.N().S(` </section> `) -//line templates/readers.qtpl:54 +//line templates/readers.qtpl:56 if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" { -//line templates/readers.qtpl:54 +//line templates/readers.qtpl:56 qw422016.N().S(` <form action="/upload-binary/`) -//line templates/readers.qtpl:55 - qw422016.E().S(hyphaName) -//line templates/readers.qtpl:55 +//line templates/readers.qtpl:57 + qw422016.E().S(h.Name) +//line templates/readers.qtpl:57 qw422016.N().S(`" method="post" enctype="multipart/form-data" class="upload-amnt"> `) -//line templates/readers.qtpl:58 - if hasAmnt { -//line templates/readers.qtpl:58 +//line templates/readers.qtpl:60 + if h.Exists && h.BinaryPath != "" { +//line templates/readers.qtpl:60 qw422016.N().S(` <a class="upload-amnt__unattach" href="/unattach-ask/`) -//line templates/readers.qtpl:59 - qw422016.E().S(hyphaName) -//line templates/readers.qtpl:59 +//line templates/readers.qtpl:61 + qw422016.E().S(h.Name) +//line templates/readers.qtpl:61 qw422016.N().S(`">Unattach current attachment?</a> `) -//line templates/readers.qtpl:60 +//line templates/readers.qtpl:62 } -//line templates/readers.qtpl:60 +//line templates/readers.qtpl:62 qw422016.N().S(` <label for="upload-binary__input">Upload a new attachment</label> <br> @@ -268,53 +274,53 @@ func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navi <input type="submit"/> </form> `) -//line templates/readers.qtpl:66 +//line templates/readers.qtpl:68 } -//line templates/readers.qtpl:66 +//line templates/readers.qtpl:68 qw422016.N().S(` `) -//line templates/readers.qtpl:67 +//line templates/readers.qtpl:69 streamsubhyphaeMatrix(qw422016, subhyphae) -//line templates/readers.qtpl:67 +//line templates/readers.qtpl:69 qw422016.N().S(` </main> `) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:71 streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:69 +//line templates/readers.qtpl:71 qw422016.N().S(` `) -//line templates/readers.qtpl:70 - streambacklinks(qw422016, backlinkEntries) -//line templates/readers.qtpl:70 +//line templates/readers.qtpl:72 + views.StreamBackLinksHTML(qw422016, h) +//line templates/readers.qtpl:72 qw422016.N().S(` </div> `) -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 } -//line templates/readers.qtpl:72 -func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) { -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 +func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) { +//line templates/readers.qtpl:74 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:72 - StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 + StreamPageHTML(qw422016, rq, h, contents, relatives, subhyphae, prevHyphaName, nextHyphaName) +//line templates/readers.qtpl:74 qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 } -//line templates/readers.qtpl:72 -func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName string, hasAmnt bool) string { -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 +func PageHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) string { +//line templates/readers.qtpl:74 qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:72 - WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, relatives, subhyphae, backlinkEntries, prevHyphaName, nextHyphaName, hasAmnt) -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 + WritePageHTML(qb422016, rq, h, contents, relatives, subhyphae, prevHyphaName, nextHyphaName) +//line templates/readers.qtpl:74 qs422016 := string(qb422016.B) -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 return qs422016 -//line templates/readers.qtpl:72 +//line templates/readers.qtpl:74 } diff --git a/views/hypha.qtpl b/views/hypha.qtpl new file mode 100644 index 0000000..a2d74ba --- /dev/null +++ b/views/hypha.qtpl @@ -0,0 +1,81 @@ +{% import "path/filepath" %} +{% import "strings" %} +{% import "github.com/bouncepaw/mycorrhiza/hyphae" %} +{% import "github.com/bouncepaw/mycorrhiza/util" %} + +{% func NaviTitleHTML(h *hyphae.Hypha) %} +{% code + var ( + prevAcc = "/hypha/" + parts = strings.Split(h.Name, "/") + ) +%} +<h1 class="navi-title"> +{% stripspace %} + <a href="/hypha/{%s util.HomePage %}"> + {%-s= util.SiteNavIcon -%} + <span aria-hidden="true" class="navi-title__colon">:</span> + </a> + + {% for i, part := range parts %} + {% if i > 0 %} + <span aria-hidden="true" class="navi-title__separator">/</span> + {% endif %} + + <a href="{%s prevAcc + part %}" + rel="{% if i == len(parts) - 1 %}bookmark{% else %}up{% endif %}"> + {%s= util.BeautifulName(part) %} + </a> + {% code prevAcc += part + "/" %} + {% endfor %} +{% endstripspace %} +</h1> +{% endfunc %} + +{% func BackLinksHTML(h *hyphae.Hypha) %} +<aside class="backlinks layout-card"> + <h2 class="backlinks__title layout-card__title">Backlinks</h2> + <nav class="backlinks__nav"> + <ul class="backlinks__list"> + {% for _, backlink := range h.BackLinks %} + <li class="backlinks__entry"> + <a class="backlinks__link" href="/hypha/{%s backlink.Name %}"> + {%s util.BeautifulName(filepath.Base(backlink.Name)) %} + </a> + </li> + {% endfor %} + </ul> + </nav> +</aside> +{% endfunc %} + +{% func AttachmentHTML(h *hyphae.Hypha) %} + {% switch filepath.Ext(h.BinaryPath) %} + + {% case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico" %} + <div class="binary-container binary-container_with-img"> + <a href="/binary/{%s= h.Name %}"><img src="/binary/{%s= h.Name %}"/></a> + </div> + + {% case ".ogg", ".webm", ".mp4" %} + <div class="binary-container binary-container_with-video"> + <video controls> + <source src="/binary/{%s= h.Name %}"/> + <p>Your browser does not support video. <a href="/binary/{%s= h.Name %}">Download video</a></p> + </video> + </div> + + {% case ".mp3" %} + <div class="binary-container binary-container_with-audio"> + <audio controls> + <source src="/binary/{%s= h.Name %}"/> + <p>Your browser does not support audio. <a href="/binary/{%s= h.Name %}">Download audio</a></p> + </audio> + </div> + + {% default %} + <div class="binary-container binary-container_with-nothing"> + <p><a href="/binary/{%s= h.Name %}">Download media</a></p> + </div> +{% endswitch %} +{% endfunc %} diff --git a/views/hypha.qtpl.go b/views/hypha.qtpl.go new file mode 100644 index 0000000..499b9aa --- /dev/null +++ b/views/hypha.qtpl.go @@ -0,0 +1,297 @@ +// Code generated by qtc from "hypha.qtpl". DO NOT EDIT. +// See https://github.com/valyala/quicktemplate for details. + +//line views/hypha.qtpl:1 +package views + +//line views/hypha.qtpl:1 +import "path/filepath" + +//line views/hypha.qtpl:2 +import "strings" + +//line views/hypha.qtpl:3 +import "github.com/bouncepaw/mycorrhiza/hyphae" + +//line views/hypha.qtpl:4 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/hypha.qtpl:6 +import ( + qtio422016 "io" + + qt422016 "github.com/valyala/quicktemplate" +) + +//line views/hypha.qtpl:6 +var ( + _ = qtio422016.Copy + _ = qt422016.AcquireByteBuffer +) + +//line views/hypha.qtpl:6 +func StreamNaviTitleHTML(qw422016 *qt422016.Writer, h *hyphae.Hypha) { +//line views/hypha.qtpl:6 + qw422016.N().S(` +`) +//line views/hypha.qtpl:8 + var ( + prevAcc = "/hypha/" + parts = strings.Split(h.Name, "/") + ) + +//line views/hypha.qtpl:12 + qw422016.N().S(` +<h1 class="navi-title"> +`) +//line views/hypha.qtpl:14 + qw422016.N().S(`<a href="/hypha/`) +//line views/hypha.qtpl:15 + qw422016.E().S(util.HomePage) +//line views/hypha.qtpl:15 + qw422016.N().S(`">`) +//line views/hypha.qtpl:16 + qw422016.N().S(util.SiteNavIcon) +//line views/hypha.qtpl:16 + qw422016.N().S(`<span aria-hidden="true" class="navi-title__colon">:</span></a>`) +//line views/hypha.qtpl:20 + for i, part := range parts { +//line views/hypha.qtpl:21 + if i > 0 { +//line views/hypha.qtpl:21 + qw422016.N().S(`<span aria-hidden="true" class="navi-title__separator">/</span>`) +//line views/hypha.qtpl:23 + } +//line views/hypha.qtpl:23 + qw422016.N().S(`<a href="`) +//line views/hypha.qtpl:25 + qw422016.E().S(prevAcc + part) +//line views/hypha.qtpl:25 + qw422016.N().S(`"rel="`) +//line views/hypha.qtpl:26 + if i == len(parts)-1 { +//line views/hypha.qtpl:26 + qw422016.N().S(`bookmark`) +//line views/hypha.qtpl:26 + } else { +//line views/hypha.qtpl:26 + qw422016.N().S(`up`) +//line views/hypha.qtpl:26 + } +//line views/hypha.qtpl:26 + qw422016.N().S(`">`) +//line views/hypha.qtpl:27 + qw422016.N().S(util.BeautifulName(part)) +//line views/hypha.qtpl:27 + qw422016.N().S(`</a>`) +//line views/hypha.qtpl:29 + prevAcc += part + "/" + +//line views/hypha.qtpl:30 + } +//line views/hypha.qtpl:31 + qw422016.N().S(` +</h1> +`) +//line views/hypha.qtpl:33 +} + +//line views/hypha.qtpl:33 +func WriteNaviTitleHTML(qq422016 qtio422016.Writer, h *hyphae.Hypha) { +//line views/hypha.qtpl:33 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/hypha.qtpl:33 + StreamNaviTitleHTML(qw422016, h) +//line views/hypha.qtpl:33 + qt422016.ReleaseWriter(qw422016) +//line views/hypha.qtpl:33 +} + +//line views/hypha.qtpl:33 +func NaviTitleHTML(h *hyphae.Hypha) string { +//line views/hypha.qtpl:33 + qb422016 := qt422016.AcquireByteBuffer() +//line views/hypha.qtpl:33 + WriteNaviTitleHTML(qb422016, h) +//line views/hypha.qtpl:33 + qs422016 := string(qb422016.B) +//line views/hypha.qtpl:33 + qt422016.ReleaseByteBuffer(qb422016) +//line views/hypha.qtpl:33 + return qs422016 +//line views/hypha.qtpl:33 +} + +//line views/hypha.qtpl:35 +func StreamBackLinksHTML(qw422016 *qt422016.Writer, h *hyphae.Hypha) { +//line views/hypha.qtpl:35 + qw422016.N().S(` +<aside class="backlinks layout-card"> + <h2 class="backlinks__title layout-card__title">Backlinks</h2> + <nav class="backlinks__nav"> + <ul class="backlinks__list"> + `) +//line views/hypha.qtpl:40 + for _, backlink := range h.BackLinks { +//line views/hypha.qtpl:40 + qw422016.N().S(` + <li class="backlinks__entry"> + <a class="backlinks__link" href="/hypha/`) +//line views/hypha.qtpl:42 + qw422016.E().S(backlink.Name) +//line views/hypha.qtpl:42 + qw422016.N().S(`"> + `) +//line views/hypha.qtpl:43 + qw422016.E().S(util.BeautifulName(filepath.Base(backlink.Name))) +//line views/hypha.qtpl:43 + qw422016.N().S(` + </a> + </li> + `) +//line views/hypha.qtpl:46 + } +//line views/hypha.qtpl:46 + qw422016.N().S(` + </ul> + </nav> +</aside> +`) +//line views/hypha.qtpl:50 +} + +//line views/hypha.qtpl:50 +func WriteBackLinksHTML(qq422016 qtio422016.Writer, h *hyphae.Hypha) { +//line views/hypha.qtpl:50 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/hypha.qtpl:50 + StreamBackLinksHTML(qw422016, h) +//line views/hypha.qtpl:50 + qt422016.ReleaseWriter(qw422016) +//line views/hypha.qtpl:50 +} + +//line views/hypha.qtpl:50 +func BackLinksHTML(h *hyphae.Hypha) string { +//line views/hypha.qtpl:50 + qb422016 := qt422016.AcquireByteBuffer() +//line views/hypha.qtpl:50 + WriteBackLinksHTML(qb422016, h) +//line views/hypha.qtpl:50 + qs422016 := string(qb422016.B) +//line views/hypha.qtpl:50 + qt422016.ReleaseByteBuffer(qb422016) +//line views/hypha.qtpl:50 + return qs422016 +//line views/hypha.qtpl:50 +} + +//line views/hypha.qtpl:52 +func StreamAttachmentHTML(qw422016 *qt422016.Writer, h *hyphae.Hypha) { +//line views/hypha.qtpl:52 + qw422016.N().S(` + `) +//line views/hypha.qtpl:53 + switch filepath.Ext(h.BinaryPath) { +//line views/hypha.qtpl:55 + case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico": +//line views/hypha.qtpl:55 + qw422016.N().S(` + <div class="binary-container binary-container_with-img"> + <a href="/binary/`) +//line views/hypha.qtpl:57 + qw422016.N().S(h.Name) +//line views/hypha.qtpl:57 + qw422016.N().S(`"><img src="/binary/`) +//line views/hypha.qtpl:57 + qw422016.N().S(h.Name) +//line views/hypha.qtpl:57 + qw422016.N().S(`"/></a> + </div> + + `) +//line views/hypha.qtpl:60 + case ".ogg", ".webm", ".mp4": +//line views/hypha.qtpl:60 + qw422016.N().S(` + <div class="binary-container binary-container_with-video"> + <video controls> + <source src="/binary/`) +//line views/hypha.qtpl:63 + qw422016.N().S(h.Name) +//line views/hypha.qtpl:63 + qw422016.N().S(`"/> + <p>Your browser does not support video. <a href="/binary/`) +//line views/hypha.qtpl:64 + qw422016.N().S(h.Name) +//line views/hypha.qtpl:64 + qw422016.N().S(`">Download video</a></p> + </video> + </div> + + `) +//line views/hypha.qtpl:68 + case ".mp3": +//line views/hypha.qtpl:68 + qw422016.N().S(` + <div class="binary-container binary-container_with-audio"> + <audio controls> + <source src="/binary/`) +//line views/hypha.qtpl:71 + qw422016.N().S(h.Name) +//line views/hypha.qtpl:71 + qw422016.N().S(`"/> + <p>Your browser does not support audio. <a href="/binary/`) +//line views/hypha.qtpl:72 + qw422016.N().S(h.Name) +//line views/hypha.qtpl:72 + qw422016.N().S(`">Download audio</a></p> + </audio> + </div> + + `) +//line views/hypha.qtpl:76 + default: +//line views/hypha.qtpl:76 + qw422016.N().S(` + <div class="binary-container binary-container_with-nothing"> + <p><a href="/binary/`) +//line views/hypha.qtpl:78 + qw422016.N().S(h.Name) +//line views/hypha.qtpl:78 + qw422016.N().S(`">Download media</a></p> + </div> +`) +//line views/hypha.qtpl:80 + } +//line views/hypha.qtpl:80 + qw422016.N().S(` +`) +//line views/hypha.qtpl:81 +} + +//line views/hypha.qtpl:81 +func WriteAttachmentHTML(qq422016 qtio422016.Writer, h *hyphae.Hypha) { +//line views/hypha.qtpl:81 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/hypha.qtpl:81 + StreamAttachmentHTML(qw422016, h) +//line views/hypha.qtpl:81 + qt422016.ReleaseWriter(qw422016) +//line views/hypha.qtpl:81 +} + +//line views/hypha.qtpl:81 +func AttachmentHTML(h *hyphae.Hypha) string { +//line views/hypha.qtpl:81 + qb422016 := qt422016.AcquireByteBuffer() +//line views/hypha.qtpl:81 + WriteAttachmentHTML(qb422016, h) +//line views/hypha.qtpl:81 + qs422016 := string(qb422016.B) +//line views/hypha.qtpl:81 + qt422016.ReleaseByteBuffer(qb422016) +//line views/hypha.qtpl:81 + return qs422016 +//line views/hypha.qtpl:81 +} From 1917e50367ad60d496e577ac1c8e40231872c50a Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 21:14:33 +0500 Subject: [PATCH 32/53] Move readers views to the views module --- http_history.go | 4 +- http_readers.go | 14 +- templates/common.qtpl | 69 +----- templates/common.qtpl.go | 287 +++++++------------------ templates/readers.qtpl.go | 326 ---------------------------- views/nav.qtpl | 78 +++++++ views/nav.qtpl.go | 314 +++++++++++++++++++++++++++ {templates => views}/readers.qtpl | 75 ++++--- views/readers.qtpl.go | 338 ++++++++++++++++++++++++++++++ 9 files changed, 858 insertions(+), 647 deletions(-) delete mode 100644 templates/readers.qtpl.go create mode 100644 views/nav.qtpl create mode 100644 views/nav.qtpl.go rename {templates => views}/readers.qtpl (75%) create mode 100644 views/readers.qtpl.go diff --git a/http_history.go b/http_history.go index 3adda8a..a952682 100644 --- a/http_history.go +++ b/http_history.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/bouncepaw/mycorrhiza/history" - "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" + "github.com/bouncepaw/mycorrhiza/views" ) func init() { @@ -35,7 +35,7 @@ func handlerHistory(w http.ResponseWriter, rq *http.Request) { log.Println("Found", len(revs), "revisions for", hyphaName) util.HTTP200Page(w, - base(hyphaName, templates.HistoryHTML(rq, hyphaName, list), user.FromRequest(rq))) + base(hyphaName, views.HistoryHTML(rq, hyphaName, list), user.FromRequest(rq))) } // Recent changes diff --git a/http_readers.go b/http_readers.go index 9cc1351..119704b 100644 --- a/http_readers.go +++ b/http_readers.go @@ -14,7 +14,6 @@ import ( "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/mimetype" "github.com/bouncepaw/mycorrhiza/templates" - "github.com/bouncepaw/mycorrhiza/tree" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" "github.com/bouncepaw/mycorrhiza/views" @@ -44,13 +43,10 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { if err == nil { contents = markup.Doc(hyphaName, textContents).AsHTML() } - treeHTML, subhyphae, _, _ := tree.Tree(hyphaName) - page := templates.RevisionHTML( + page := views.RevisionHTML( rq, h, contents, - treeHTML, - subhyphae, revHash, ) w.Header().Set("Content-Type", "text/html;charset=utf-8") @@ -102,16 +98,10 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { contents = views.AttachmentHTML(h) + contents } } - treeHTML, subhyphaeHTML, prevHypha, nextHypha := tree.Tree(hyphaName) util.HTTP200Page(w, templates.BaseHTML( util.BeautifulName(hyphaName), - templates.PageHTML(rq, h, - contents, - treeHTML, - subhyphaeHTML, - prevHypha, nextHypha, - ), + views.HyphaHTML(rq, h, contents), u, openGraph)) } diff --git a/templates/common.qtpl b/templates/common.qtpl index 57dea92..2f225ac 100644 --- a/templates/common.qtpl +++ b/templates/common.qtpl @@ -1,78 +1,19 @@ {% import "net/http" %} -{% import "strings" %} {% import "github.com/bouncepaw/mycorrhiza/user" %} -{% import "github.com/bouncepaw/mycorrhiza/util" %} - -This is the <nav> seen on top of many pages. -{% code -type navEntry struct { - path string - title string -} -var navEntries = []navEntry{ - {"page", "Hypha"}, - {"edit", "Edit"}, - {"history", "History"}, - {"revision", "NOT REACHED"}, - {"rename-ask", "Rename"}, - {"delete-ask", "Delete"}, - {"text", "Raw text"}, -} -%} +{% import "github.com/bouncepaw/mycorrhiza/views" %} {% func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) %} -{% code - u := user.FromRequest(rq) -%} - <nav class="hypha-tabs main-width"> - <ul class="hypha-tabs__flex"> - {%- for _, entry := range navEntries -%} - {%- if navType == "revision" && entry.path == "revision" -%} - <li class="hypha-tabs__tab hypha-tabs__tab_active"> - <span class="hypha-tabs__selection">{%s revisionHash[0] %}</span> - </li> - {%- elseif navType == entry.path -%} - <li class="hypha-tabs__tab hypha-tabs__tab_active"> - <span class="hypha-tabs__selection">{%s entry.title %}</span> - </li> - {%- elseif entry.path != "revision" && u.CanProceed(entry.path) -%} - <li class="hypha-tabs__tab"> - <a class="hypha-tabs__link" href="/{%s entry.path %}/{%s hyphaName %}">{%s entry.title %}</a> - </li> - {%- endif -%} - {%- endfor -%} - </ul> - </nav> +{%s= views.NavHTML(rq, hyphaName, navType, revisionHash...) %} {% endfunc %} {% func userMenuHTML(u *user.User) %} -{% if user.AuthUsed %} -<li class="header-links__entry header-links__entry_user"> - {% if u.Group == "anon" %} - <a href="/login" class="header-links__link">Login</a> - {% else %} - <a href="/page/{%s util.UserHypha %}/{%s u.Name %}" class="header-links__link">{%s u.Name %}</a> - {% endif %} -</li> -{% endif %} +{%s= views.UserMenuHTML(u) %} {% endfunc %} {% func relativeHyphae(relatives string) %} -<aside class="relative-hyphae layout-card"> - <h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2> - {%s= relatives %} -</aside> +{%s= views.RelativeHyphaeHTML(relatives) %} {% endfunc %} {% func subhyphaeMatrix(subhyphae string) %} -{% if strings.TrimSpace(subhyphae) != "" %} -<section class="subhyphae"> - <h2 class="subhyphae__title">Subhyphae</h2> - <nav class="subhyphae__nav"> - <ul class="subhyphae__list"> - {%s= subhyphae %} - </ul> - </nav> -</section> -{% endif %} +{%s= views.SubhyphaeHTML(subhyphae) %} {% endfunc %} diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go index b168af2..40293c8 100644 --- a/templates/common.qtpl.go +++ b/templates/common.qtpl.go @@ -8,307 +8,176 @@ package templates import "net/http" //line templates/common.qtpl:2 -import "strings" - -//line templates/common.qtpl:3 import "github.com/bouncepaw/mycorrhiza/user" -//line templates/common.qtpl:4 -import "github.com/bouncepaw/mycorrhiza/util" +//line templates/common.qtpl:3 +import "github.com/bouncepaw/mycorrhiza/views" -// This is the <nav> seen on top of many pages. - -//line templates/common.qtpl:7 +//line templates/common.qtpl:5 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/common.qtpl:7 +//line templates/common.qtpl:5 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/common.qtpl:8 -type navEntry struct { - path string - title string -} - -var navEntries = []navEntry{ - {"page", "Hypha"}, - {"edit", "Edit"}, - {"history", "History"}, - {"revision", "NOT REACHED"}, - {"rename-ask", "Rename"}, - {"delete-ask", "Delete"}, - {"text", "Raw text"}, -} - -//line templates/common.qtpl:23 +//line templates/common.qtpl:5 func streamnavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line templates/common.qtpl:23 +//line templates/common.qtpl:5 qw422016.N().S(` `) -//line templates/common.qtpl:25 - u := user.FromRequest(rq) - -//line templates/common.qtpl:26 +//line templates/common.qtpl:6 + qw422016.N().S(views.NavHTML(rq, hyphaName, navType, revisionHash...)) +//line templates/common.qtpl:6 qw422016.N().S(` - <nav class="hypha-tabs main-width"> - <ul class="hypha-tabs__flex"> `) -//line templates/common.qtpl:29 - for _, entry := range navEntries { -//line templates/common.qtpl:30 - if navType == "revision" && entry.path == "revision" { -//line templates/common.qtpl:30 - qw422016.N().S(` <li class="hypha-tabs__tab hypha-tabs__tab_active"> - <span class="hypha-tabs__selection">`) -//line templates/common.qtpl:32 - qw422016.E().S(revisionHash[0]) -//line templates/common.qtpl:32 - qw422016.N().S(`</span> - </li> -`) -//line templates/common.qtpl:34 - } else if navType == entry.path { -//line templates/common.qtpl:34 - qw422016.N().S(` <li class="hypha-tabs__tab hypha-tabs__tab_active"> - <span class="hypha-tabs__selection">`) -//line templates/common.qtpl:36 - qw422016.E().S(entry.title) -//line templates/common.qtpl:36 - qw422016.N().S(`</span> - </li> -`) -//line templates/common.qtpl:38 - } else if entry.path != "revision" && u.CanProceed(entry.path) { -//line templates/common.qtpl:38 - qw422016.N().S(` <li class="hypha-tabs__tab"> - <a class="hypha-tabs__link" href="/`) -//line templates/common.qtpl:40 - qw422016.E().S(entry.path) -//line templates/common.qtpl:40 - qw422016.N().S(`/`) -//line templates/common.qtpl:40 - qw422016.E().S(hyphaName) -//line templates/common.qtpl:40 - qw422016.N().S(`">`) -//line templates/common.qtpl:40 - qw422016.E().S(entry.title) -//line templates/common.qtpl:40 - qw422016.N().S(`</a> - </li> -`) -//line templates/common.qtpl:42 - } -//line templates/common.qtpl:43 - } -//line templates/common.qtpl:43 - qw422016.N().S(` </ul> - </nav> -`) -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 } -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 func writenavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 streamnavHTML(qw422016, rq, hyphaName, navType, revisionHash...) -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 } -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string { -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 writenavHTML(qb422016, rq, hyphaName, navType, revisionHash...) -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 qs422016 := string(qb422016.B) -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 return qs422016 -//line templates/common.qtpl:46 +//line templates/common.qtpl:7 } -//line templates/common.qtpl:48 +//line templates/common.qtpl:9 func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) { -//line templates/common.qtpl:48 +//line templates/common.qtpl:9 qw422016.N().S(` `) -//line templates/common.qtpl:49 - if user.AuthUsed { -//line templates/common.qtpl:49 - qw422016.N().S(` -<li class="header-links__entry header-links__entry_user"> - `) -//line templates/common.qtpl:51 - if u.Group == "anon" { -//line templates/common.qtpl:51 - qw422016.N().S(` - <a href="/login" class="header-links__link">Login</a> - `) -//line templates/common.qtpl:53 - } else { -//line templates/common.qtpl:53 - qw422016.N().S(` - <a href="/page/`) -//line templates/common.qtpl:54 - qw422016.E().S(util.UserHypha) -//line templates/common.qtpl:54 - qw422016.N().S(`/`) -//line templates/common.qtpl:54 - qw422016.E().S(u.Name) -//line templates/common.qtpl:54 - qw422016.N().S(`" class="header-links__link">`) -//line templates/common.qtpl:54 - qw422016.E().S(u.Name) -//line templates/common.qtpl:54 - qw422016.N().S(`</a> - `) -//line templates/common.qtpl:55 - } -//line templates/common.qtpl:55 - qw422016.N().S(` -</li> -`) -//line templates/common.qtpl:57 - } -//line templates/common.qtpl:57 +//line templates/common.qtpl:10 + qw422016.N().S(views.UserMenuHTML(u)) +//line templates/common.qtpl:10 qw422016.N().S(` `) -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 } -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) { -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 streamuserMenuHTML(qw422016, u) -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 } -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 func userMenuHTML(u *user.User) string { -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 writeuserMenuHTML(qb422016, u) -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 qs422016 := string(qb422016.B) -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 return qs422016 -//line templates/common.qtpl:58 +//line templates/common.qtpl:11 } -//line templates/common.qtpl:60 +//line templates/common.qtpl:13 func streamrelativeHyphae(qw422016 *qt422016.Writer, relatives string) { -//line templates/common.qtpl:60 +//line templates/common.qtpl:13 qw422016.N().S(` -<aside class="relative-hyphae layout-card"> - <h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2> - `) -//line templates/common.qtpl:63 - qw422016.N().S(relatives) -//line templates/common.qtpl:63 - qw422016.N().S(` -</aside> `) -//line templates/common.qtpl:65 +//line templates/common.qtpl:14 + qw422016.N().S(views.RelativeHyphaeHTML(relatives)) +//line templates/common.qtpl:14 + qw422016.N().S(` +`) +//line templates/common.qtpl:15 } -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 func writerelativeHyphae(qq422016 qtio422016.Writer, relatives string) { -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 streamrelativeHyphae(qw422016, relatives) -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 } -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 func relativeHyphae(relatives string) string { -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 writerelativeHyphae(qb422016, relatives) -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 qs422016 := string(qb422016.B) -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 return qs422016 -//line templates/common.qtpl:65 +//line templates/common.qtpl:15 } -//line templates/common.qtpl:67 +//line templates/common.qtpl:17 func streamsubhyphaeMatrix(qw422016 *qt422016.Writer, subhyphae string) { -//line templates/common.qtpl:67 +//line templates/common.qtpl:17 qw422016.N().S(` `) -//line templates/common.qtpl:68 - if strings.TrimSpace(subhyphae) != "" { -//line templates/common.qtpl:68 - qw422016.N().S(` -<section class="subhyphae"> - <h2 class="subhyphae__title">Subhyphae</h2> - <nav class="subhyphae__nav"> - <ul class="subhyphae__list"> - `) -//line templates/common.qtpl:73 - qw422016.N().S(subhyphae) -//line templates/common.qtpl:73 - qw422016.N().S(` - </ul> - </nav> -</section> -`) -//line templates/common.qtpl:77 - } -//line templates/common.qtpl:77 +//line templates/common.qtpl:18 + qw422016.N().S(views.SubhyphaeHTML(subhyphae)) +//line templates/common.qtpl:18 qw422016.N().S(` `) -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 } -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 func writesubhyphaeMatrix(qq422016 qtio422016.Writer, subhyphae string) { -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 streamsubhyphaeMatrix(qw422016, subhyphae) -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 } -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 func subhyphaeMatrix(subhyphae string) string { -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 writesubhyphaeMatrix(qb422016, subhyphae) -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 qs422016 := string(qb422016.B) -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 return qs422016 -//line templates/common.qtpl:78 +//line templates/common.qtpl:19 } diff --git a/templates/readers.qtpl.go b/templates/readers.qtpl.go deleted file mode 100644 index fed0a7f..0000000 --- a/templates/readers.qtpl.go +++ /dev/null @@ -1,326 +0,0 @@ -// Code generated by qtc from "readers.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line templates/readers.qtpl:1 -package templates - -//line templates/readers.qtpl:1 -import "net/http" - -//line templates/readers.qtpl:2 -import "path" - -//line templates/readers.qtpl:3 -import "github.com/bouncepaw/mycorrhiza/hyphae" - -//line templates/readers.qtpl:4 -import "github.com/bouncepaw/mycorrhiza/user" - -//line templates/readers.qtpl:5 -import "github.com/bouncepaw/mycorrhiza/util" - -//line templates/readers.qtpl:6 -import "github.com/bouncepaw/mycorrhiza/views" - -//line templates/readers.qtpl:8 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line templates/readers.qtpl:8 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line templates/readers.qtpl:8 -func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/readers.qtpl:8 - qw422016.N().S(` -`) -//line templates/readers.qtpl:9 - streamnavHTML(qw422016, rq, hyphaName, "history") -//line templates/readers.qtpl:9 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> - <article class="history"> - <h1>History of `) -//line templates/readers.qtpl:13 - qw422016.E().S(hyphaName) -//line templates/readers.qtpl:13 - qw422016.N().S(`</h1> - `) -//line templates/readers.qtpl:14 - qw422016.N().S(list) -//line templates/readers.qtpl:14 - qw422016.N().S(` - </article> -</main> -</div> -`) -//line templates/readers.qtpl:18 -} - -//line templates/readers.qtpl:18 -func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { -//line templates/readers.qtpl:18 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:18 - StreamHistoryHTML(qw422016, rq, hyphaName, list) -//line templates/readers.qtpl:18 - qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:18 -} - -//line templates/readers.qtpl:18 -func HistoryHTML(rq *http.Request, hyphaName, list string) string { -//line templates/readers.qtpl:18 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:18 - WriteHistoryHTML(qb422016, rq, hyphaName, list) -//line templates/readers.qtpl:18 - qs422016 := string(qb422016.B) -//line templates/readers.qtpl:18 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:18 - return qs422016 -//line templates/readers.qtpl:18 -} - -//line templates/readers.qtpl:20 -func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) { -//line templates/readers.qtpl:20 - qw422016.N().S(` -`) -//line templates/readers.qtpl:21 - streamnavHTML(qw422016, rq, h.Name, "revision", revHash) -//line templates/readers.qtpl:21 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> - <article> - <p>Please note that viewing binary parts of hyphae is not supported in history for now.</p> - `) -//line templates/readers.qtpl:26 - qw422016.N().S(views.NaviTitleHTML(h)) -//line templates/readers.qtpl:26 - qw422016.N().S(` - `) -//line templates/readers.qtpl:27 - qw422016.N().S(contents) -//line templates/readers.qtpl:27 - qw422016.N().S(` - </article> -`) -//line templates/readers.qtpl:29 - streamsubhyphaeMatrix(qw422016, subhyphae) -//line templates/readers.qtpl:29 - qw422016.N().S(` -</main> -`) -//line templates/readers.qtpl:31 - streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:31 - qw422016.N().S(` -</div> -`) -//line templates/readers.qtpl:33 -} - -//line templates/readers.qtpl:33 -func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) { -//line templates/readers.qtpl:33 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:33 - StreamRevisionHTML(qw422016, rq, h, contents, relatives, subhyphae, revHash) -//line templates/readers.qtpl:33 - qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:33 -} - -//line templates/readers.qtpl:33 -func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) string { -//line templates/readers.qtpl:33 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:33 - WriteRevisionHTML(qb422016, rq, h, contents, relatives, subhyphae, revHash) -//line templates/readers.qtpl:33 - qs422016 := string(qb422016.B) -//line templates/readers.qtpl:33 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:33 - return qs422016 -//line templates/readers.qtpl:33 -} - -// If `contents` == "", a helpful message is shown instead. - -//line templates/readers.qtpl:36 -func StreamPageHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) { -//line templates/readers.qtpl:36 - qw422016.N().S(` -`) -//line templates/readers.qtpl:37 - streamnavHTML(qw422016, rq, h.Name, "page") -//line templates/readers.qtpl:37 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> - <article> - `) -//line templates/readers.qtpl:41 - qw422016.N().S(views.NaviTitleHTML(h)) -//line templates/readers.qtpl:41 - qw422016.N().S(` - `) -//line templates/readers.qtpl:42 - if contents == "" { -//line templates/readers.qtpl:42 - qw422016.N().S(` - <p>This hypha has no text. Why not <a href="/edit/`) -//line templates/readers.qtpl:43 - qw422016.E().S(h.Name) -//line templates/readers.qtpl:43 - qw422016.N().S(`">create it</a>?</p> - `) -//line templates/readers.qtpl:44 - } else { -//line templates/readers.qtpl:44 - qw422016.N().S(` - `) -//line templates/readers.qtpl:45 - qw422016.N().S(contents) -//line templates/readers.qtpl:45 - qw422016.N().S(` - `) -//line templates/readers.qtpl:46 - } -//line templates/readers.qtpl:46 - qw422016.N().S(` - </article> - <section class="prevnext"> - `) -//line templates/readers.qtpl:49 - if prevHyphaName != "" { -//line templates/readers.qtpl:49 - qw422016.N().S(` - <a class="prevnext__el prevnext__prev" href="/hypha/`) -//line templates/readers.qtpl:50 - qw422016.E().S(prevHyphaName) -//line templates/readers.qtpl:50 - qw422016.N().S(`" rel="prev">← `) -//line templates/readers.qtpl:50 - qw422016.E().S(util.BeautifulName(path.Base(prevHyphaName))) -//line templates/readers.qtpl:50 - qw422016.N().S(`</a> - `) -//line templates/readers.qtpl:51 - } -//line templates/readers.qtpl:51 - qw422016.N().S(` - `) -//line templates/readers.qtpl:52 - if nextHyphaName != "" { -//line templates/readers.qtpl:52 - qw422016.N().S(` - <a class="prevnext__el prevnext__next" href="/hypha/`) -//line templates/readers.qtpl:53 - qw422016.E().S(nextHyphaName) -//line templates/readers.qtpl:53 - qw422016.N().S(`" rel="next">`) -//line templates/readers.qtpl:53 - qw422016.E().S(util.BeautifulName(path.Base(nextHyphaName))) -//line templates/readers.qtpl:53 - qw422016.N().S(` →</a> - `) -//line templates/readers.qtpl:54 - } -//line templates/readers.qtpl:54 - qw422016.N().S(` - </section> -`) -//line templates/readers.qtpl:56 - if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" { -//line templates/readers.qtpl:56 - qw422016.N().S(` - <form action="/upload-binary/`) -//line templates/readers.qtpl:57 - qw422016.E().S(h.Name) -//line templates/readers.qtpl:57 - qw422016.N().S(`" - method="post" enctype="multipart/form-data" - class="upload-amnt"> - `) -//line templates/readers.qtpl:60 - if h.Exists && h.BinaryPath != "" { -//line templates/readers.qtpl:60 - qw422016.N().S(` - <a class="upload-amnt__unattach" href="/unattach-ask/`) -//line templates/readers.qtpl:61 - qw422016.E().S(h.Name) -//line templates/readers.qtpl:61 - qw422016.N().S(`">Unattach current attachment?</a> - `) -//line templates/readers.qtpl:62 - } -//line templates/readers.qtpl:62 - qw422016.N().S(` - <label for="upload-binary__input">Upload a new attachment</label> - <br> - <input type="file" id="upload-binary__input" name="binary"/> - <input type="submit"/> - </form> -`) -//line templates/readers.qtpl:68 - } -//line templates/readers.qtpl:68 - qw422016.N().S(` -`) -//line templates/readers.qtpl:69 - streamsubhyphaeMatrix(qw422016, subhyphae) -//line templates/readers.qtpl:69 - qw422016.N().S(` -</main> -`) -//line templates/readers.qtpl:71 - streamrelativeHyphae(qw422016, relatives) -//line templates/readers.qtpl:71 - qw422016.N().S(` -`) -//line templates/readers.qtpl:72 - views.StreamBackLinksHTML(qw422016, h) -//line templates/readers.qtpl:72 - qw422016.N().S(` -</div> -`) -//line templates/readers.qtpl:74 -} - -//line templates/readers.qtpl:74 -func WritePageHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) { -//line templates/readers.qtpl:74 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/readers.qtpl:74 - StreamPageHTML(qw422016, rq, h, contents, relatives, subhyphae, prevHyphaName, nextHyphaName) -//line templates/readers.qtpl:74 - qt422016.ReleaseWriter(qw422016) -//line templates/readers.qtpl:74 -} - -//line templates/readers.qtpl:74 -func PageHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) string { -//line templates/readers.qtpl:74 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/readers.qtpl:74 - WritePageHTML(qb422016, rq, h, contents, relatives, subhyphae, prevHyphaName, nextHyphaName) -//line templates/readers.qtpl:74 - qs422016 := string(qb422016.B) -//line templates/readers.qtpl:74 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/readers.qtpl:74 - return qs422016 -//line templates/readers.qtpl:74 -} diff --git a/views/nav.qtpl b/views/nav.qtpl new file mode 100644 index 0000000..900b8e1 --- /dev/null +++ b/views/nav.qtpl @@ -0,0 +1,78 @@ +{% import "net/http" %} +{% import "strings" %} +{% import "github.com/bouncepaw/mycorrhiza/user" %} +{% import "github.com/bouncepaw/mycorrhiza/util" %} + +This is the <nav> seen on top of many pages. +{% code +type navEntry struct { + path string + title string +} +var navEntries = []navEntry{ + {"page", "Hypha"}, + {"edit", "Edit"}, + {"history", "History"}, + {"revision", "NOT REACHED"}, + {"rename-ask", "Rename"}, + {"delete-ask", "Delete"}, + {"text", "Raw text"}, +} +%} + +{% func NavHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) %} +{% code + u := user.FromRequest(rq) +%} + <nav class="hypha-tabs main-width"> + <ul class="hypha-tabs__flex"> + {%- for _, entry := range navEntries -%} + {%- if navType == "revision" && entry.path == "revision" -%} + <li class="hypha-tabs__tab hypha-tabs__tab_active"> + <span class="hypha-tabs__selection">{%s revisionHash[0] %}</span> + </li> + {%- elseif navType == entry.path -%} + <li class="hypha-tabs__tab hypha-tabs__tab_active"> + <span class="hypha-tabs__selection">{%s entry.title %}</span> + </li> + {%- elseif entry.path != "revision" && u.CanProceed(entry.path) -%} + <li class="hypha-tabs__tab"> + <a class="hypha-tabs__link" href="/{%s entry.path %}/{%s hyphaName %}">{%s entry.title %}</a> + </li> + {%- endif -%} + {%- endfor -%} + </ul> + </nav> +{% endfunc %} + +{% func UserMenuHTML(u *user.User) %} +{% if user.AuthUsed %} +<li class="header-links__entry header-links__entry_user"> + {% if u.Group == "anon" %} + <a href="/login" class="header-links__link">Login</a> + {% else %} + <a href="/page/{%s util.UserHypha %}/{%s u.Name %}" class="header-links__link">{%s u.Name %}</a> + {% endif %} +</li> +{% endif %} +{% endfunc %} + +{% func RelativeHyphaeHTML(relatives string) %} +<aside class="relative-hyphae layout-card"> + <h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2> + {%s= relatives %} +</aside> +{% endfunc %} + +{% func SubhyphaeHTML(subhyphae string) %} +{% if strings.TrimSpace(subhyphae) != "" %} +<section class="subhyphae"> + <h2 class="subhyphae__title">Subhyphae</h2> + <nav class="subhyphae__nav"> + <ul class="subhyphae__list"> + {%s= subhyphae %} + </ul> + </nav> +</section> +{% endif %} +{% endfunc %} diff --git a/views/nav.qtpl.go b/views/nav.qtpl.go new file mode 100644 index 0000000..82c062d --- /dev/null +++ b/views/nav.qtpl.go @@ -0,0 +1,314 @@ +// Code generated by qtc from "nav.qtpl". DO NOT EDIT. +// See https://github.com/valyala/quicktemplate for details. + +//line views/nav.qtpl:1 +package views + +//line views/nav.qtpl:1 +import "net/http" + +//line views/nav.qtpl:2 +import "strings" + +//line views/nav.qtpl:3 +import "github.com/bouncepaw/mycorrhiza/user" + +//line views/nav.qtpl:4 +import "github.com/bouncepaw/mycorrhiza/util" + +// This is the <nav> seen on top of many pages. + +//line views/nav.qtpl:7 +import ( + qtio422016 "io" + + qt422016 "github.com/valyala/quicktemplate" +) + +//line views/nav.qtpl:7 +var ( + _ = qtio422016.Copy + _ = qt422016.AcquireByteBuffer +) + +//line views/nav.qtpl:8 +type navEntry struct { + path string + title string +} + +var navEntries = []navEntry{ + {"page", "Hypha"}, + {"edit", "Edit"}, + {"history", "History"}, + {"revision", "NOT REACHED"}, + {"rename-ask", "Rename"}, + {"delete-ask", "Delete"}, + {"text", "Raw text"}, +} + +//line views/nav.qtpl:23 +func StreamNavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { +//line views/nav.qtpl:23 + qw422016.N().S(` +`) +//line views/nav.qtpl:25 + u := user.FromRequest(rq) + +//line views/nav.qtpl:26 + qw422016.N().S(` + <nav class="hypha-tabs main-width"> + <ul class="hypha-tabs__flex"> +`) +//line views/nav.qtpl:29 + for _, entry := range navEntries { +//line views/nav.qtpl:30 + if navType == "revision" && entry.path == "revision" { +//line views/nav.qtpl:30 + qw422016.N().S(` <li class="hypha-tabs__tab hypha-tabs__tab_active"> + <span class="hypha-tabs__selection">`) +//line views/nav.qtpl:32 + qw422016.E().S(revisionHash[0]) +//line views/nav.qtpl:32 + qw422016.N().S(`</span> + </li> +`) +//line views/nav.qtpl:34 + } else if navType == entry.path { +//line views/nav.qtpl:34 + qw422016.N().S(` <li class="hypha-tabs__tab hypha-tabs__tab_active"> + <span class="hypha-tabs__selection">`) +//line views/nav.qtpl:36 + qw422016.E().S(entry.title) +//line views/nav.qtpl:36 + qw422016.N().S(`</span> + </li> +`) +//line views/nav.qtpl:38 + } else if entry.path != "revision" && u.CanProceed(entry.path) { +//line views/nav.qtpl:38 + qw422016.N().S(` <li class="hypha-tabs__tab"> + <a class="hypha-tabs__link" href="/`) +//line views/nav.qtpl:40 + qw422016.E().S(entry.path) +//line views/nav.qtpl:40 + qw422016.N().S(`/`) +//line views/nav.qtpl:40 + qw422016.E().S(hyphaName) +//line views/nav.qtpl:40 + qw422016.N().S(`">`) +//line views/nav.qtpl:40 + qw422016.E().S(entry.title) +//line views/nav.qtpl:40 + qw422016.N().S(`</a> + </li> +`) +//line views/nav.qtpl:42 + } +//line views/nav.qtpl:43 + } +//line views/nav.qtpl:43 + qw422016.N().S(` </ul> + </nav> +`) +//line views/nav.qtpl:46 +} + +//line views/nav.qtpl:46 +func WriteNavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { +//line views/nav.qtpl:46 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/nav.qtpl:46 + StreamNavHTML(qw422016, rq, hyphaName, navType, revisionHash...) +//line views/nav.qtpl:46 + qt422016.ReleaseWriter(qw422016) +//line views/nav.qtpl:46 +} + +//line views/nav.qtpl:46 +func NavHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string { +//line views/nav.qtpl:46 + qb422016 := qt422016.AcquireByteBuffer() +//line views/nav.qtpl:46 + WriteNavHTML(qb422016, rq, hyphaName, navType, revisionHash...) +//line views/nav.qtpl:46 + qs422016 := string(qb422016.B) +//line views/nav.qtpl:46 + qt422016.ReleaseByteBuffer(qb422016) +//line views/nav.qtpl:46 + return qs422016 +//line views/nav.qtpl:46 +} + +//line views/nav.qtpl:48 +func StreamUserMenuHTML(qw422016 *qt422016.Writer, u *user.User) { +//line views/nav.qtpl:48 + qw422016.N().S(` +`) +//line views/nav.qtpl:49 + if user.AuthUsed { +//line views/nav.qtpl:49 + qw422016.N().S(` +<li class="header-links__entry header-links__entry_user"> + `) +//line views/nav.qtpl:51 + if u.Group == "anon" { +//line views/nav.qtpl:51 + qw422016.N().S(` + <a href="/login" class="header-links__link">Login</a> + `) +//line views/nav.qtpl:53 + } else { +//line views/nav.qtpl:53 + qw422016.N().S(` + <a href="/page/`) +//line views/nav.qtpl:54 + qw422016.E().S(util.UserHypha) +//line views/nav.qtpl:54 + qw422016.N().S(`/`) +//line views/nav.qtpl:54 + qw422016.E().S(u.Name) +//line views/nav.qtpl:54 + qw422016.N().S(`" class="header-links__link">`) +//line views/nav.qtpl:54 + qw422016.E().S(u.Name) +//line views/nav.qtpl:54 + qw422016.N().S(`</a> + `) +//line views/nav.qtpl:55 + } +//line views/nav.qtpl:55 + qw422016.N().S(` +</li> +`) +//line views/nav.qtpl:57 + } +//line views/nav.qtpl:57 + qw422016.N().S(` +`) +//line views/nav.qtpl:58 +} + +//line views/nav.qtpl:58 +func WriteUserMenuHTML(qq422016 qtio422016.Writer, u *user.User) { +//line views/nav.qtpl:58 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/nav.qtpl:58 + StreamUserMenuHTML(qw422016, u) +//line views/nav.qtpl:58 + qt422016.ReleaseWriter(qw422016) +//line views/nav.qtpl:58 +} + +//line views/nav.qtpl:58 +func UserMenuHTML(u *user.User) string { +//line views/nav.qtpl:58 + qb422016 := qt422016.AcquireByteBuffer() +//line views/nav.qtpl:58 + WriteUserMenuHTML(qb422016, u) +//line views/nav.qtpl:58 + qs422016 := string(qb422016.B) +//line views/nav.qtpl:58 + qt422016.ReleaseByteBuffer(qb422016) +//line views/nav.qtpl:58 + return qs422016 +//line views/nav.qtpl:58 +} + +//line views/nav.qtpl:60 +func StreamRelativeHyphaeHTML(qw422016 *qt422016.Writer, relatives string) { +//line views/nav.qtpl:60 + qw422016.N().S(` +<aside class="relative-hyphae layout-card"> + <h2 class="relative-hyphae__title layout-card__title">Relative hyphae</h2> + `) +//line views/nav.qtpl:63 + qw422016.N().S(relatives) +//line views/nav.qtpl:63 + qw422016.N().S(` +</aside> +`) +//line views/nav.qtpl:65 +} + +//line views/nav.qtpl:65 +func WriteRelativeHyphaeHTML(qq422016 qtio422016.Writer, relatives string) { +//line views/nav.qtpl:65 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/nav.qtpl:65 + StreamRelativeHyphaeHTML(qw422016, relatives) +//line views/nav.qtpl:65 + qt422016.ReleaseWriter(qw422016) +//line views/nav.qtpl:65 +} + +//line views/nav.qtpl:65 +func RelativeHyphaeHTML(relatives string) string { +//line views/nav.qtpl:65 + qb422016 := qt422016.AcquireByteBuffer() +//line views/nav.qtpl:65 + WriteRelativeHyphaeHTML(qb422016, relatives) +//line views/nav.qtpl:65 + qs422016 := string(qb422016.B) +//line views/nav.qtpl:65 + qt422016.ReleaseByteBuffer(qb422016) +//line views/nav.qtpl:65 + return qs422016 +//line views/nav.qtpl:65 +} + +//line views/nav.qtpl:67 +func StreamSubhyphaeHTML(qw422016 *qt422016.Writer, subhyphae string) { +//line views/nav.qtpl:67 + qw422016.N().S(` +`) +//line views/nav.qtpl:68 + if strings.TrimSpace(subhyphae) != "" { +//line views/nav.qtpl:68 + qw422016.N().S(` +<section class="subhyphae"> + <h2 class="subhyphae__title">Subhyphae</h2> + <nav class="subhyphae__nav"> + <ul class="subhyphae__list"> + `) +//line views/nav.qtpl:73 + qw422016.N().S(subhyphae) +//line views/nav.qtpl:73 + qw422016.N().S(` + </ul> + </nav> +</section> +`) +//line views/nav.qtpl:77 + } +//line views/nav.qtpl:77 + qw422016.N().S(` +`) +//line views/nav.qtpl:78 +} + +//line views/nav.qtpl:78 +func WriteSubhyphaeHTML(qq422016 qtio422016.Writer, subhyphae string) { +//line views/nav.qtpl:78 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/nav.qtpl:78 + StreamSubhyphaeHTML(qw422016, subhyphae) +//line views/nav.qtpl:78 + qt422016.ReleaseWriter(qw422016) +//line views/nav.qtpl:78 +} + +//line views/nav.qtpl:78 +func SubhyphaeHTML(subhyphae string) string { +//line views/nav.qtpl:78 + qb422016 := qt422016.AcquireByteBuffer() +//line views/nav.qtpl:78 + WriteSubhyphaeHTML(qb422016, subhyphae) +//line views/nav.qtpl:78 + qs422016 := string(qb422016.B) +//line views/nav.qtpl:78 + qt422016.ReleaseByteBuffer(qb422016) +//line views/nav.qtpl:78 + return qs422016 +//line views/nav.qtpl:78 +} diff --git a/templates/readers.qtpl b/views/readers.qtpl similarity index 75% rename from templates/readers.qtpl rename to views/readers.qtpl index 3a7e1e1..4a9e834 100644 --- a/templates/readers.qtpl +++ b/views/readers.qtpl @@ -1,44 +1,21 @@ {% import "net/http" %} {% import "path" %} + {% import "github.com/bouncepaw/mycorrhiza/hyphae" %} {% import "github.com/bouncepaw/mycorrhiza/user" %} {% import "github.com/bouncepaw/mycorrhiza/util" %} -{% import "github.com/bouncepaw/mycorrhiza/views" %} - -{% func HistoryHTML(rq *http.Request, hyphaName, list string) %} -{%= navHTML(rq, hyphaName, "history") %} -<div class="layout"> -<main class="main-width"> - <article class="history"> - <h1>History of {%s hyphaName %}</h1> - {%s= list %} - </article> -</main> -</div> -{% endfunc %} - -{% func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, revHash string) %} -{%= navHTML(rq, h.Name, "revision", revHash) %} -<div class="layout"> -<main class="main-width"> - <article> - <p>Please note that viewing binary parts of hyphae is not supported in history for now.</p> - {%s= views.NaviTitleHTML(h) %} - {%s= contents %} - </article> -{%= subhyphaeMatrix(subhyphae) %} -</main> -{%= relativeHyphae(relatives) %} -</div> -{% endfunc %} +{% import "github.com/bouncepaw/mycorrhiza/tree" %} If `contents` == "", a helpful message is shown instead. -{% func PageHTML(rq *http.Request, h *hyphae.Hypha, contents, relatives, subhyphae, prevHyphaName, nextHyphaName string) %} -{%= navHTML(rq, h.Name, "page") %} +{% func HyphaHTML(rq *http.Request, h *hyphae.Hypha, contents string) %} +{% code + relatives, subhyphae, prevHyphaName, nextHyphaName := tree.Tree(h.Name) +%} +{%= NavHTML(rq, h.Name, "page") %} <div class="layout"> <main class="main-width"> <article> - {%s= views.NaviTitleHTML(h) %} + {%s= NaviTitleHTML(h) %} {% if contents == "" %} <p>This hypha has no text. Why not <a href="/edit/{%s h.Name %}">create it</a>?</p> {% else %} @@ -66,9 +43,39 @@ If `contents` == "", a helpful message is shown instead. <input type="submit"/> </form> {% endif %} -{%= subhyphaeMatrix(subhyphae) %} +{%= SubhyphaeHTML(subhyphae) %} +</main> +{%= RelativeHyphaeHTML(relatives) %} +{%= BackLinksHTML(h) %} +</div> +{% endfunc %} + +{% func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, revHash string) %} +{% code + relatives, subhyphae, _, _ := tree.Tree(h.Name) +%} +{%= NavHTML(rq, h.Name, "revision", revHash) %} +<div class="layout"> +<main class="main-width"> + <article> + <p>Please note that viewing binary parts of hyphae is not supported in history for now.</p> + {%s= NaviTitleHTML(h) %} + {%s= contents %} + </article> +{%= SubhyphaeHTML(subhyphae) %} +</main> +{%= RelativeHyphaeHTML(relatives) %} +</div> +{% endfunc %} + +{% func HistoryHTML(rq *http.Request, hyphaName, list string) %} +{%= NavHTML(rq, hyphaName, "history") %} +<div class="layout"> +<main class="main-width"> + <article class="history"> + <h1>History of {%s hyphaName %}</h1> + {%s= list %} + </article> </main> -{%= relativeHyphae(relatives) %} -{%= views.BackLinksHTML(h) %} </div> {% endfunc %} diff --git a/views/readers.qtpl.go b/views/readers.qtpl.go new file mode 100644 index 0000000..08015fc --- /dev/null +++ b/views/readers.qtpl.go @@ -0,0 +1,338 @@ +// Code generated by qtc from "readers.qtpl". DO NOT EDIT. +// See https://github.com/valyala/quicktemplate for details. + +//line views/readers.qtpl:1 +package views + +//line views/readers.qtpl:1 +import "net/http" + +//line views/readers.qtpl:2 +import "path" + +//line views/readers.qtpl:4 +import "github.com/bouncepaw/mycorrhiza/hyphae" + +//line views/readers.qtpl:5 +import "github.com/bouncepaw/mycorrhiza/user" + +//line views/readers.qtpl:6 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/readers.qtpl:7 +import "github.com/bouncepaw/mycorrhiza/tree" + +// If `contents` == "", a helpful message is shown instead. + +//line views/readers.qtpl:10 +import ( + qtio422016 "io" + + qt422016 "github.com/valyala/quicktemplate" +) + +//line views/readers.qtpl:10 +var ( + _ = qtio422016.Copy + _ = qt422016.AcquireByteBuffer +) + +//line views/readers.qtpl:10 +func StreamHyphaHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents string) { +//line views/readers.qtpl:10 + qw422016.N().S(` +`) +//line views/readers.qtpl:12 + relatives, subhyphae, prevHyphaName, nextHyphaName := tree.Tree(h.Name) + +//line views/readers.qtpl:13 + qw422016.N().S(` +`) +//line views/readers.qtpl:14 + StreamNavHTML(qw422016, rq, h.Name, "page") +//line views/readers.qtpl:14 + qw422016.N().S(` +<div class="layout"> +<main class="main-width"> + <article> + `) +//line views/readers.qtpl:18 + qw422016.N().S(NaviTitleHTML(h)) +//line views/readers.qtpl:18 + qw422016.N().S(` + `) +//line views/readers.qtpl:19 + if contents == "" { +//line views/readers.qtpl:19 + qw422016.N().S(` + <p>This hypha has no text. Why not <a href="/edit/`) +//line views/readers.qtpl:20 + qw422016.E().S(h.Name) +//line views/readers.qtpl:20 + qw422016.N().S(`">create it</a>?</p> + `) +//line views/readers.qtpl:21 + } else { +//line views/readers.qtpl:21 + qw422016.N().S(` + `) +//line views/readers.qtpl:22 + qw422016.N().S(contents) +//line views/readers.qtpl:22 + qw422016.N().S(` + `) +//line views/readers.qtpl:23 + } +//line views/readers.qtpl:23 + qw422016.N().S(` + </article> + <section class="prevnext"> + `) +//line views/readers.qtpl:26 + if prevHyphaName != "" { +//line views/readers.qtpl:26 + qw422016.N().S(` + <a class="prevnext__el prevnext__prev" href="/hypha/`) +//line views/readers.qtpl:27 + qw422016.E().S(prevHyphaName) +//line views/readers.qtpl:27 + qw422016.N().S(`" rel="prev">← `) +//line views/readers.qtpl:27 + qw422016.E().S(util.BeautifulName(path.Base(prevHyphaName))) +//line views/readers.qtpl:27 + qw422016.N().S(`</a> + `) +//line views/readers.qtpl:28 + } +//line views/readers.qtpl:28 + qw422016.N().S(` + `) +//line views/readers.qtpl:29 + if nextHyphaName != "" { +//line views/readers.qtpl:29 + qw422016.N().S(` + <a class="prevnext__el prevnext__next" href="/hypha/`) +//line views/readers.qtpl:30 + qw422016.E().S(nextHyphaName) +//line views/readers.qtpl:30 + qw422016.N().S(`" rel="next">`) +//line views/readers.qtpl:30 + qw422016.E().S(util.BeautifulName(path.Base(nextHyphaName))) +//line views/readers.qtpl:30 + qw422016.N().S(` →</a> + `) +//line views/readers.qtpl:31 + } +//line views/readers.qtpl:31 + qw422016.N().S(` + </section> +`) +//line views/readers.qtpl:33 + if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" { +//line views/readers.qtpl:33 + qw422016.N().S(` + <form action="/upload-binary/`) +//line views/readers.qtpl:34 + qw422016.E().S(h.Name) +//line views/readers.qtpl:34 + qw422016.N().S(`" + method="post" enctype="multipart/form-data" + class="upload-amnt"> + `) +//line views/readers.qtpl:37 + if h.Exists && h.BinaryPath != "" { +//line views/readers.qtpl:37 + qw422016.N().S(` + <a class="upload-amnt__unattach" href="/unattach-ask/`) +//line views/readers.qtpl:38 + qw422016.E().S(h.Name) +//line views/readers.qtpl:38 + qw422016.N().S(`">Unattach current attachment?</a> + `) +//line views/readers.qtpl:39 + } +//line views/readers.qtpl:39 + qw422016.N().S(` + <label for="upload-binary__input">Upload a new attachment</label> + <br> + <input type="file" id="upload-binary__input" name="binary"/> + <input type="submit"/> + </form> +`) +//line views/readers.qtpl:45 + } +//line views/readers.qtpl:45 + qw422016.N().S(` +`) +//line views/readers.qtpl:46 + StreamSubhyphaeHTML(qw422016, subhyphae) +//line views/readers.qtpl:46 + qw422016.N().S(` +</main> +`) +//line views/readers.qtpl:48 + StreamRelativeHyphaeHTML(qw422016, relatives) +//line views/readers.qtpl:48 + qw422016.N().S(` +`) +//line views/readers.qtpl:49 + StreamBackLinksHTML(qw422016, h) +//line views/readers.qtpl:49 + qw422016.N().S(` +</div> +`) +//line views/readers.qtpl:51 +} + +//line views/readers.qtpl:51 +func WriteHyphaHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents string) { +//line views/readers.qtpl:51 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/readers.qtpl:51 + StreamHyphaHTML(qw422016, rq, h, contents) +//line views/readers.qtpl:51 + qt422016.ReleaseWriter(qw422016) +//line views/readers.qtpl:51 +} + +//line views/readers.qtpl:51 +func HyphaHTML(rq *http.Request, h *hyphae.Hypha, contents string) string { +//line views/readers.qtpl:51 + qb422016 := qt422016.AcquireByteBuffer() +//line views/readers.qtpl:51 + WriteHyphaHTML(qb422016, rq, h, contents) +//line views/readers.qtpl:51 + qs422016 := string(qb422016.B) +//line views/readers.qtpl:51 + qt422016.ReleaseByteBuffer(qb422016) +//line views/readers.qtpl:51 + return qs422016 +//line views/readers.qtpl:51 +} + +//line views/readers.qtpl:53 +func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, revHash string) { +//line views/readers.qtpl:53 + qw422016.N().S(` +`) +//line views/readers.qtpl:55 + relatives, subhyphae, _, _ := tree.Tree(h.Name) + +//line views/readers.qtpl:56 + qw422016.N().S(` +`) +//line views/readers.qtpl:57 + StreamNavHTML(qw422016, rq, h.Name, "revision", revHash) +//line views/readers.qtpl:57 + qw422016.N().S(` +<div class="layout"> +<main class="main-width"> + <article> + <p>Please note that viewing binary parts of hyphae is not supported in history for now.</p> + `) +//line views/readers.qtpl:62 + qw422016.N().S(NaviTitleHTML(h)) +//line views/readers.qtpl:62 + qw422016.N().S(` + `) +//line views/readers.qtpl:63 + qw422016.N().S(contents) +//line views/readers.qtpl:63 + qw422016.N().S(` + </article> +`) +//line views/readers.qtpl:65 + StreamSubhyphaeHTML(qw422016, subhyphae) +//line views/readers.qtpl:65 + qw422016.N().S(` +</main> +`) +//line views/readers.qtpl:67 + StreamRelativeHyphaeHTML(qw422016, relatives) +//line views/readers.qtpl:67 + qw422016.N().S(` +</div> +`) +//line views/readers.qtpl:69 +} + +//line views/readers.qtpl:69 +func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, revHash string) { +//line views/readers.qtpl:69 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/readers.qtpl:69 + StreamRevisionHTML(qw422016, rq, h, contents, revHash) +//line views/readers.qtpl:69 + qt422016.ReleaseWriter(qw422016) +//line views/readers.qtpl:69 +} + +//line views/readers.qtpl:69 +func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, revHash string) string { +//line views/readers.qtpl:69 + qb422016 := qt422016.AcquireByteBuffer() +//line views/readers.qtpl:69 + WriteRevisionHTML(qb422016, rq, h, contents, revHash) +//line views/readers.qtpl:69 + qs422016 := string(qb422016.B) +//line views/readers.qtpl:69 + qt422016.ReleaseByteBuffer(qb422016) +//line views/readers.qtpl:69 + return qs422016 +//line views/readers.qtpl:69 +} + +//line views/readers.qtpl:71 +func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { +//line views/readers.qtpl:71 + qw422016.N().S(` +`) +//line views/readers.qtpl:72 + StreamNavHTML(qw422016, rq, hyphaName, "history") +//line views/readers.qtpl:72 + qw422016.N().S(` +<div class="layout"> +<main class="main-width"> + <article class="history"> + <h1>History of `) +//line views/readers.qtpl:76 + qw422016.E().S(hyphaName) +//line views/readers.qtpl:76 + qw422016.N().S(`</h1> + `) +//line views/readers.qtpl:77 + qw422016.N().S(list) +//line views/readers.qtpl:77 + qw422016.N().S(` + </article> +</main> +</div> +`) +//line views/readers.qtpl:81 +} + +//line views/readers.qtpl:81 +func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { +//line views/readers.qtpl:81 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/readers.qtpl:81 + StreamHistoryHTML(qw422016, rq, hyphaName, list) +//line views/readers.qtpl:81 + qt422016.ReleaseWriter(qw422016) +//line views/readers.qtpl:81 +} + +//line views/readers.qtpl:81 +func HistoryHTML(rq *http.Request, hyphaName, list string) string { +//line views/readers.qtpl:81 + qb422016 := qt422016.AcquireByteBuffer() +//line views/readers.qtpl:81 + WriteHistoryHTML(qb422016, rq, hyphaName, list) +//line views/readers.qtpl:81 + qs422016 := string(qb422016.B) +//line views/readers.qtpl:81 + qt422016.ReleaseByteBuffer(qb422016) +//line views/readers.qtpl:81 + return qs422016 +//line views/readers.qtpl:81 +} From 8cdea2d7ba959082d600b2c6b919a7ccd46f339e Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 21:17:20 +0500 Subject: [PATCH 33/53] Fix revision contents not showing --- history/information.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/history/information.go b/history/information.go index f2c0aad..6610917 100644 --- a/history/information.go +++ b/history/information.go @@ -177,6 +177,6 @@ func parseRevisionLine(line string) Revision { // See how the file with `filepath` looked at commit with `hash`. func FileAtRevision(filepath, hash string) (string, error) { - out, err := gitsh("show", hash+":"+filepath) + out, err := gitsh("show", hash+":"+strings.TrimPrefix(filepath, util.WikiDir+"/")) return out.String(), err } From c726a8b3075a100c38dc56346719c37897fd8bbe Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 21:21:10 +0500 Subject: [PATCH 34/53] Fix the error when previewing --- http_mutators.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/http_mutators.go b/http_mutators.go index 3e29066..c2410ec 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -179,13 +179,12 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) { if action != "Preview" { hop, errtitle = shroom.UploadText(h, []byte(textData), u) - } - - if hop.HasErrors() { - HttpErr(w, http.StatusForbidden, hyphaName, - errtitle, - hop.FirstErrorText()) - return + if hop.HasErrors() { + HttpErr(w, http.StatusForbidden, hyphaName, + errtitle, + hop.FirstErrorText()) + return + } } if action == "Preview" { From 9f1eadcec44e2295850c6130c16efaed6efdd288 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 21:23:47 +0500 Subject: [PATCH 35/53] Make backlink sidebar invisible and make backlink indexer sync --- shroom/backlink.go | 21 +++++++-------------- templates/asset.qtpl.go | 2 +- templates/default.css | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/shroom/backlink.go b/shroom/backlink.go index 8335fc2..860ba56 100644 --- a/shroom/backlink.go +++ b/shroom/backlink.go @@ -3,7 +3,6 @@ package shroom import ( "io/ioutil" "log" - "sync" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" @@ -18,25 +17,19 @@ func FindAllBacklinks() { func findBacklinkWorker(h *hyphae.Hypha) { var ( - wg sync.WaitGroup textContents, err = ioutil.ReadFile(h.TextPath) ) if err == nil { for outlink := range markup.Doc(h.Name, string(textContents)).OutLinks() { - go func() { - wg.Add(1) - outlinkHypha := hyphae.ByName(outlink) - if outlinkHypha == h { - return - } + outlinkHypha := hyphae.ByName(outlink) + if outlinkHypha == h { + break + } - outlinkHypha.AddBackLink(h) - outlinkHypha.InsertIfNewKeepExistence() - h.AddOutLink(outlinkHypha) - wg.Done() - }() + outlinkHypha.AddBackLink(h) + outlinkHypha.InsertIfNewKeepExistence() + h.AddOutLink(outlinkHypha) } - wg.Wait() } else { log.Println("Error when reading text contents of ‘%s’: %s", h.Name, err.Error()) } diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index 1725377..c739b62 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -280,7 +280,7 @@ mark { background: rgba(130, 80, 30, 5); color: inherit; } } - +.backlinks { display: none; } `) //line templates/asset.qtpl:2 qw422016.N().S(` diff --git a/templates/default.css b/templates/default.css index daddf05..9984be5 100644 --- a/templates/default.css +++ b/templates/default.css @@ -255,4 +255,4 @@ mark { background: rgba(130, 80, 30, 5); color: inherit; } } - +.backlinks { display: none; } From 4798d94a94208d6af21e1fa682ff87f6f5089a65 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Sat, 20 Feb 2021 21:50:25 +0500 Subject: [PATCH 36/53] Refactor history views --- history/history.go | 24 +- history/information.go | 9 +- http_history.go | 2 +- templates/asset.qtpl.go | 4 +- templates/default.css | 4 +- templates/recent_changes.qtpl.go | 161 --------- .../recent_changes.qtpl => views/history.qtpl | 31 +- views/history.qtpl.go | 305 ++++++++++++++++++ views/readers.qtpl | 12 - views/readers.qtpl.go | 55 ---- 10 files changed, 344 insertions(+), 263 deletions(-) delete mode 100644 templates/recent_changes.qtpl.go rename templates/recent_changes.qtpl => views/history.qtpl (57%) create mode 100644 views/history.qtpl.go diff --git a/history/history.go b/history/history.go index f3d117d..d02e156 100644 --- a/history/history.go +++ b/history/history.go @@ -10,7 +10,6 @@ import ( "strings" "time" - "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" ) @@ -77,8 +76,8 @@ func (rev Revision) TimeString() string { return rev.Time.Format(time.RFC822) } -// HyphaeLinks returns a comma-separated list of hyphae that were affected by this revision as HTML string. -func (rev Revision) HyphaeLinks() (html string) { +// HyphaeLinksHTML returns a comma-separated list of hyphae that were affected by this revision as HTML string. +func (rev Revision) HyphaeLinksHTML() (html string) { hyphae := rev.hyphaeAffected() for i, hyphaName := range hyphae { if i > 0 { @@ -92,7 +91,7 @@ func (rev Revision) HyphaeLinks() (html string) { func (rev *Revision) descriptionForFeed() (html string) { return fmt.Sprintf( `<p>%s</p> -<p><b>Hyphae affected:</b> %s</p>`, rev.Message, rev.HyphaeLinks()) +<p><b>Hyphae affected:</b> %s</p>`, rev.Message, rev.HyphaeLinksHTML()) } // Try and guess what link is the most important by looking at the message. @@ -111,23 +110,6 @@ func (rev *Revision) bestLink() string { } } -func (rev Revision) RecentChangesEntry() (html string) { - if user.AuthUsed && rev.Username != "anon" { - return fmt.Sprintf(` -<li class="rc-entry__time"><time>%[1]s</time></li> -<li class="rc-entry__hash">%[2]s</li> -<li class="rc-entry__links">%[5]s</li> -<li class="rc-entry__msg">%[6]s <span class="rc-entry__author">by <a href="/page/%[3]s/%[4]s" rel="author">%[4]s</a></span></li> -`, rev.TimeString(), rev.Hash, util.UserHypha, rev.Username, rev.HyphaeLinks(), rev.Message) - } - return fmt.Sprintf(` -<li class="rc-entry__time"><time>%[1]s</time></li> -<li class="rc-entry__hash">%[2]s</li> -<li class="rc-entry__links">%[3]s</li> -<li class="rc-entry__msg">%[4]s</li> -`, rev.TimeString(), rev.Hash, rev.HyphaeLinks(), rev.Message) -} - // Path to git executable. Set at init() var gitpath string diff --git a/history/information.go b/history/information.go index 6610917..f3cf8a7 100644 --- a/history/information.go +++ b/history/information.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/util" "github.com/gorilla/feeds" ) @@ -61,7 +60,7 @@ func RecentChangesJSON() (string, error) { return recentChangesFeed().ToJSON() } -func RecentChanges(n int) string { +func RecentChanges(n int) []Revision { var ( out, err = gitsh( "log", "--oneline", "--no-merges", @@ -75,11 +74,7 @@ func RecentChanges(n int) string { revs = append(revs, parseRevisionLine(line)) } } - entries := make([]string, len(revs)) - for i, rev := range revs { - entries[i] = rev.RecentChangesEntry() - } - return templates.RecentChangesHTML(entries, n) + return revs } // FileChanged tells you if the file has been changed. diff --git a/http_history.go b/http_history.go index a952682..110ca3a 100644 --- a/http_history.go +++ b/http_history.go @@ -46,7 +46,7 @@ func handlerRecentChanges(w http.ResponseWriter, rq *http.Request) { n, err = strconv.Atoi(noPrefix) ) if err == nil && n < 101 { - util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", history.RecentChanges(n), user.FromRequest(rq))) + util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", views.RecentChangesHTML(n), user.FromRequest(rq))) } else { http.Redirect(w, rq, "/recent-changes/20", http.StatusSeeOther) } diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index c739b62..f88dcac 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -151,10 +151,10 @@ figcaption { padding-bottom: .5rem; } #new-name {width:100%;} -.rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; } +.rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; border-radius: .25rem; } .rc-entry__time { font-style: italic; } .rc-entry__hash { font-style: italic; text-align: right; } -.rc-entry__links { grid-column: 1 / span 2; } +.rc-entry__links, .rc-entry__msg { grid-column: 1 / span 2; } .rc-entry__author { font-style: italic; } .prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; border-radius: .25rem; } diff --git a/templates/default.css b/templates/default.css index 9984be5..db31f9c 100644 --- a/templates/default.css +++ b/templates/default.css @@ -126,10 +126,10 @@ figcaption { padding-bottom: .5rem; } #new-name {width:100%;} -.rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; } +.rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; border-radius: .25rem; } .rc-entry__time { font-style: italic; } .rc-entry__hash { font-style: italic; text-align: right; } -.rc-entry__links { grid-column: 1 / span 2; } +.rc-entry__links, .rc-entry__msg { grid-column: 1 / span 2; } .rc-entry__author { font-style: italic; } .prevnext__el { display: block-inline; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; border-radius: .25rem; } diff --git a/templates/recent_changes.qtpl.go b/templates/recent_changes.qtpl.go deleted file mode 100644 index e3cc346..0000000 --- a/templates/recent_changes.qtpl.go +++ /dev/null @@ -1,161 +0,0 @@ -// Code generated by qtc from "recent_changes.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line templates/recent_changes.qtpl:1 -package templates - -//line templates/recent_changes.qtpl:1 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line templates/recent_changes.qtpl:1 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line templates/recent_changes.qtpl:1 -func StreamRecentChangesHTML(qw422016 *qt422016.Writer, changes []string, n int) { -//line templates/recent_changes.qtpl:1 - qw422016.N().S(` -<div class="layout"> -<main class="main-width recent-changes"> - <h1>Recent Changes</h1> - <p><a href="/">← Back</a></p> - - <nav class="recent-changes__count"> - See - `) -//line templates/recent_changes.qtpl:9 - for _, m := range []int{20, 0, 50, 0, 100} { -//line templates/recent_changes.qtpl:9 - qw422016.N().S(` - `) -//line templates/recent_changes.qtpl:10 - switch m { -//line templates/recent_changes.qtpl:11 - case 0: -//line templates/recent_changes.qtpl:11 - qw422016.N().S(` - <span aria-hidden="true">|</span> - `) -//line templates/recent_changes.qtpl:13 - case n: -//line templates/recent_changes.qtpl:13 - qw422016.N().S(` - <b>`) -//line templates/recent_changes.qtpl:14 - qw422016.N().D(n) -//line templates/recent_changes.qtpl:14 - qw422016.N().S(`</b> - `) -//line templates/recent_changes.qtpl:15 - default: -//line templates/recent_changes.qtpl:15 - qw422016.N().S(` - <a href="/recent-changes/`) -//line templates/recent_changes.qtpl:16 - qw422016.N().D(m) -//line templates/recent_changes.qtpl:16 - qw422016.N().S(`">`) -//line templates/recent_changes.qtpl:16 - qw422016.N().D(m) -//line templates/recent_changes.qtpl:16 - qw422016.N().S(`</a> - `) -//line templates/recent_changes.qtpl:17 - } -//line templates/recent_changes.qtpl:17 - qw422016.N().S(` - `) -//line templates/recent_changes.qtpl:18 - } -//line templates/recent_changes.qtpl:18 - qw422016.N().S(` - recent changes - </nav> - - <p><img class="icon" width="20" height="20" src="https://upload.wikimedia.org/wikipedia/commons/4/46/Generic_Feed-icon.svg">Subscribe via <a href="/recent-changes-rss">RSS</a>, <a href="/recent-changes-atom">Atom</a> or <a href="/recent-changes-json">JSON feed</a>.</p> - - `) -//line templates/recent_changes.qtpl:29 - qw422016.N().S(` - - <section class="recent-changes__list" role="feed"> - `) -//line templates/recent_changes.qtpl:32 - if len(changes) == 0 { -//line templates/recent_changes.qtpl:32 - qw422016.N().S(` - <p>Could not find any recent changes.</p> - `) -//line templates/recent_changes.qtpl:34 - } else { -//line templates/recent_changes.qtpl:34 - qw422016.N().S(` - `) -//line templates/recent_changes.qtpl:35 - for i, entry := range changes { -//line templates/recent_changes.qtpl:35 - qw422016.N().S(` - <ul class="recent-changes__entry rc-entry" role="article" - aria-setsize="`) -//line templates/recent_changes.qtpl:37 - qw422016.N().D(n) -//line templates/recent_changes.qtpl:37 - qw422016.N().S(`" aria-posinset="`) -//line templates/recent_changes.qtpl:37 - qw422016.N().D(i) -//line templates/recent_changes.qtpl:37 - qw422016.N().S(`"> - `) -//line templates/recent_changes.qtpl:38 - qw422016.N().S(entry) -//line templates/recent_changes.qtpl:38 - qw422016.N().S(` - </ul> - `) -//line templates/recent_changes.qtpl:40 - } -//line templates/recent_changes.qtpl:40 - qw422016.N().S(` - `) -//line templates/recent_changes.qtpl:41 - } -//line templates/recent_changes.qtpl:41 - qw422016.N().S(` - </section> -</main> -</div> -`) -//line templates/recent_changes.qtpl:45 -} - -//line templates/recent_changes.qtpl:45 -func WriteRecentChangesHTML(qq422016 qtio422016.Writer, changes []string, n int) { -//line templates/recent_changes.qtpl:45 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/recent_changes.qtpl:45 - StreamRecentChangesHTML(qw422016, changes, n) -//line templates/recent_changes.qtpl:45 - qt422016.ReleaseWriter(qw422016) -//line templates/recent_changes.qtpl:45 -} - -//line templates/recent_changes.qtpl:45 -func RecentChangesHTML(changes []string, n int) string { -//line templates/recent_changes.qtpl:45 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/recent_changes.qtpl:45 - WriteRecentChangesHTML(qb422016, changes, n) -//line templates/recent_changes.qtpl:45 - qs422016 := string(qb422016.B) -//line templates/recent_changes.qtpl:45 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/recent_changes.qtpl:45 - return qs422016 -//line templates/recent_changes.qtpl:45 -} diff --git a/templates/recent_changes.qtpl b/views/history.qtpl similarity index 57% rename from templates/recent_changes.qtpl rename to views/history.qtpl index 9082e96..7b5b0ef 100644 --- a/templates/recent_changes.qtpl +++ b/views/history.qtpl @@ -1,4 +1,9 @@ -{% func RecentChangesHTML(changes []string, n int) %} +{% import "net/http" %} + +{% import "github.com/bouncepaw/mycorrhiza/util" %} +{% import "github.com/bouncepaw/mycorrhiza/history" %} + +{% func RecentChangesHTML(n int) %} <div class="layout"> <main class="main-width recent-changes"> <h1>Recent Changes</h1> @@ -28,6 +33,9 @@ How come? I'll add the role anyway. -- bouncepaw {% endcomment %} + {% code + changes := history.RecentChanges(n) + %} <section class="recent-changes__list" role="feed"> {% if len(changes) == 0 %} <p>Could not find any recent changes.</p> @@ -35,7 +43,7 @@ {% for i, entry := range changes %} <ul class="recent-changes__entry rc-entry" role="article" aria-setsize="{%d n %}" aria-posinset="{%d i %}"> - {%s= entry %} + {%s= recentChangesEntry(entry) %} </ul> {% endfor %} {% endif %} @@ -43,3 +51,22 @@ </main> </div> {% endfunc %} + +{% func recentChangesEntry(rev history.Revision) %} +<li class="rc-entry__time"><time>{%s rev.TimeString() %}</time></li> +<li class="rc-entry__hash">{%s rev.Hash %}</li> +<li class="rc-entry__links">{%s= rev.HyphaeLinksHTML() %}</li> +<li class="rc-entry__msg">{%s rev.Message %} {% if rev.Username != "anon" %}<span class="rc-entry__author">by <a href="/hypha/{%s util.UserHypha %}/{%s rev.Username %}" rel="author">{%s rev.Username %}</a></span>{% endif %}</li> +{% endfunc %} + +{% func HistoryHTML(rq *http.Request, hyphaName, list string) %} +{%= NavHTML(rq, hyphaName, "history") %} +<div class="layout"> +<main class="main-width"> + <article class="history"> + <h1>History of {%s util.BeautifulName(hyphaName) %}</h1> + {%s= list %} + </article> +</main> +</div> +{% endfunc %} diff --git a/views/history.qtpl.go b/views/history.qtpl.go new file mode 100644 index 0000000..6d81497 --- /dev/null +++ b/views/history.qtpl.go @@ -0,0 +1,305 @@ +// Code generated by qtc from "history.qtpl". DO NOT EDIT. +// See https://github.com/valyala/quicktemplate for details. + +//line views/history.qtpl:1 +package views + +//line views/history.qtpl:1 +import "net/http" + +//line views/history.qtpl:3 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/history.qtpl:4 +import "github.com/bouncepaw/mycorrhiza/history" + +//line views/history.qtpl:6 +import ( + qtio422016 "io" + + qt422016 "github.com/valyala/quicktemplate" +) + +//line views/history.qtpl:6 +var ( + _ = qtio422016.Copy + _ = qt422016.AcquireByteBuffer +) + +//line views/history.qtpl:6 +func StreamRecentChangesHTML(qw422016 *qt422016.Writer, n int) { +//line views/history.qtpl:6 + qw422016.N().S(` +<div class="layout"> +<main class="main-width recent-changes"> + <h1>Recent Changes</h1> + <p><a href="/">← Back</a></p> + + <nav class="recent-changes__count"> + See + `) +//line views/history.qtpl:14 + for _, m := range []int{20, 0, 50, 0, 100} { +//line views/history.qtpl:14 + qw422016.N().S(` + `) +//line views/history.qtpl:15 + switch m { +//line views/history.qtpl:16 + case 0: +//line views/history.qtpl:16 + qw422016.N().S(` + <span aria-hidden="true">|</span> + `) +//line views/history.qtpl:18 + case n: +//line views/history.qtpl:18 + qw422016.N().S(` + <b>`) +//line views/history.qtpl:19 + qw422016.N().D(n) +//line views/history.qtpl:19 + qw422016.N().S(`</b> + `) +//line views/history.qtpl:20 + default: +//line views/history.qtpl:20 + qw422016.N().S(` + <a href="/recent-changes/`) +//line views/history.qtpl:21 + qw422016.N().D(m) +//line views/history.qtpl:21 + qw422016.N().S(`">`) +//line views/history.qtpl:21 + qw422016.N().D(m) +//line views/history.qtpl:21 + qw422016.N().S(`</a> + `) +//line views/history.qtpl:22 + } +//line views/history.qtpl:22 + qw422016.N().S(` + `) +//line views/history.qtpl:23 + } +//line views/history.qtpl:23 + qw422016.N().S(` + recent changes + </nav> + + <p><img class="icon" width="20" height="20" src="https://upload.wikimedia.org/wikipedia/commons/4/46/Generic_Feed-icon.svg">Subscribe via <a href="/recent-changes-rss">RSS</a>, <a href="/recent-changes-atom">Atom</a> or <a href="/recent-changes-json">JSON feed</a>.</p> + + `) +//line views/history.qtpl:34 + qw422016.N().S(` + + `) +//line views/history.qtpl:37 + changes := history.RecentChanges(n) + +//line views/history.qtpl:38 + qw422016.N().S(` + <section class="recent-changes__list" role="feed"> + `) +//line views/history.qtpl:40 + if len(changes) == 0 { +//line views/history.qtpl:40 + qw422016.N().S(` + <p>Could not find any recent changes.</p> + `) +//line views/history.qtpl:42 + } else { +//line views/history.qtpl:42 + qw422016.N().S(` + `) +//line views/history.qtpl:43 + for i, entry := range changes { +//line views/history.qtpl:43 + qw422016.N().S(` + <ul class="recent-changes__entry rc-entry" role="article" + aria-setsize="`) +//line views/history.qtpl:45 + qw422016.N().D(n) +//line views/history.qtpl:45 + qw422016.N().S(`" aria-posinset="`) +//line views/history.qtpl:45 + qw422016.N().D(i) +//line views/history.qtpl:45 + qw422016.N().S(`"> + `) +//line views/history.qtpl:46 + qw422016.N().S(recentChangesEntry(entry)) +//line views/history.qtpl:46 + qw422016.N().S(` + </ul> + `) +//line views/history.qtpl:48 + } +//line views/history.qtpl:48 + qw422016.N().S(` + `) +//line views/history.qtpl:49 + } +//line views/history.qtpl:49 + qw422016.N().S(` + </section> +</main> +</div> +`) +//line views/history.qtpl:53 +} + +//line views/history.qtpl:53 +func WriteRecentChangesHTML(qq422016 qtio422016.Writer, n int) { +//line views/history.qtpl:53 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/history.qtpl:53 + StreamRecentChangesHTML(qw422016, n) +//line views/history.qtpl:53 + qt422016.ReleaseWriter(qw422016) +//line views/history.qtpl:53 +} + +//line views/history.qtpl:53 +func RecentChangesHTML(n int) string { +//line views/history.qtpl:53 + qb422016 := qt422016.AcquireByteBuffer() +//line views/history.qtpl:53 + WriteRecentChangesHTML(qb422016, n) +//line views/history.qtpl:53 + qs422016 := string(qb422016.B) +//line views/history.qtpl:53 + qt422016.ReleaseByteBuffer(qb422016) +//line views/history.qtpl:53 + return qs422016 +//line views/history.qtpl:53 +} + +//line views/history.qtpl:55 +func streamrecentChangesEntry(qw422016 *qt422016.Writer, rev history.Revision) { +//line views/history.qtpl:55 + qw422016.N().S(` +<li class="rc-entry__time"><time>`) +//line views/history.qtpl:56 + qw422016.E().S(rev.TimeString()) +//line views/history.qtpl:56 + qw422016.N().S(`</time></li> +<li class="rc-entry__hash">`) +//line views/history.qtpl:57 + qw422016.E().S(rev.Hash) +//line views/history.qtpl:57 + qw422016.N().S(`</li> +<li class="rc-entry__links">`) +//line views/history.qtpl:58 + qw422016.N().S(rev.HyphaeLinksHTML()) +//line views/history.qtpl:58 + qw422016.N().S(`</li> +<li class="rc-entry__msg">`) +//line views/history.qtpl:59 + qw422016.E().S(rev.Message) +//line views/history.qtpl:59 + qw422016.N().S(` `) +//line views/history.qtpl:59 + if rev.Username != "anon" { +//line views/history.qtpl:59 + qw422016.N().S(`<span class="rc-entry__author">by <a href="/hypha/`) +//line views/history.qtpl:59 + qw422016.E().S(util.UserHypha) +//line views/history.qtpl:59 + qw422016.N().S(`/`) +//line views/history.qtpl:59 + qw422016.E().S(rev.Username) +//line views/history.qtpl:59 + qw422016.N().S(`" rel="author">`) +//line views/history.qtpl:59 + qw422016.E().S(rev.Username) +//line views/history.qtpl:59 + qw422016.N().S(`</a></span>`) +//line views/history.qtpl:59 + } +//line views/history.qtpl:59 + qw422016.N().S(`</li> +`) +//line views/history.qtpl:60 +} + +//line views/history.qtpl:60 +func writerecentChangesEntry(qq422016 qtio422016.Writer, rev history.Revision) { +//line views/history.qtpl:60 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/history.qtpl:60 + streamrecentChangesEntry(qw422016, rev) +//line views/history.qtpl:60 + qt422016.ReleaseWriter(qw422016) +//line views/history.qtpl:60 +} + +//line views/history.qtpl:60 +func recentChangesEntry(rev history.Revision) string { +//line views/history.qtpl:60 + qb422016 := qt422016.AcquireByteBuffer() +//line views/history.qtpl:60 + writerecentChangesEntry(qb422016, rev) +//line views/history.qtpl:60 + qs422016 := string(qb422016.B) +//line views/history.qtpl:60 + qt422016.ReleaseByteBuffer(qb422016) +//line views/history.qtpl:60 + return qs422016 +//line views/history.qtpl:60 +} + +//line views/history.qtpl:62 +func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { +//line views/history.qtpl:62 + qw422016.N().S(` +`) +//line views/history.qtpl:63 + StreamNavHTML(qw422016, rq, hyphaName, "history") +//line views/history.qtpl:63 + qw422016.N().S(` +<div class="layout"> +<main class="main-width"> + <article class="history"> + <h1>History of `) +//line views/history.qtpl:67 + qw422016.E().S(util.BeautifulName(hyphaName)) +//line views/history.qtpl:67 + qw422016.N().S(`</h1> + `) +//line views/history.qtpl:68 + qw422016.N().S(list) +//line views/history.qtpl:68 + qw422016.N().S(` + </article> +</main> +</div> +`) +//line views/history.qtpl:72 +} + +//line views/history.qtpl:72 +func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { +//line views/history.qtpl:72 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/history.qtpl:72 + StreamHistoryHTML(qw422016, rq, hyphaName, list) +//line views/history.qtpl:72 + qt422016.ReleaseWriter(qw422016) +//line views/history.qtpl:72 +} + +//line views/history.qtpl:72 +func HistoryHTML(rq *http.Request, hyphaName, list string) string { +//line views/history.qtpl:72 + qb422016 := qt422016.AcquireByteBuffer() +//line views/history.qtpl:72 + WriteHistoryHTML(qb422016, rq, hyphaName, list) +//line views/history.qtpl:72 + qs422016 := string(qb422016.B) +//line views/history.qtpl:72 + qt422016.ReleaseByteBuffer(qb422016) +//line views/history.qtpl:72 + return qs422016 +//line views/history.qtpl:72 +} diff --git a/views/readers.qtpl b/views/readers.qtpl index 4a9e834..9bbdb9e 100644 --- a/views/readers.qtpl +++ b/views/readers.qtpl @@ -67,15 +67,3 @@ If `contents` == "", a helpful message is shown instead. {%= RelativeHyphaeHTML(relatives) %} </div> {% endfunc %} - -{% func HistoryHTML(rq *http.Request, hyphaName, list string) %} -{%= NavHTML(rq, hyphaName, "history") %} -<div class="layout"> -<main class="main-width"> - <article class="history"> - <h1>History of {%s hyphaName %}</h1> - {%s= list %} - </article> -</main> -</div> -{% endfunc %} diff --git a/views/readers.qtpl.go b/views/readers.qtpl.go index 08015fc..fc358ff 100644 --- a/views/readers.qtpl.go +++ b/views/readers.qtpl.go @@ -281,58 +281,3 @@ func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, revHash string) s return qs422016 //line views/readers.qtpl:69 } - -//line views/readers.qtpl:71 -func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { -//line views/readers.qtpl:71 - qw422016.N().S(` -`) -//line views/readers.qtpl:72 - StreamNavHTML(qw422016, rq, hyphaName, "history") -//line views/readers.qtpl:72 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> - <article class="history"> - <h1>History of `) -//line views/readers.qtpl:76 - qw422016.E().S(hyphaName) -//line views/readers.qtpl:76 - qw422016.N().S(`</h1> - `) -//line views/readers.qtpl:77 - qw422016.N().S(list) -//line views/readers.qtpl:77 - qw422016.N().S(` - </article> -</main> -</div> -`) -//line views/readers.qtpl:81 -} - -//line views/readers.qtpl:81 -func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { -//line views/readers.qtpl:81 - qw422016 := qt422016.AcquireWriter(qq422016) -//line views/readers.qtpl:81 - StreamHistoryHTML(qw422016, rq, hyphaName, list) -//line views/readers.qtpl:81 - qt422016.ReleaseWriter(qw422016) -//line views/readers.qtpl:81 -} - -//line views/readers.qtpl:81 -func HistoryHTML(rq *http.Request, hyphaName, list string) string { -//line views/readers.qtpl:81 - qb422016 := qt422016.AcquireByteBuffer() -//line views/readers.qtpl:81 - WriteHistoryHTML(qb422016, rq, hyphaName, list) -//line views/readers.qtpl:81 - qs422016 := string(qb422016.B) -//line views/readers.qtpl:81 - qt422016.ReleaseByteBuffer(qb422016) -//line views/readers.qtpl:81 - return qs422016 -//line views/readers.qtpl:81 -} From 7f828059924ea9b7e758133b275085ee69239f35 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Mon, 22 Feb 2021 22:38:41 +0500 Subject: [PATCH 37/53] Move the unattach modal to the views module --- http_mutators.go | 3 +- templates/asset.qtpl.go | 8 +- templates/default.css | 8 +- templates/unattach.qtpl | 26 ------- templates/unattach.qtpl.go | 150 ------------------------------------- views/unattach.qtpl | 18 +++++ views/unattach.qtpl.go | 91 ++++++++++++++++++++++ 7 files changed, 125 insertions(+), 179 deletions(-) delete mode 100644 templates/unattach.qtpl delete mode 100644 templates/unattach.qtpl.go create mode 100644 views/unattach.qtpl create mode 100644 views/unattach.qtpl.go diff --git a/http_mutators.go b/http_mutators.go index c2410ec..d40a16c 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -12,6 +12,7 @@ import ( "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" + "github.com/bouncepaw/mycorrhiza/views" ) func init() { @@ -63,7 +64,7 @@ var handlerUnattachAsk = factoryHandlerAsker( "unattach-ask", shroom.CanUnattach, "Unattach %s?", - templates.UnattachAskHTML, + views.UnattachAskHTML, ) var handlerDeleteAsk = factoryHandlerAsker( diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index f88dcac..7125101 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -24,6 +24,11 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) { `) //line templates/asset.qtpl:2 qw422016.N().S(`/* General element positions, from small to big */ +.modal__title { font-size: 2rem; } +.modal__confirmation-msg { margin: 0 0 .5rem 0; } +.modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } +.modal__submit { border: 1px #999 solid; } +.modal__cancel { border: 1px #999 dashed; text-decoration: none; } /* Phones and whatnot */ .layout { display: grid; row-gap: 1rem; } header { width: 100%; margin-bottom: 1rem; } @@ -90,7 +95,8 @@ header { width: 100%; margin-bottom: 1rem; } *, *::before, *::after {box-sizing: border-box;} html { height:100%; padding:0; } -body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;} +body {height:100%; margin:0; } +body, input { font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;} main > form {margin-bottom:1rem;} textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;} diff --git a/templates/default.css b/templates/default.css index db31f9c..c5d3001 100644 --- a/templates/default.css +++ b/templates/default.css @@ -1,4 +1,9 @@ /* General element positions, from small to big */ +.modal__title { font-size: 2rem; } +.modal__confirmation-msg { margin: 0 0 .5rem 0; } +.modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } +.modal__submit { border: 1px #999 solid; } +.modal__cancel { border: 1px #999 dashed; text-decoration: none; } /* Phones and whatnot */ .layout { display: grid; row-gap: 1rem; } header { width: 100%; margin-bottom: 1rem; } @@ -65,7 +70,8 @@ header { width: 100%; margin-bottom: 1rem; } *, *::before, *::after {box-sizing: border-box;} html { height:100%; padding:0; } -body {height:100%; margin:0; font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;} +body {height:100%; margin:0; } +body, input { font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;} main > form {margin-bottom:1rem;} textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;} diff --git a/templates/unattach.qtpl b/templates/unattach.qtpl deleted file mode 100644 index 8f7fe60..0000000 --- a/templates/unattach.qtpl +++ /dev/null @@ -1,26 +0,0 @@ -{% import "net/http" %} -{% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %} -{%= navHTML(rq, hyphaName, "unattach-ask") %} -<div class="layout"> -<main class="main-width"> -{%- if isOld -%} - <section> - <h1>Unattach {%s hyphaName %}?</h1> - <p>Do you really want to unattach hypha <em>{%s hyphaName %}</em>?</p> - <p><a href="/unattach-confirm/{%s hyphaName %}"><strong>Confirm</strong></a></p> - <p><a href="/page/{%s hyphaName %}">Cancel</a></p> - </section> -{%- else -%} - {%= cannotUnattachDueToNonExistence(hyphaName) %} -{%- endif -%} -</main> -</div> -{% endfunc %} - -{% func cannotUnattachDueToNonExistence(hyphaName string) %} - <section> - <h1>Cannot unattach {%s hyphaName %}</h1> - <p>This hypha does not exist.</p> - <p><a href="/page/{%s hyphaName %}">Go back</a></p> - </section> -{% endfunc %} diff --git a/templates/unattach.qtpl.go b/templates/unattach.qtpl.go deleted file mode 100644 index e5bc0d2..0000000 --- a/templates/unattach.qtpl.go +++ /dev/null @@ -1,150 +0,0 @@ -// Code generated by qtc from "unattach.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line templates/unattach.qtpl:1 -package templates - -//line templates/unattach.qtpl:1 -import "net/http" - -//line templates/unattach.qtpl:2 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line templates/unattach.qtpl:2 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line templates/unattach.qtpl:2 -func StreamUnattachAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/unattach.qtpl:2 - qw422016.N().S(` -`) -//line templates/unattach.qtpl:3 - streamnavHTML(qw422016, rq, hyphaName, "unattach-ask") -//line templates/unattach.qtpl:3 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> -`) -//line templates/unattach.qtpl:6 - if isOld { -//line templates/unattach.qtpl:6 - qw422016.N().S(` <section> - <h1>Unattach `) -//line templates/unattach.qtpl:8 - qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:8 - qw422016.N().S(`?</h1> - <p>Do you really want to unattach hypha <em>`) -//line templates/unattach.qtpl:9 - qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:9 - qw422016.N().S(`</em>?</p> - <p><a href="/unattach-confirm/`) -//line templates/unattach.qtpl:10 - qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:10 - qw422016.N().S(`"><strong>Confirm</strong></a></p> - <p><a href="/page/`) -//line templates/unattach.qtpl:11 - qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:11 - qw422016.N().S(`">Cancel</a></p> - </section> -`) -//line templates/unattach.qtpl:13 - } else { -//line templates/unattach.qtpl:13 - qw422016.N().S(` `) -//line templates/unattach.qtpl:14 - streamcannotUnattachDueToNonExistence(qw422016, hyphaName) -//line templates/unattach.qtpl:14 - qw422016.N().S(` -`) -//line templates/unattach.qtpl:15 - } -//line templates/unattach.qtpl:15 - qw422016.N().S(`</main> -</div> -`) -//line templates/unattach.qtpl:18 -} - -//line templates/unattach.qtpl:18 -func WriteUnattachAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/unattach.qtpl:18 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/unattach.qtpl:18 - StreamUnattachAskHTML(qw422016, rq, hyphaName, isOld) -//line templates/unattach.qtpl:18 - qt422016.ReleaseWriter(qw422016) -//line templates/unattach.qtpl:18 -} - -//line templates/unattach.qtpl:18 -func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) string { -//line templates/unattach.qtpl:18 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/unattach.qtpl:18 - WriteUnattachAskHTML(qb422016, rq, hyphaName, isOld) -//line templates/unattach.qtpl:18 - qs422016 := string(qb422016.B) -//line templates/unattach.qtpl:18 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/unattach.qtpl:18 - return qs422016 -//line templates/unattach.qtpl:18 -} - -//line templates/unattach.qtpl:20 -func streamcannotUnattachDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) { -//line templates/unattach.qtpl:20 - qw422016.N().S(` - <section> - <h1>Cannot unattach `) -//line templates/unattach.qtpl:22 - qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:22 - qw422016.N().S(`</h1> - <p>This hypha does not exist.</p> - <p><a href="/page/`) -//line templates/unattach.qtpl:24 - qw422016.E().S(hyphaName) -//line templates/unattach.qtpl:24 - qw422016.N().S(`">Go back</a></p> - </section> -`) -//line templates/unattach.qtpl:26 -} - -//line templates/unattach.qtpl:26 -func writecannotUnattachDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) { -//line templates/unattach.qtpl:26 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/unattach.qtpl:26 - streamcannotUnattachDueToNonExistence(qw422016, hyphaName) -//line templates/unattach.qtpl:26 - qt422016.ReleaseWriter(qw422016) -//line templates/unattach.qtpl:26 -} - -//line templates/unattach.qtpl:26 -func cannotUnattachDueToNonExistence(hyphaName string) string { -//line templates/unattach.qtpl:26 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/unattach.qtpl:26 - writecannotUnattachDueToNonExistence(qb422016, hyphaName) -//line templates/unattach.qtpl:26 - qs422016 := string(qb422016.B) -//line templates/unattach.qtpl:26 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/unattach.qtpl:26 - return qs422016 -//line templates/unattach.qtpl:26 -} diff --git a/views/unattach.qtpl b/views/unattach.qtpl new file mode 100644 index 0000000..1a6f29a --- /dev/null +++ b/views/unattach.qtpl @@ -0,0 +1,18 @@ +{% import "net/http" %} +{% import "github.com/bouncepaw/mycorrhiza/util" %} + +{% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %} +{%= NavHTML(rq, hyphaName, "unattach-ask") %} +<div class="layout"> +<main class="main-width"> + <form class="modal" action="/unattach-confirm/{%s hyphaName %}"> + <fieldset class="modal__fieldset"> + <legend class="modal__title">Unattach {%s util.BeautifulName(hyphaName) %}?</legend> + <p class="modal__confirmation-msg">Do you really want to unattach hypha <em>{%s hyphaName %}</em>?</p> + <input type="submit" value="Confirm" class="modal__action modal__submit" autofocus> + <a href="/hypha/{%s hyphaName %}" class="modal__action modal__cancel">Cancel</a> + </fieldset> + </form> +</main> +</div> +{% endfunc %} diff --git a/views/unattach.qtpl.go b/views/unattach.qtpl.go new file mode 100644 index 0000000..5a4f542 --- /dev/null +++ b/views/unattach.qtpl.go @@ -0,0 +1,91 @@ +// Code generated by qtc from "unattach.qtpl". DO NOT EDIT. +// See https://github.com/valyala/quicktemplate for details. + +//line views/unattach.qtpl:1 +package views + +//line views/unattach.qtpl:1 +import "net/http" + +//line views/unattach.qtpl:2 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/unattach.qtpl:4 +import ( + qtio422016 "io" + + qt422016 "github.com/valyala/quicktemplate" +) + +//line views/unattach.qtpl:4 +var ( + _ = qtio422016.Copy + _ = qt422016.AcquireByteBuffer +) + +//line views/unattach.qtpl:4 +func StreamUnattachAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/unattach.qtpl:4 + qw422016.N().S(` +`) +//line views/unattach.qtpl:5 + StreamNavHTML(qw422016, rq, hyphaName, "unattach-ask") +//line views/unattach.qtpl:5 + qw422016.N().S(` +<div class="layout"> +<main class="main-width"> + <form class="modal" action="/unattach-confirm/`) +//line views/unattach.qtpl:8 + qw422016.E().S(hyphaName) +//line views/unattach.qtpl:8 + qw422016.N().S(`"> + <fieldset class="modal__fieldset"> + <legend class="modal__title">Unattach `) +//line views/unattach.qtpl:10 + qw422016.E().S(util.BeautifulName(hyphaName)) +//line views/unattach.qtpl:10 + qw422016.N().S(`?</legend> + <p class="modal__confirmation-msg">Do you really want to unattach hypha <em>`) +//line views/unattach.qtpl:11 + qw422016.E().S(hyphaName) +//line views/unattach.qtpl:11 + qw422016.N().S(`</em>?</p> + <input type="submit" value="Confirm" class="modal__action modal__submit" autofocus> + <a href="/hypha/`) +//line views/unattach.qtpl:13 + qw422016.E().S(hyphaName) +//line views/unattach.qtpl:13 + qw422016.N().S(`" class="modal__action modal__cancel">Cancel</a> + </fieldset> + </form> +</main> +</div> +`) +//line views/unattach.qtpl:18 +} + +//line views/unattach.qtpl:18 +func WriteUnattachAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/unattach.qtpl:18 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/unattach.qtpl:18 + StreamUnattachAskHTML(qw422016, rq, hyphaName, isOld) +//line views/unattach.qtpl:18 + qt422016.ReleaseWriter(qw422016) +//line views/unattach.qtpl:18 +} + +//line views/unattach.qtpl:18 +func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) string { +//line views/unattach.qtpl:18 + qb422016 := qt422016.AcquireByteBuffer() +//line views/unattach.qtpl:18 + WriteUnattachAskHTML(qb422016, rq, hyphaName, isOld) +//line views/unattach.qtpl:18 + qs422016 := string(qb422016.B) +//line views/unattach.qtpl:18 + qt422016.ReleaseByteBuffer(qb422016) +//line views/unattach.qtpl:18 + return qs422016 +//line views/unattach.qtpl:18 +} From e72752a484cddc424b09356d6921b1a12057df2c Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Mon, 22 Feb 2021 23:11:37 +0500 Subject: [PATCH 38/53] Move delete and rename to the modals module --- http_mutators.go | 4 +- templates/delete.qtpl | 29 ---- templates/delete.qtpl.go | 156 ----------------- templates/rename.qtpl | 39 ----- templates/rename.qtpl.go | 160 ------------------ views/modal.qtpl | 63 +++++++ views/modal.qtpl.go | 355 +++++++++++++++++++++++++++++++++++++++ views/unattach.qtpl | 18 -- views/unattach.qtpl.go | 91 ---------- 9 files changed, 420 insertions(+), 495 deletions(-) delete mode 100644 templates/delete.qtpl delete mode 100644 templates/delete.qtpl.go delete mode 100644 templates/rename.qtpl delete mode 100644 templates/rename.qtpl.go create mode 100644 views/modal.qtpl create mode 100644 views/modal.qtpl.go delete mode 100644 views/unattach.qtpl delete mode 100644 views/unattach.qtpl.go diff --git a/http_mutators.go b/http_mutators.go index d40a16c..0cc3f56 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -71,14 +71,14 @@ var handlerDeleteAsk = factoryHandlerAsker( "delete-ask", shroom.CanDelete, "Delete %s?", - templates.DeleteAskHTML, + views.DeleteAskHTML, ) var handlerRenameAsk = factoryHandlerAsker( "rename-ask", shroom.CanRename, "Rename %s?", - templates.RenameAskHTML, + views.RenameAskHTML, ) func factoryHandlerConfirmer( diff --git a/templates/delete.qtpl b/templates/delete.qtpl deleted file mode 100644 index 57e21a3..0000000 --- a/templates/delete.qtpl +++ /dev/null @@ -1,29 +0,0 @@ -{% import "net/http" %} - -This dialog is to be shown to a user when they try to delete a hypha. -{% func DeleteAskHTML(rq *http.Request, hyphaName string, isOld bool) %} -{%= navHTML(rq, hyphaName, "delete-ask") %} -<div class="layout"> -<main class="main-width"> -{% if isOld %} - <section> - <h1>Delete {%s hyphaName %}?</h1> - <p>Do you really want to delete hypha <em>{%s hyphaName %}</em>?</p> - <p>In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.</p> - <p><a href="/delete-confirm/{%s hyphaName %}"><strong>Confirm</strong></a></p> - <p><a href="/page/{%s hyphaName %}">Cancel</a></p> - </section> -{% else %} - {%= cannotDeleteDueToNonExistence(hyphaName) %} -{% endif %} -</main> -</div> -{% endfunc %} - -{% func cannotDeleteDueToNonExistence(hyphaName string) %} - <section> - <h1>Cannot delete {%s hyphaName %}</h1> - <p>This hypha does not exist.</p> - <p><a href="/page/{%s hyphaName %}">Go back</a></p> - </section> -{% endfunc %} diff --git a/templates/delete.qtpl.go b/templates/delete.qtpl.go deleted file mode 100644 index 3609ec1..0000000 --- a/templates/delete.qtpl.go +++ /dev/null @@ -1,156 +0,0 @@ -// Code generated by qtc from "delete.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line templates/delete.qtpl:1 -package templates - -//line templates/delete.qtpl:1 -import "net/http" - -// This dialog is to be shown to a user when they try to delete a hypha. - -//line templates/delete.qtpl:4 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line templates/delete.qtpl:4 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line templates/delete.qtpl:4 -func StreamDeleteAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/delete.qtpl:4 - qw422016.N().S(` -`) -//line templates/delete.qtpl:5 - streamnavHTML(qw422016, rq, hyphaName, "delete-ask") -//line templates/delete.qtpl:5 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> -`) -//line templates/delete.qtpl:8 - if isOld { -//line templates/delete.qtpl:8 - qw422016.N().S(` - <section> - <h1>Delete `) -//line templates/delete.qtpl:10 - qw422016.E().S(hyphaName) -//line templates/delete.qtpl:10 - qw422016.N().S(`?</h1> - <p>Do you really want to delete hypha <em>`) -//line templates/delete.qtpl:11 - qw422016.E().S(hyphaName) -//line templates/delete.qtpl:11 - qw422016.N().S(`</em>?</p> - <p>In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.</p> - <p><a href="/delete-confirm/`) -//line templates/delete.qtpl:13 - qw422016.E().S(hyphaName) -//line templates/delete.qtpl:13 - qw422016.N().S(`"><strong>Confirm</strong></a></p> - <p><a href="/page/`) -//line templates/delete.qtpl:14 - qw422016.E().S(hyphaName) -//line templates/delete.qtpl:14 - qw422016.N().S(`">Cancel</a></p> - </section> -`) -//line templates/delete.qtpl:16 - } else { -//line templates/delete.qtpl:16 - qw422016.N().S(` - `) -//line templates/delete.qtpl:17 - streamcannotDeleteDueToNonExistence(qw422016, hyphaName) -//line templates/delete.qtpl:17 - qw422016.N().S(` -`) -//line templates/delete.qtpl:18 - } -//line templates/delete.qtpl:18 - qw422016.N().S(` -</main> -</div> -`) -//line templates/delete.qtpl:21 -} - -//line templates/delete.qtpl:21 -func WriteDeleteAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/delete.qtpl:21 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/delete.qtpl:21 - StreamDeleteAskHTML(qw422016, rq, hyphaName, isOld) -//line templates/delete.qtpl:21 - qt422016.ReleaseWriter(qw422016) -//line templates/delete.qtpl:21 -} - -//line templates/delete.qtpl:21 -func DeleteAskHTML(rq *http.Request, hyphaName string, isOld bool) string { -//line templates/delete.qtpl:21 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/delete.qtpl:21 - WriteDeleteAskHTML(qb422016, rq, hyphaName, isOld) -//line templates/delete.qtpl:21 - qs422016 := string(qb422016.B) -//line templates/delete.qtpl:21 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/delete.qtpl:21 - return qs422016 -//line templates/delete.qtpl:21 -} - -//line templates/delete.qtpl:23 -func streamcannotDeleteDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) { -//line templates/delete.qtpl:23 - qw422016.N().S(` - <section> - <h1>Cannot delete `) -//line templates/delete.qtpl:25 - qw422016.E().S(hyphaName) -//line templates/delete.qtpl:25 - qw422016.N().S(`</h1> - <p>This hypha does not exist.</p> - <p><a href="/page/`) -//line templates/delete.qtpl:27 - qw422016.E().S(hyphaName) -//line templates/delete.qtpl:27 - qw422016.N().S(`">Go back</a></p> - </section> -`) -//line templates/delete.qtpl:29 -} - -//line templates/delete.qtpl:29 -func writecannotDeleteDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) { -//line templates/delete.qtpl:29 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/delete.qtpl:29 - streamcannotDeleteDueToNonExistence(qw422016, hyphaName) -//line templates/delete.qtpl:29 - qt422016.ReleaseWriter(qw422016) -//line templates/delete.qtpl:29 -} - -//line templates/delete.qtpl:29 -func cannotDeleteDueToNonExistence(hyphaName string) string { -//line templates/delete.qtpl:29 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/delete.qtpl:29 - writecannotDeleteDueToNonExistence(qb422016, hyphaName) -//line templates/delete.qtpl:29 - qs422016 := string(qb422016.B) -//line templates/delete.qtpl:29 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/delete.qtpl:29 - return qs422016 -//line templates/delete.qtpl:29 -} diff --git a/templates/rename.qtpl b/templates/rename.qtpl deleted file mode 100644 index 8f35d55..0000000 --- a/templates/rename.qtpl +++ /dev/null @@ -1,39 +0,0 @@ -{% import "net/http" %} -This dialog is to be shown to a user when they try to rename a hypha. -{% func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) %} -{%= navHTML(rq, hyphaName, "rename-ask") %} -<div class="layout"> -<main class="main-width"> -{%- if isOld -%} - <section> - <h1>Rename {%s hyphaName %}</h1> - <form action="/rename-confirm/{%s hyphaName %}" method="post" enctype="multipart/form-data"> - <fieldset> - <legend>New name</legend> - <input type="text" value="{%s hyphaName %}" required autofocus id="new-name" name="new-name"/> - </fieldset> - - <fieldset> - <legend>Settings</legend> - <input type="checkbox" id="recursive" name="recursive" value="true" checked/> - <label for="recursive">Keep subhyphae</label> - </fieldset> - - <p>If you rename this hypha, all incoming links and all relative outcoming links will break. You will also lose all history for the new name. Rename carefully.</p> - <input type="submit"/> - </form> - </section> -{%- else -%} - {%= cannotRenameDueToNonExistence(hyphaName) %} -{%- endif -%} -</main> -</div> -{% endfunc %} - -{% func cannotRenameDueToNonExistence(hyphaName string) %} - <section> - <h1>Cannot rename {%s hyphaName %}</h1> - <p>This hypha does not exist.</p> - <p><a href="/page/{%s hyphaName %}">Go back</a></p> - </section> -{% endfunc %} diff --git a/templates/rename.qtpl.go b/templates/rename.qtpl.go deleted file mode 100644 index 973c5f7..0000000 --- a/templates/rename.qtpl.go +++ /dev/null @@ -1,160 +0,0 @@ -// Code generated by qtc from "rename.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line templates/rename.qtpl:1 -package templates - -//line templates/rename.qtpl:1 -import "net/http" - -// This dialog is to be shown to a user when they try to rename a hypha. - -//line templates/rename.qtpl:3 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line templates/rename.qtpl:3 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line templates/rename.qtpl:3 -func StreamRenameAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/rename.qtpl:3 - qw422016.N().S(` -`) -//line templates/rename.qtpl:4 - streamnavHTML(qw422016, rq, hyphaName, "rename-ask") -//line templates/rename.qtpl:4 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> -`) -//line templates/rename.qtpl:7 - if isOld { -//line templates/rename.qtpl:7 - qw422016.N().S(` <section> - <h1>Rename `) -//line templates/rename.qtpl:9 - qw422016.E().S(hyphaName) -//line templates/rename.qtpl:9 - qw422016.N().S(`</h1> - <form action="/rename-confirm/`) -//line templates/rename.qtpl:10 - qw422016.E().S(hyphaName) -//line templates/rename.qtpl:10 - qw422016.N().S(`" method="post" enctype="multipart/form-data"> - <fieldset> - <legend>New name</legend> - <input type="text" value="`) -//line templates/rename.qtpl:13 - qw422016.E().S(hyphaName) -//line templates/rename.qtpl:13 - qw422016.N().S(`" required autofocus id="new-name" name="new-name"/> - </fieldset> - - <fieldset> - <legend>Settings</legend> - <input type="checkbox" id="recursive" name="recursive" value="true" checked/> - <label for="recursive">Keep subhyphae</label> - </fieldset> - - <p>If you rename this hypha, all incoming links and all relative outcoming links will break. You will also lose all history for the new name. Rename carefully.</p> - <input type="submit"/> - </form> - </section> -`) -//line templates/rename.qtpl:26 - } else { -//line templates/rename.qtpl:26 - qw422016.N().S(` `) -//line templates/rename.qtpl:27 - streamcannotRenameDueToNonExistence(qw422016, hyphaName) -//line templates/rename.qtpl:27 - qw422016.N().S(` -`) -//line templates/rename.qtpl:28 - } -//line templates/rename.qtpl:28 - qw422016.N().S(`</main> -</div> -`) -//line templates/rename.qtpl:31 -} - -//line templates/rename.qtpl:31 -func WriteRenameAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line templates/rename.qtpl:31 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/rename.qtpl:31 - StreamRenameAskHTML(qw422016, rq, hyphaName, isOld) -//line templates/rename.qtpl:31 - qt422016.ReleaseWriter(qw422016) -//line templates/rename.qtpl:31 -} - -//line templates/rename.qtpl:31 -func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) string { -//line templates/rename.qtpl:31 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/rename.qtpl:31 - WriteRenameAskHTML(qb422016, rq, hyphaName, isOld) -//line templates/rename.qtpl:31 - qs422016 := string(qb422016.B) -//line templates/rename.qtpl:31 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/rename.qtpl:31 - return qs422016 -//line templates/rename.qtpl:31 -} - -//line templates/rename.qtpl:33 -func streamcannotRenameDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) { -//line templates/rename.qtpl:33 - qw422016.N().S(` - <section> - <h1>Cannot rename `) -//line templates/rename.qtpl:35 - qw422016.E().S(hyphaName) -//line templates/rename.qtpl:35 - qw422016.N().S(`</h1> - <p>This hypha does not exist.</p> - <p><a href="/page/`) -//line templates/rename.qtpl:37 - qw422016.E().S(hyphaName) -//line templates/rename.qtpl:37 - qw422016.N().S(`">Go back</a></p> - </section> -`) -//line templates/rename.qtpl:39 -} - -//line templates/rename.qtpl:39 -func writecannotRenameDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) { -//line templates/rename.qtpl:39 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/rename.qtpl:39 - streamcannotRenameDueToNonExistence(qw422016, hyphaName) -//line templates/rename.qtpl:39 - qt422016.ReleaseWriter(qw422016) -//line templates/rename.qtpl:39 -} - -//line templates/rename.qtpl:39 -func cannotRenameDueToNonExistence(hyphaName string) string { -//line templates/rename.qtpl:39 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/rename.qtpl:39 - writecannotRenameDueToNonExistence(qb422016, hyphaName) -//line templates/rename.qtpl:39 - qs422016 := string(qb422016.B) -//line templates/rename.qtpl:39 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/rename.qtpl:39 - return qs422016 -//line templates/rename.qtpl:39 -} diff --git a/views/modal.qtpl b/views/modal.qtpl new file mode 100644 index 0000000..8ca4ec6 --- /dev/null +++ b/views/modal.qtpl @@ -0,0 +1,63 @@ +{% import "net/http" %} +{% import "github.com/bouncepaw/mycorrhiza/util" %} + +{% func DeleteAskHTML(rq *http.Request, hyphaName string, isOld bool) %} +{%= NavHTML(rq, hyphaName, "delete-ask") %} +{%= modalBegin( + "delete-confirm", + hyphaName, + "", + "Delete "+util.BeautifulName(hyphaName)+"?") %} +{%= modalReallyWant(hyphaName, "unattach") %} + <p>In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.</p> +{%= modalEnd(hyphaName, true) %} +{% endfunc %} + +{% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %} +{%= NavHTML(rq, hyphaName, "unattach-ask") %} +{%= modalBegin( + "unattach-confirm", + hyphaName, + "", + "Unattach "+util.BeautifulName(hyphaName)+"?") %} +{%= modalReallyWant(hyphaName, "unattach") %} +{%= modalEnd(hyphaName, true) %} +{% endfunc %} + +{% func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) %} +{%= NavHTML(rq, hyphaName, "rename-ask") %} +{%= modalBegin( + "rename-confirm", + hyphaName, + ` method="post" enctype="multipart/form-data"`, + "Rename "+util.BeautifulName(hyphaName)) %} + <label for="new-name">New name</label> + <input type="text" value="{%s hyphaName %}" required autofocus id="new-name" name="new-name"/> + + <input type="checkbox" id="recursive" name="recursive" value="true" checked/> + <label for="recursive">Rename subhyphae too</label> + + <p>If you rename this hypha, all incoming links and all relative outcoming links will break. You will also lose all history for the new name. Rename carefully.</p> +{%= modalEnd(hyphaName, false) %} +{% endfunc %} + +{% func modalReallyWant(hyphaName, verb string) %} + <p class="modal__confirmation-msg">Do you really want to {%s verb %} hypha <em>{%s hyphaName %}</em>?</p> +{% endfunc %} + +{% func modalBegin(path, hyphaName, formAttrs, legend string) %} +<div class="layout"> +<main class="main-width"> + <form class="modal" action="/{%s path %}/{%s hyphaName %}"{%s= formAttrs %}> + <fieldset class="modal__fieldset"> + <legend class="modal__title">{%s= legend %}</legend> +{% endfunc %} + +{% func modalEnd(hyphaName string, shouldFocusOnConfirm bool) %} + <input type="submit" value="Confirm" class="modal__action modal__submit" {% if shouldFocusOnConfirm %}autofocus{% endif %}> + <a href="/hypha/{%s hyphaName %}" class="modal__action modal__cancel">Cancel</a> + </fieldset> + </form> +</main> +</div> +{% endfunc %} diff --git a/views/modal.qtpl.go b/views/modal.qtpl.go new file mode 100644 index 0000000..9e81e54 --- /dev/null +++ b/views/modal.qtpl.go @@ -0,0 +1,355 @@ +// Code generated by qtc from "modal.qtpl". DO NOT EDIT. +// See https://github.com/valyala/quicktemplate for details. + +//line views/modal.qtpl:1 +package views + +//line views/modal.qtpl:1 +import "net/http" + +//line views/modal.qtpl:2 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/modal.qtpl:4 +import ( + qtio422016 "io" + + qt422016 "github.com/valyala/quicktemplate" +) + +//line views/modal.qtpl:4 +var ( + _ = qtio422016.Copy + _ = qt422016.AcquireByteBuffer +) + +//line views/modal.qtpl:4 +func StreamDeleteAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/modal.qtpl:4 + qw422016.N().S(` +`) +//line views/modal.qtpl:5 + StreamNavHTML(qw422016, rq, hyphaName, "delete-ask") +//line views/modal.qtpl:5 + qw422016.N().S(` +`) +//line views/modal.qtpl:6 + streammodalBegin(qw422016, + "delete-confirm", + hyphaName, + "", + "Delete "+util.BeautifulName(hyphaName)+"?") +//line views/modal.qtpl:10 + qw422016.N().S(` +`) +//line views/modal.qtpl:11 + streammodalReallyWant(qw422016, hyphaName, "unattach") +//line views/modal.qtpl:11 + qw422016.N().S(` + <p>In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.</p> +`) +//line views/modal.qtpl:13 + streammodalEnd(qw422016, hyphaName, true) +//line views/modal.qtpl:13 + qw422016.N().S(` +`) +//line views/modal.qtpl:14 +} + +//line views/modal.qtpl:14 +func WriteDeleteAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/modal.qtpl:14 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/modal.qtpl:14 + StreamDeleteAskHTML(qw422016, rq, hyphaName, isOld) +//line views/modal.qtpl:14 + qt422016.ReleaseWriter(qw422016) +//line views/modal.qtpl:14 +} + +//line views/modal.qtpl:14 +func DeleteAskHTML(rq *http.Request, hyphaName string, isOld bool) string { +//line views/modal.qtpl:14 + qb422016 := qt422016.AcquireByteBuffer() +//line views/modal.qtpl:14 + WriteDeleteAskHTML(qb422016, rq, hyphaName, isOld) +//line views/modal.qtpl:14 + qs422016 := string(qb422016.B) +//line views/modal.qtpl:14 + qt422016.ReleaseByteBuffer(qb422016) +//line views/modal.qtpl:14 + return qs422016 +//line views/modal.qtpl:14 +} + +//line views/modal.qtpl:16 +func StreamUnattachAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/modal.qtpl:16 + qw422016.N().S(` +`) +//line views/modal.qtpl:17 + StreamNavHTML(qw422016, rq, hyphaName, "unattach-ask") +//line views/modal.qtpl:17 + qw422016.N().S(` +`) +//line views/modal.qtpl:18 + streammodalBegin(qw422016, + "unattach-confirm", + hyphaName, + "", + "Unattach "+util.BeautifulName(hyphaName)+"?") +//line views/modal.qtpl:22 + qw422016.N().S(` +`) +//line views/modal.qtpl:23 + streammodalReallyWant(qw422016, hyphaName, "unattach") +//line views/modal.qtpl:23 + qw422016.N().S(` +`) +//line views/modal.qtpl:24 + streammodalEnd(qw422016, hyphaName, true) +//line views/modal.qtpl:24 + qw422016.N().S(` +`) +//line views/modal.qtpl:25 +} + +//line views/modal.qtpl:25 +func WriteUnattachAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/modal.qtpl:25 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/modal.qtpl:25 + StreamUnattachAskHTML(qw422016, rq, hyphaName, isOld) +//line views/modal.qtpl:25 + qt422016.ReleaseWriter(qw422016) +//line views/modal.qtpl:25 +} + +//line views/modal.qtpl:25 +func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) string { +//line views/modal.qtpl:25 + qb422016 := qt422016.AcquireByteBuffer() +//line views/modal.qtpl:25 + WriteUnattachAskHTML(qb422016, rq, hyphaName, isOld) +//line views/modal.qtpl:25 + qs422016 := string(qb422016.B) +//line views/modal.qtpl:25 + qt422016.ReleaseByteBuffer(qb422016) +//line views/modal.qtpl:25 + return qs422016 +//line views/modal.qtpl:25 +} + +//line views/modal.qtpl:27 +func StreamRenameAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/modal.qtpl:27 + qw422016.N().S(` +`) +//line views/modal.qtpl:28 + StreamNavHTML(qw422016, rq, hyphaName, "rename-ask") +//line views/modal.qtpl:28 + qw422016.N().S(` +`) +//line views/modal.qtpl:29 + streammodalBegin(qw422016, + "rename-confirm", + hyphaName, + ` method="post" enctype="multipart/form-data"`, + "Rename "+util.BeautifulName(hyphaName)) +//line views/modal.qtpl:33 + qw422016.N().S(` + <label for="new-name">New name</label> + <input type="text" value="`) +//line views/modal.qtpl:35 + qw422016.E().S(hyphaName) +//line views/modal.qtpl:35 + qw422016.N().S(`" required autofocus id="new-name" name="new-name"/> + + <input type="checkbox" id="recursive" name="recursive" value="true" checked/> + <label for="recursive">Rename subhyphae too</label> + + <p>If you rename this hypha, all incoming links and all relative outcoming links will break. You will also lose all history for the new name. Rename carefully.</p> +`) +//line views/modal.qtpl:41 + streammodalEnd(qw422016, hyphaName, false) +//line views/modal.qtpl:41 + qw422016.N().S(` +`) +//line views/modal.qtpl:42 +} + +//line views/modal.qtpl:42 +func WriteRenameAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { +//line views/modal.qtpl:42 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/modal.qtpl:42 + StreamRenameAskHTML(qw422016, rq, hyphaName, isOld) +//line views/modal.qtpl:42 + qt422016.ReleaseWriter(qw422016) +//line views/modal.qtpl:42 +} + +//line views/modal.qtpl:42 +func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) string { +//line views/modal.qtpl:42 + qb422016 := qt422016.AcquireByteBuffer() +//line views/modal.qtpl:42 + WriteRenameAskHTML(qb422016, rq, hyphaName, isOld) +//line views/modal.qtpl:42 + qs422016 := string(qb422016.B) +//line views/modal.qtpl:42 + qt422016.ReleaseByteBuffer(qb422016) +//line views/modal.qtpl:42 + return qs422016 +//line views/modal.qtpl:42 +} + +//line views/modal.qtpl:44 +func streammodalReallyWant(qw422016 *qt422016.Writer, hyphaName, verb string) { +//line views/modal.qtpl:44 + qw422016.N().S(` + <p class="modal__confirmation-msg">Do you really want to `) +//line views/modal.qtpl:45 + qw422016.E().S(verb) +//line views/modal.qtpl:45 + qw422016.N().S(` hypha <em>`) +//line views/modal.qtpl:45 + qw422016.E().S(hyphaName) +//line views/modal.qtpl:45 + qw422016.N().S(`</em>?</p> +`) +//line views/modal.qtpl:46 +} + +//line views/modal.qtpl:46 +func writemodalReallyWant(qq422016 qtio422016.Writer, hyphaName, verb string) { +//line views/modal.qtpl:46 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/modal.qtpl:46 + streammodalReallyWant(qw422016, hyphaName, verb) +//line views/modal.qtpl:46 + qt422016.ReleaseWriter(qw422016) +//line views/modal.qtpl:46 +} + +//line views/modal.qtpl:46 +func modalReallyWant(hyphaName, verb string) string { +//line views/modal.qtpl:46 + qb422016 := qt422016.AcquireByteBuffer() +//line views/modal.qtpl:46 + writemodalReallyWant(qb422016, hyphaName, verb) +//line views/modal.qtpl:46 + qs422016 := string(qb422016.B) +//line views/modal.qtpl:46 + qt422016.ReleaseByteBuffer(qb422016) +//line views/modal.qtpl:46 + return qs422016 +//line views/modal.qtpl:46 +} + +//line views/modal.qtpl:48 +func streammodalBegin(qw422016 *qt422016.Writer, path, hyphaName, formAttrs, legend string) { +//line views/modal.qtpl:48 + qw422016.N().S(` +<div class="layout"> +<main class="main-width"> + <form class="modal" action="/`) +//line views/modal.qtpl:51 + qw422016.E().S(path) +//line views/modal.qtpl:51 + qw422016.N().S(`/`) +//line views/modal.qtpl:51 + qw422016.E().S(hyphaName) +//line views/modal.qtpl:51 + qw422016.N().S(`"`) +//line views/modal.qtpl:51 + qw422016.N().S(formAttrs) +//line views/modal.qtpl:51 + qw422016.N().S(`> + <fieldset class="modal__fieldset"> + <legend class="modal__title">`) +//line views/modal.qtpl:53 + qw422016.N().S(legend) +//line views/modal.qtpl:53 + qw422016.N().S(`</legend> +`) +//line views/modal.qtpl:54 +} + +//line views/modal.qtpl:54 +func writemodalBegin(qq422016 qtio422016.Writer, path, hyphaName, formAttrs, legend string) { +//line views/modal.qtpl:54 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/modal.qtpl:54 + streammodalBegin(qw422016, path, hyphaName, formAttrs, legend) +//line views/modal.qtpl:54 + qt422016.ReleaseWriter(qw422016) +//line views/modal.qtpl:54 +} + +//line views/modal.qtpl:54 +func modalBegin(path, hyphaName, formAttrs, legend string) string { +//line views/modal.qtpl:54 + qb422016 := qt422016.AcquireByteBuffer() +//line views/modal.qtpl:54 + writemodalBegin(qb422016, path, hyphaName, formAttrs, legend) +//line views/modal.qtpl:54 + qs422016 := string(qb422016.B) +//line views/modal.qtpl:54 + qt422016.ReleaseByteBuffer(qb422016) +//line views/modal.qtpl:54 + return qs422016 +//line views/modal.qtpl:54 +} + +//line views/modal.qtpl:56 +func streammodalEnd(qw422016 *qt422016.Writer, hyphaName string, shouldFocusOnConfirm bool) { +//line views/modal.qtpl:56 + qw422016.N().S(` + <input type="submit" value="Confirm" class="modal__action modal__submit" `) +//line views/modal.qtpl:57 + if shouldFocusOnConfirm { +//line views/modal.qtpl:57 + qw422016.N().S(`autofocus`) +//line views/modal.qtpl:57 + } +//line views/modal.qtpl:57 + qw422016.N().S(`> + <a href="/hypha/`) +//line views/modal.qtpl:58 + qw422016.E().S(hyphaName) +//line views/modal.qtpl:58 + qw422016.N().S(`" class="modal__action modal__cancel">Cancel</a> + </fieldset> + </form> +</main> +</div> +`) +//line views/modal.qtpl:63 +} + +//line views/modal.qtpl:63 +func writemodalEnd(qq422016 qtio422016.Writer, hyphaName string, shouldFocusOnConfirm bool) { +//line views/modal.qtpl:63 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/modal.qtpl:63 + streammodalEnd(qw422016, hyphaName, shouldFocusOnConfirm) +//line views/modal.qtpl:63 + qt422016.ReleaseWriter(qw422016) +//line views/modal.qtpl:63 +} + +//line views/modal.qtpl:63 +func modalEnd(hyphaName string, shouldFocusOnConfirm bool) string { +//line views/modal.qtpl:63 + qb422016 := qt422016.AcquireByteBuffer() +//line views/modal.qtpl:63 + writemodalEnd(qb422016, hyphaName, shouldFocusOnConfirm) +//line views/modal.qtpl:63 + qs422016 := string(qb422016.B) +//line views/modal.qtpl:63 + qt422016.ReleaseByteBuffer(qb422016) +//line views/modal.qtpl:63 + return qs422016 +//line views/modal.qtpl:63 +} diff --git a/views/unattach.qtpl b/views/unattach.qtpl deleted file mode 100644 index 1a6f29a..0000000 --- a/views/unattach.qtpl +++ /dev/null @@ -1,18 +0,0 @@ -{% import "net/http" %} -{% import "github.com/bouncepaw/mycorrhiza/util" %} - -{% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %} -{%= NavHTML(rq, hyphaName, "unattach-ask") %} -<div class="layout"> -<main class="main-width"> - <form class="modal" action="/unattach-confirm/{%s hyphaName %}"> - <fieldset class="modal__fieldset"> - <legend class="modal__title">Unattach {%s util.BeautifulName(hyphaName) %}?</legend> - <p class="modal__confirmation-msg">Do you really want to unattach hypha <em>{%s hyphaName %}</em>?</p> - <input type="submit" value="Confirm" class="modal__action modal__submit" autofocus> - <a href="/hypha/{%s hyphaName %}" class="modal__action modal__cancel">Cancel</a> - </fieldset> - </form> -</main> -</div> -{% endfunc %} diff --git a/views/unattach.qtpl.go b/views/unattach.qtpl.go deleted file mode 100644 index 5a4f542..0000000 --- a/views/unattach.qtpl.go +++ /dev/null @@ -1,91 +0,0 @@ -// Code generated by qtc from "unattach.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line views/unattach.qtpl:1 -package views - -//line views/unattach.qtpl:1 -import "net/http" - -//line views/unattach.qtpl:2 -import "github.com/bouncepaw/mycorrhiza/util" - -//line views/unattach.qtpl:4 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line views/unattach.qtpl:4 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line views/unattach.qtpl:4 -func StreamUnattachAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line views/unattach.qtpl:4 - qw422016.N().S(` -`) -//line views/unattach.qtpl:5 - StreamNavHTML(qw422016, rq, hyphaName, "unattach-ask") -//line views/unattach.qtpl:5 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> - <form class="modal" action="/unattach-confirm/`) -//line views/unattach.qtpl:8 - qw422016.E().S(hyphaName) -//line views/unattach.qtpl:8 - qw422016.N().S(`"> - <fieldset class="modal__fieldset"> - <legend class="modal__title">Unattach `) -//line views/unattach.qtpl:10 - qw422016.E().S(util.BeautifulName(hyphaName)) -//line views/unattach.qtpl:10 - qw422016.N().S(`?</legend> - <p class="modal__confirmation-msg">Do you really want to unattach hypha <em>`) -//line views/unattach.qtpl:11 - qw422016.E().S(hyphaName) -//line views/unattach.qtpl:11 - qw422016.N().S(`</em>?</p> - <input type="submit" value="Confirm" class="modal__action modal__submit" autofocus> - <a href="/hypha/`) -//line views/unattach.qtpl:13 - qw422016.E().S(hyphaName) -//line views/unattach.qtpl:13 - qw422016.N().S(`" class="modal__action modal__cancel">Cancel</a> - </fieldset> - </form> -</main> -</div> -`) -//line views/unattach.qtpl:18 -} - -//line views/unattach.qtpl:18 -func WriteUnattachAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) { -//line views/unattach.qtpl:18 - qw422016 := qt422016.AcquireWriter(qq422016) -//line views/unattach.qtpl:18 - StreamUnattachAskHTML(qw422016, rq, hyphaName, isOld) -//line views/unattach.qtpl:18 - qt422016.ReleaseWriter(qw422016) -//line views/unattach.qtpl:18 -} - -//line views/unattach.qtpl:18 -func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) string { -//line views/unattach.qtpl:18 - qb422016 := qt422016.AcquireByteBuffer() -//line views/unattach.qtpl:18 - WriteUnattachAskHTML(qb422016, rq, hyphaName, isOld) -//line views/unattach.qtpl:18 - qs422016 := string(qb422016.B) -//line views/unattach.qtpl:18 - qt422016.ReleaseByteBuffer(qb422016) -//line views/unattach.qtpl:18 - return qs422016 -//line views/unattach.qtpl:18 -} From ecbd23b3a5066dea3bfd75c4a87996dcddd7eef9 Mon Sep 17 00:00:00 2001 From: bouncepaw <bouncepaw2@ya.ru> Date: Mon, 22 Feb 2021 23:19:28 +0500 Subject: [PATCH 39/53] Move stuff.qtpl and admin.qtpl to views/stuff.qtpl --- http_admin.go | 4 +- http_readers.go | 3 +- main.go | 11 +- templates/admin.qtpl | 30 --- templates/admin.qtpl.go | 80 ------ {templates => views}/stuff.qtpl | 34 ++- {templates => views}/stuff.qtpl.go | 409 +++++++++++++++++------------ 7 files changed, 278 insertions(+), 293 deletions(-) delete mode 100644 templates/admin.qtpl delete mode 100644 templates/admin.qtpl.go rename {templates => views}/stuff.qtpl (80%) rename {templates => views}/stuff.qtpl.go (52%) diff --git a/http_admin.go b/http_admin.go index cd3675d..2b20fb5 100644 --- a/http_admin.go +++ b/http_admin.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" + "github.com/bouncepaw/mycorrhiza/views" ) // This is not init(), because user.AuthUsed is not set at init-stage. @@ -21,7 +21,7 @@ func handlerAdmin(w http.ResponseWriter, rq *http.Request) { if user.CanProceed(rq, "admin") { w.Header().Set("Content-Type", "text/html;charset=utf-8") w.WriteHeader(http.StatusOK) - w.Write([]byte(base("Admin panel", templates.AdminPanelHTML(), user.FromRequest(rq)))) + w.Write([]byte(base("Admin panel", views.AdminPanelHTML(), user.FromRequest(rq)))) } } diff --git a/http_readers.go b/http_readers.go index 119704b..b7711c6 100644 --- a/http_readers.go +++ b/http_readers.go @@ -13,7 +13,6 @@ import ( "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/mimetype" - "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" "github.com/bouncepaw/mycorrhiza/views" @@ -99,7 +98,7 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { } } util.HTTP200Page(w, - templates.BaseHTML( + views.BaseHTML( util.BeautifulName(hyphaName), views.HyphaHTML(rq, h, contents), u, diff --git a/main.go b/main.go index e36233d..88c9d1a 100644 --- a/main.go +++ b/main.go @@ -20,6 +20,7 @@ import ( "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" + "github.com/bouncepaw/mycorrhiza/views" ) // WikiDir is a rooted path to the wiki storage directory. @@ -53,13 +54,13 @@ func handlerList(w http.ResponseWriter, rq *http.Request) { u = user.FromRequest(rq) ) for h := range hyphae.YieldExistingHyphae() { - tbody += templates.HyphaListRowHTML(h.Name, mimetype.FromExtension(filepath.Ext(h.BinaryPath)), h.BinaryPath != "") + tbody += views.HyphaListRowHTML(h.Name, mimetype.FromExtension(filepath.Ext(h.BinaryPath)), h.BinaryPath != "") } - util.HTTP200Page(w, base("List of pages", templates.HyphaListHTML(tbody, pageCount), u)) + util.HTTP200Page(w, base("List of pages", views.HyphaListHTML(tbody, pageCount), u)) } // This part is present in all html documents. -var base = templates.BaseHTML +var base = views.BaseHTML // Reindex all hyphae by checking the wiki storage directory anew. func handlerReindex(w http.ResponseWriter, rq *http.Request) { @@ -148,13 +149,13 @@ func handlerIcon(w http.ResponseWriter, rq *http.Request) { func handlerAbout(w http.ResponseWriter, rq *http.Request) { w.Header().Set("Content-Type", "text/html;charset=utf-8") w.WriteHeader(http.StatusOK) - w.Write([]byte(base("About "+util.SiteName, templates.AboutHTML(), user.FromRequest(rq)))) + w.Write([]byte(base("About "+util.SiteName, views.AboutHTML(), user.FromRequest(rq)))) } func handlerUserList(w http.ResponseWriter, rq *http.Request) { w.Header().Set("Content-Type", "text/html;charset=utf-8") w.WriteHeader(http.StatusOK) - w.Write([]byte(base("User list", templates.UserListHTML(), user.FromRequest(rq)))) + w.Write([]byte(base("User list", views.UserListHTML(), user.FromRequest(rq)))) } func handlerRobotsTxt(w http.ResponseWriter, rq *http.Request) { diff --git a/templates/admin.qtpl b/templates/admin.qtpl deleted file mode 100644 index 8932da7..0000000 --- a/templates/admin.qtpl +++ /dev/null @@ -1,30 +0,0 @@ -{% func AdminPanelHTML() %} -<div class="layout"> -<main class="main-width"> - <h1>Admininstrative functions</h1> - <section> - <h2>Safe things</h2> - <ul> - <li><a href="/about">About this wiki<a></li> - <li><a href="/user-list">User list</a></li> - <li><a href="/update-header-links">Update header links</a></li> - </ul> - </section> - <section> - <h2>Dangerous things</h2> - <form action="/admin/shutdown" method="POST" style="float:left"> - <fieldset> - <legend>Shutdown wiki</legend> - <input type="submit"> - </fieldset> - </form> - <form action="/reindex" method="GET" style="float:left"> - <fieldset> - <legend>Reindex hyphae</legend> - <input type="submit"> - </fieldset> - </form> - </section> -</main> -</div> -{% endfunc %} diff --git a/templates/admin.qtpl.go b/templates/admin.qtpl.go deleted file mode 100644 index c017c8d..0000000 --- a/templates/admin.qtpl.go +++ /dev/null @@ -1,80 +0,0 @@ -// Code generated by qtc from "admin.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line templates/admin.qtpl:1 -package templates - -//line templates/admin.qtpl:1 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line templates/admin.qtpl:1 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line templates/admin.qtpl:1 -func StreamAdminPanelHTML(qw422016 *qt422016.Writer) { -//line templates/admin.qtpl:1 - qw422016.N().S(` -<div class="layout"> -<main class="main-width"> - <h1>Admininstrative functions</h1> - <section> - <h2>Safe things</h2> - <ul> - <li><a href="/about">About this wiki<a></li> - <li><a href="/user-list">User list</a></li> - <li><a href="/update-header-links">Update header links</a></li> - </ul> - </section> - <section> - <h2>Dangerous things</h2> - <form action="/admin/shutdown" method="POST" style="float:left"> - <fieldset> - <legend>Shutdown wiki</legend> - <input type="submit"> - </fieldset> - </form> - <form action="/reindex" method="GET" style="float:left"> - <fieldset> - <legend>Reindex hyphae</legend> - <input type="submit"> - </fieldset> - </form> - </section> -</main> -</div> -`) -//line templates/admin.qtpl:30 -} - -//line templates/admin.qtpl:30 -func WriteAdminPanelHTML(qq422016 qtio422016.Writer) { -//line templates/admin.qtpl:30 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/admin.qtpl:30 - StreamAdminPanelHTML(qw422016) -//line templates/admin.qtpl:30 - qt422016.ReleaseWriter(qw422016) -//line templates/admin.qtpl:30 -} - -//line templates/admin.qtpl:30 -func AdminPanelHTML() string { -//line templates/admin.qtpl:30 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/admin.qtpl:30 - WriteAdminPanelHTML(qb422016) -//line templates/admin.qtpl:30 - qs422016 := string(qb422016.B) -//line templates/admin.qtpl:30 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/admin.qtpl:30 - return qs422016 -//line templates/admin.qtpl:30 -} diff --git a/templates/stuff.qtpl b/views/stuff.qtpl similarity index 80% rename from templates/stuff.qtpl rename to views/stuff.qtpl index f6f95b8..fed2faa 100644 --- a/templates/stuff.qtpl +++ b/views/stuff.qtpl @@ -6,6 +6,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta charset="utf-8"> <link rel="stylesheet" type="text/css" href="/static/common.css"> <title>{%s title %} {% for _, el := range headElements %}{%s= el %}{% endfor %} @@ -17,7 +18,7 @@ {%- for _, link := range util.HeaderLinks -%}
  • {%s link.Display %}
    • {%- endfor -%} - {%s= userMenuHTML(u) %} + {%s= UserMenuHTML(u) %} @@ -123,3 +124,34 @@ for u := range user.YieldUsers() {
    {% endfunc %} + +{% func AdminPanelHTML() %} +
    +
    +

    Admininstrative functions

    +
    +

    Safe things

    + +
    +
    +

    Dangerous things

    +
    +
    + Shutdown wiki + +
    +
    +
    +
    + Reindex hyphae + +
    +
    +
    +
    +
    +{% endfunc %} diff --git a/templates/stuff.qtpl.go b/views/stuff.qtpl.go similarity index 52% rename from templates/stuff.qtpl.go rename to views/stuff.qtpl.go index d6efabd..7c63324 100644 --- a/templates/stuff.qtpl.go +++ b/views/stuff.qtpl.go @@ -1,50 +1,51 @@ // Code generated by qtc from "stuff.qtpl". DO NOT EDIT. // See https://github.com/valyala/quicktemplate for details. -//line templates/stuff.qtpl:1 -package templates +//line views/stuff.qtpl:1 +package views -//line templates/stuff.qtpl:1 +//line views/stuff.qtpl:1 import "github.com/bouncepaw/mycorrhiza/util" -//line templates/stuff.qtpl:2 +//line views/stuff.qtpl:2 import "github.com/bouncepaw/mycorrhiza/user" -//line templates/stuff.qtpl:4 +//line views/stuff.qtpl:4 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/stuff.qtpl:4 +//line views/stuff.qtpl:4 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/stuff.qtpl:4 +//line views/stuff.qtpl:4 func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, u *user.User, headElements ...string) { -//line templates/stuff.qtpl:4 +//line views/stuff.qtpl:4 qw422016.N().S(` + `) -//line templates/stuff.qtpl:10 +//line views/stuff.qtpl:11 qw422016.E().S(title) -//line templates/stuff.qtpl:10 +//line views/stuff.qtpl:11 qw422016.N().S(` `) -//line templates/stuff.qtpl:11 +//line views/stuff.qtpl:12 for _, el := range headElements { -//line templates/stuff.qtpl:11 +//line views/stuff.qtpl:12 qw422016.N().S(el) -//line templates/stuff.qtpl:11 +//line views/stuff.qtpl:12 } -//line templates/stuff.qtpl:11 +//line views/stuff.qtpl:12 qw422016.N().S(` @@ -52,76 +53,76 @@ func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, u *user.User, `) -//line templates/stuff.qtpl:24 +//line views/stuff.qtpl:25 qw422016.N().S(body) -//line templates/stuff.qtpl:24 +//line views/stuff.qtpl:25 qw422016.N().S(` `) -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 } -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, u *user.User, headElements ...string) { -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 StreamBaseHTML(qw422016, title, body, u, headElements...) -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 } -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 func BaseHTML(title, body string, u *user.User, headElements ...string) string { -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 WriteBaseHTML(qb422016, title, body, u, headElements...) -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 return qs422016 -//line templates/stuff.qtpl:27 +//line views/stuff.qtpl:28 } -//line templates/stuff.qtpl:29 +//line views/stuff.qtpl:30 func StreamUserListHTML(qw422016 *qt422016.Writer) { -//line templates/stuff.qtpl:29 +//line views/stuff.qtpl:30 qw422016.N().S(`

    List of users

    `) -//line templates/stuff.qtpl:34 +//line views/stuff.qtpl:35 var ( admins = make([]string, 0) moderators = make([]string, 0) @@ -138,129 +139,129 @@ func StreamUserListHTML(qw422016 *qt422016.Writer) { } } -//line templates/stuff.qtpl:49 +//line views/stuff.qtpl:50 qw422016.N().S(`

    Admins

      `) -//line templates/stuff.qtpl:52 +//line views/stuff.qtpl:53 for _, name := range admins { -//line templates/stuff.qtpl:52 +//line views/stuff.qtpl:53 qw422016.N().S(`
    1. `) -//line templates/stuff.qtpl:53 +//line views/stuff.qtpl:54 qw422016.E().S(name) -//line templates/stuff.qtpl:53 +//line views/stuff.qtpl:54 qw422016.N().S(`
      2. `) -//line templates/stuff.qtpl:54 +//line views/stuff.qtpl:55 } -//line templates/stuff.qtpl:54 +//line views/stuff.qtpl:55 qw422016.N().S(`

    Moderators

      `) -//line templates/stuff.qtpl:58 +//line views/stuff.qtpl:59 for _, name := range moderators { -//line templates/stuff.qtpl:58 +//line views/stuff.qtpl:59 qw422016.N().S(`
    1. `) -//line templates/stuff.qtpl:59 +//line views/stuff.qtpl:60 qw422016.E().S(name) -//line templates/stuff.qtpl:59 +//line views/stuff.qtpl:60 qw422016.N().S(`
      2. `) -//line templates/stuff.qtpl:60 +//line views/stuff.qtpl:61 } -//line templates/stuff.qtpl:60 +//line views/stuff.qtpl:61 qw422016.N().S(`

    Editors

      `) -//line templates/stuff.qtpl:64 +//line views/stuff.qtpl:65 for _, name := range editors { -//line templates/stuff.qtpl:64 +//line views/stuff.qtpl:65 qw422016.N().S(`
    1. `) -//line templates/stuff.qtpl:65 +//line views/stuff.qtpl:66 qw422016.E().S(name) -//line templates/stuff.qtpl:65 +//line views/stuff.qtpl:66 qw422016.N().S(`
      2. `) -//line templates/stuff.qtpl:66 +//line views/stuff.qtpl:67 } -//line templates/stuff.qtpl:66 +//line views/stuff.qtpl:67 qw422016.N().S(`
    `) -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 } -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 func WriteUserListHTML(qq422016 qtio422016.Writer) { -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 StreamUserListHTML(qw422016) -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 } -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 func UserListHTML() string { -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 WriteUserListHTML(qb422016) -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 return qs422016 -//line templates/stuff.qtpl:70 +//line views/stuff.qtpl:71 } -//line templates/stuff.qtpl:72 +//line views/stuff.qtpl:73 func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) { -//line templates/stuff.qtpl:72 +//line views/stuff.qtpl:73 qw422016.N().S(`

    List of hyphae

    This wiki has `) -//line templates/stuff.qtpl:76 +//line views/stuff.qtpl:77 qw422016.N().D(pageCount) -//line templates/stuff.qtpl:76 +//line views/stuff.qtpl:77 qw422016.N().S(` hyphae.

    @@ -271,206 +272,268 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) `) -//line templates/stuff.qtpl:85 +//line views/stuff.qtpl:86 qw422016.N().S(tbody) -//line templates/stuff.qtpl:85 +//line views/stuff.qtpl:86 qw422016.N().S(`
    `) -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 } -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) { -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 StreamHyphaListHTML(qw422016, tbody, pageCount) -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 } -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 func HyphaListHTML(tbody string, pageCount int) string { -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 WriteHyphaListHTML(qb422016, tbody, pageCount) -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 return qs422016 -//line templates/stuff.qtpl:90 +//line views/stuff.qtpl:91 } -//line templates/stuff.qtpl:92 +//line views/stuff.qtpl:93 func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line templates/stuff.qtpl:92 +//line views/stuff.qtpl:93 qw422016.N().S(` `) -//line templates/stuff.qtpl:94 +//line views/stuff.qtpl:95 qw422016.E().S(hyphaName) -//line templates/stuff.qtpl:94 +//line views/stuff.qtpl:95 qw422016.N().S(` `) -//line templates/stuff.qtpl:95 +//line views/stuff.qtpl:96 if binaryPresent { -//line templates/stuff.qtpl:95 +//line views/stuff.qtpl:96 qw422016.N().S(` `) -//line templates/stuff.qtpl:96 +//line views/stuff.qtpl:97 qw422016.E().S(binaryMime) -//line templates/stuff.qtpl:96 +//line views/stuff.qtpl:97 qw422016.N().S(` `) -//line templates/stuff.qtpl:97 +//line views/stuff.qtpl:98 } else { -//line templates/stuff.qtpl:97 +//line views/stuff.qtpl:98 qw422016.N().S(` `) -//line templates/stuff.qtpl:99 +//line views/stuff.qtpl:100 } -//line templates/stuff.qtpl:99 +//line views/stuff.qtpl:100 qw422016.N().S(` `) -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 } -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent) -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 } -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string { -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent) -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 return qs422016 -//line templates/stuff.qtpl:101 +//line views/stuff.qtpl:102 } -//line templates/stuff.qtpl:103 +//line views/stuff.qtpl:104 func StreamAboutHTML(qw422016 *qt422016.Writer) { -//line templates/stuff.qtpl:103 +//line views/stuff.qtpl:104 qw422016.N().S(`

    About `) -//line templates/stuff.qtpl:107 +//line views/stuff.qtpl:108 qw422016.E().S(util.SiteName) -//line templates/stuff.qtpl:107 +//line views/stuff.qtpl:108 qw422016.N().S(`

    See /list for information about hyphae on this wiki.

    `) -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 } -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 func WriteAboutHTML(qq422016 qtio422016.Writer) { -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 StreamAboutHTML(qw422016) -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 qt422016.ReleaseWriter(qw422016) -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 } -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 func AboutHTML() string { -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 qb422016 := qt422016.AcquireByteBuffer() -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 WriteAboutHTML(qb422016) -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 qs422016 := string(qb422016.B) -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 qt422016.ReleaseByteBuffer(qb422016) -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 return qs422016 -//line templates/stuff.qtpl:125 +//line views/stuff.qtpl:126 +} + +//line views/stuff.qtpl:128 +func StreamAdminPanelHTML(qw422016 *qt422016.Writer) { +//line views/stuff.qtpl:128 + qw422016.N().S(` +
    +
    +

    Admininstrative functions

    +
    +

    Safe things

    + +
    +
    +

    Dangerous things

    +
    +
    + Shutdown wiki + +
    +
    +
    +
    + Reindex hyphae + +
    +
    +
    +
    +
    +`) +//line views/stuff.qtpl:157 +} + +//line views/stuff.qtpl:157 +func WriteAdminPanelHTML(qq422016 qtio422016.Writer) { +//line views/stuff.qtpl:157 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/stuff.qtpl:157 + StreamAdminPanelHTML(qw422016) +//line views/stuff.qtpl:157 + qt422016.ReleaseWriter(qw422016) +//line views/stuff.qtpl:157 +} + +//line views/stuff.qtpl:157 +func AdminPanelHTML() string { +//line views/stuff.qtpl:157 + qb422016 := qt422016.AcquireByteBuffer() +//line views/stuff.qtpl:157 + WriteAdminPanelHTML(qb422016) +//line views/stuff.qtpl:157 + qs422016 := string(qb422016.B) +//line views/stuff.qtpl:157 + qt422016.ReleaseByteBuffer(qb422016) +//line views/stuff.qtpl:157 + return qs422016 +//line views/stuff.qtpl:157 } From d2cc1e70744fb9ab3c917bf804ca58195ff54cd9 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Mon, 22 Feb 2021 23:37:23 +0500 Subject: [PATCH 40/53] Redesign /list --- main.go | 12 +- templates/asset.qtpl.go | 11 +- templates/default.css | 9 +- views/stuff.qtpl | 40 ++-- views/stuff.qtpl.go | 437 ++++++++++++++++++---------------------- 5 files changed, 233 insertions(+), 276 deletions(-) diff --git a/main.go b/main.go index 88c9d1a..288ff7f 100644 --- a/main.go +++ b/main.go @@ -10,12 +10,10 @@ import ( "math/rand" "net/http" "os" - "path/filepath" "strings" "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/hyphae" - "github.com/bouncepaw/mycorrhiza/mimetype" "github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" @@ -48,15 +46,7 @@ func HttpErr(w http.ResponseWriter, status int, name, title, errMsg string) { // Show all hyphae func handlerList(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) - var ( - tbody string - pageCount = hyphae.Count() - u = user.FromRequest(rq) - ) - for h := range hyphae.YieldExistingHyphae() { - tbody += views.HyphaListRowHTML(h.Name, mimetype.FromExtension(filepath.Ext(h.BinaryPath)), h.BinaryPath != "") - } - util.HTTP200Page(w, base("List of pages", views.HyphaListHTML(tbody, pageCount), u)) + util.HTTP200Page(w, base("List of pages", views.HyphaListHTML(), user.FromRequest(rq))) } // This part is present in all html documents. diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index 7125101..7e951aa 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -23,12 +23,19 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) { qw422016.N().S(` `) //line templates/asset.qtpl:2 - qw422016.N().S(`/* General element positions, from small to big */ -.modal__title { font-size: 2rem; } + qw422016.N().S(`.modal__title { font-size: 2rem; } .modal__confirmation-msg { margin: 0 0 .5rem 0; } .modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } .modal__submit { border: 1px #999 solid; } .modal__cancel { border: 1px #999 dashed; text-decoration: none; } + +.hypha-list { padding-left: 0; } +.hypha-list__entry { list-style-type: none; } +.hypha-list__link { text-decoration: none; display: inline-block; padding: .25rem; } +.hypha-list__link:hover { text-decoration: underline; } +.hypha-list__amnt-type { font-size: smaller; color: #999; } + +/* General element positions, from small to big */ /* Phones and whatnot */ .layout { display: grid; row-gap: 1rem; } header { width: 100%; margin-bottom: 1rem; } diff --git a/templates/default.css b/templates/default.css index c5d3001..31c7313 100644 --- a/templates/default.css +++ b/templates/default.css @@ -1,9 +1,16 @@ -/* General element positions, from small to big */ .modal__title { font-size: 2rem; } .modal__confirmation-msg { margin: 0 0 .5rem 0; } .modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } .modal__submit { border: 1px #999 solid; } .modal__cancel { border: 1px #999 dashed; text-decoration: none; } + +.hypha-list { padding-left: 0; } +.hypha-list__entry { list-style-type: none; } +.hypha-list__link { text-decoration: none; display: inline-block; padding: .25rem; } +.hypha-list__link:hover { text-decoration: underline; } +.hypha-list__amnt-type { font-size: smaller; color: #999; } + +/* General element positions, from small to big */ /* Phones and whatnot */ .layout { display: grid; row-gap: 1rem; } header { width: 100%; margin-bottom: 1rem; } diff --git a/views/stuff.qtpl b/views/stuff.qtpl index fed2faa..5fbdc25 100644 --- a/views/stuff.qtpl +++ b/views/stuff.qtpl @@ -1,5 +1,7 @@ -{% import "github.com/bouncepaw/mycorrhiza/util" %} +{% import "path/filepath" %} +{% import "github.com/bouncepaw/mycorrhiza/hyphae" %} {% import "github.com/bouncepaw/mycorrhiza/user" %} +{% import "github.com/bouncepaw/mycorrhiza/util" %} {% func BaseHTML(title, body string, u *user.User, headElements ...string) %} @@ -70,37 +72,25 @@ for u := range user.YieldUsers() { {% endfunc %} -{% func HyphaListHTML(tbody string, pageCount int) %} +{% func HyphaListHTML() %}

    List of hyphae

    -

    This wiki has {%d pageCount %} hyphae.

    - - - - - - - - - {%s= tbody %} - -
    Full nameBinary part type
    +

    This wiki has {%d hyphae.Count() %} hyphae.

    +
      + {% for h := range hyphae.YieldExistingHyphae() %} +
    • + {%s util.BeautifulName(h.Name) %} + {% if h.BinaryPath != "" %} + {%s filepath.Ext(h.BinaryPath)[1:] %} + {% endif %} +
      • + {% endfor %} +
    {% endfunc %} -{% func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) %} - - {%s hyphaName %} - {% if binaryPresent %} - {%s binaryMime %} - {% else %} - - {% endif %} - -{% endfunc %} - {% func AboutHTML() %}
    diff --git a/views/stuff.qtpl.go b/views/stuff.qtpl.go index 7c63324..7780726 100644 --- a/views/stuff.qtpl.go +++ b/views/stuff.qtpl.go @@ -5,27 +5,33 @@ package views //line views/stuff.qtpl:1 -import "github.com/bouncepaw/mycorrhiza/util" +import "path/filepath" //line views/stuff.qtpl:2 +import "github.com/bouncepaw/mycorrhiza/hyphae" + +//line views/stuff.qtpl:3 import "github.com/bouncepaw/mycorrhiza/user" //line views/stuff.qtpl:4 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/stuff.qtpl:6 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line views/stuff.qtpl:4 +//line views/stuff.qtpl:6 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line views/stuff.qtpl:4 +//line views/stuff.qtpl:6 func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, u *user.User, headElements ...string) { -//line views/stuff.qtpl:4 +//line views/stuff.qtpl:6 qw422016.N().S(` @@ -34,18 +40,18 @@ func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, u *user.User, `) -//line views/stuff.qtpl:11 +//line views/stuff.qtpl:13 qw422016.E().S(title) -//line views/stuff.qtpl:11 +//line views/stuff.qtpl:13 qw422016.N().S(` `) -//line views/stuff.qtpl:12 +//line views/stuff.qtpl:14 for _, el := range headElements { -//line views/stuff.qtpl:12 +//line views/stuff.qtpl:14 qw422016.N().S(el) -//line views/stuff.qtpl:12 +//line views/stuff.qtpl:14 } -//line views/stuff.qtpl:12 +//line views/stuff.qtpl:14 qw422016.N().S(` @@ -53,76 +59,76 @@ func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, u *user.User, `) -//line views/stuff.qtpl:25 +//line views/stuff.qtpl:27 qw422016.N().S(body) -//line views/stuff.qtpl:25 +//line views/stuff.qtpl:27 qw422016.N().S(` `) -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 } -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, u *user.User, headElements ...string) { -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 StreamBaseHTML(qw422016, title, body, u, headElements...) -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 } -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 func BaseHTML(title, body string, u *user.User, headElements ...string) string { -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 WriteBaseHTML(qb422016, title, body, u, headElements...) -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 return qs422016 -//line views/stuff.qtpl:28 +//line views/stuff.qtpl:30 } -//line views/stuff.qtpl:30 +//line views/stuff.qtpl:32 func StreamUserListHTML(qw422016 *qt422016.Writer) { -//line views/stuff.qtpl:30 +//line views/stuff.qtpl:32 qw422016.N().S(`

    List of users

    `) -//line views/stuff.qtpl:35 +//line views/stuff.qtpl:37 var ( admins = make([]string, 0) moderators = make([]string, 0) @@ -139,346 +145,303 @@ func StreamUserListHTML(qw422016 *qt422016.Writer) { } } -//line views/stuff.qtpl:50 +//line views/stuff.qtpl:52 qw422016.N().S(`

    Admins

      `) -//line views/stuff.qtpl:53 +//line views/stuff.qtpl:55 for _, name := range admins { -//line views/stuff.qtpl:53 +//line views/stuff.qtpl:55 qw422016.N().S(`
    1. `) -//line views/stuff.qtpl:54 +//line views/stuff.qtpl:56 qw422016.E().S(name) -//line views/stuff.qtpl:54 +//line views/stuff.qtpl:56 qw422016.N().S(`
      2. `) -//line views/stuff.qtpl:55 +//line views/stuff.qtpl:57 } -//line views/stuff.qtpl:55 +//line views/stuff.qtpl:57 qw422016.N().S(`

    Moderators

      `) -//line views/stuff.qtpl:59 +//line views/stuff.qtpl:61 for _, name := range moderators { -//line views/stuff.qtpl:59 +//line views/stuff.qtpl:61 qw422016.N().S(`
    1. `) -//line views/stuff.qtpl:60 +//line views/stuff.qtpl:62 qw422016.E().S(name) -//line views/stuff.qtpl:60 +//line views/stuff.qtpl:62 qw422016.N().S(`
      2. `) -//line views/stuff.qtpl:61 +//line views/stuff.qtpl:63 } -//line views/stuff.qtpl:61 +//line views/stuff.qtpl:63 qw422016.N().S(`

    Editors

      `) -//line views/stuff.qtpl:65 +//line views/stuff.qtpl:67 for _, name := range editors { -//line views/stuff.qtpl:65 +//line views/stuff.qtpl:67 qw422016.N().S(`
    1. `) -//line views/stuff.qtpl:66 +//line views/stuff.qtpl:68 qw422016.E().S(name) -//line views/stuff.qtpl:66 +//line views/stuff.qtpl:68 qw422016.N().S(`
      2. `) -//line views/stuff.qtpl:67 +//line views/stuff.qtpl:69 } -//line views/stuff.qtpl:67 +//line views/stuff.qtpl:69 qw422016.N().S(`
    `) -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 } -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 func WriteUserListHTML(qq422016 qtio422016.Writer) { -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 StreamUserListHTML(qw422016) -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 } -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 func UserListHTML() string { -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 WriteUserListHTML(qb422016) -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 return qs422016 -//line views/stuff.qtpl:71 +//line views/stuff.qtpl:73 } -//line views/stuff.qtpl:73 -func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) { -//line views/stuff.qtpl:73 +//line views/stuff.qtpl:75 +func StreamHyphaListHTML(qw422016 *qt422016.Writer) { +//line views/stuff.qtpl:75 qw422016.N().S(`

    List of hyphae

    This wiki has `) -//line views/stuff.qtpl:77 - qw422016.N().D(pageCount) -//line views/stuff.qtpl:77 +//line views/stuff.qtpl:79 + qw422016.N().D(hyphae.Count()) +//line views/stuff.qtpl:79 qw422016.N().S(` hyphae.

    - - - - - - - - +
      + `) +//line views/stuff.qtpl:81 + for h := range hyphae.YieldExistingHyphae() { +//line views/stuff.qtpl:81 + qw422016.N().S(` +
    • + `) +//line views/stuff.qtpl:83 + qw422016.E().S(util.BeautifulName(h.Name)) +//line views/stuff.qtpl:83 + qw422016.N().S(` + `) +//line views/stuff.qtpl:84 + if h.BinaryPath != "" { +//line views/stuff.qtpl:84 + qw422016.N().S(` + `) +//line views/stuff.qtpl:85 + qw422016.E().S(filepath.Ext(h.BinaryPath)[1:]) +//line views/stuff.qtpl:85 + qw422016.N().S(` `) //line views/stuff.qtpl:86 - qw422016.N().S(tbody) + } //line views/stuff.qtpl:86 + qw422016.N().S(` +
      • + `) +//line views/stuff.qtpl:88 + } +//line views/stuff.qtpl:88 qw422016.N().S(` -
    -
    Full nameBinary part type
    +
    `) -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 } -//line views/stuff.qtpl:91 -func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) { -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 +func WriteHyphaListHTML(qq422016 qtio422016.Writer) { +//line views/stuff.qtpl:92 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:91 - StreamHyphaListHTML(qw422016, tbody, pageCount) -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 + StreamHyphaListHTML(qw422016) +//line views/stuff.qtpl:92 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 } -//line views/stuff.qtpl:91 -func HyphaListHTML(tbody string, pageCount int) string { -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 +func HyphaListHTML() string { +//line views/stuff.qtpl:92 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:91 - WriteHyphaListHTML(qb422016, tbody, pageCount) -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 + WriteHyphaListHTML(qb422016) +//line views/stuff.qtpl:92 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 return qs422016 -//line views/stuff.qtpl:91 +//line views/stuff.qtpl:92 } -//line views/stuff.qtpl:93 -func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line views/stuff.qtpl:93 - qw422016.N().S(` - - `) -//line views/stuff.qtpl:95 - qw422016.E().S(hyphaName) -//line views/stuff.qtpl:95 - qw422016.N().S(` - `) -//line views/stuff.qtpl:96 - if binaryPresent { -//line views/stuff.qtpl:96 - qw422016.N().S(` - `) -//line views/stuff.qtpl:97 - qw422016.E().S(binaryMime) -//line views/stuff.qtpl:97 - qw422016.N().S(` - `) -//line views/stuff.qtpl:98 - } else { -//line views/stuff.qtpl:98 - qw422016.N().S(` - - `) -//line views/stuff.qtpl:100 - } -//line views/stuff.qtpl:100 - qw422016.N().S(` - -`) -//line views/stuff.qtpl:102 -} - -//line views/stuff.qtpl:102 -func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) { -//line views/stuff.qtpl:102 - qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:102 - StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent) -//line views/stuff.qtpl:102 - qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:102 -} - -//line views/stuff.qtpl:102 -func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string { -//line views/stuff.qtpl:102 - qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:102 - WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent) -//line views/stuff.qtpl:102 - qs422016 := string(qb422016.B) -//line views/stuff.qtpl:102 - qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:102 - return qs422016 -//line views/stuff.qtpl:102 -} - -//line views/stuff.qtpl:104 +//line views/stuff.qtpl:94 func StreamAboutHTML(qw422016 *qt422016.Writer) { -//line views/stuff.qtpl:104 +//line views/stuff.qtpl:94 qw422016.N().S(`

    About `) -//line views/stuff.qtpl:108 +//line views/stuff.qtpl:98 qw422016.E().S(util.SiteName) -//line views/stuff.qtpl:108 +//line views/stuff.qtpl:98 qw422016.N().S(`

    See /list for information about hyphae on this wiki.

    `) -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 } -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 func WriteAboutHTML(qq422016 qtio422016.Writer) { -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 StreamAboutHTML(qw422016) -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 } -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 func AboutHTML() string { -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 WriteAboutHTML(qb422016) -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 return qs422016 -//line views/stuff.qtpl:126 +//line views/stuff.qtpl:116 } -//line views/stuff.qtpl:128 +//line views/stuff.qtpl:118 func StreamAdminPanelHTML(qw422016 *qt422016.Writer) { -//line views/stuff.qtpl:128 +//line views/stuff.qtpl:118 qw422016.N().S(`
    @@ -509,31 +472,31 @@ func StreamAdminPanelHTML(qw422016 *qt422016.Writer) {
    `) -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 } -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 func WriteAdminPanelHTML(qq422016 qtio422016.Writer) { -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 StreamAdminPanelHTML(qw422016) -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 } -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 func AdminPanelHTML() string { -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 WriteAdminPanelHTML(qb422016) -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 return qs422016 -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:147 } From f992f0a098620b3346fc418f2a8e3c66b02399f0 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Tue, 23 Feb 2021 14:15:25 +0500 Subject: [PATCH 41/53] Add clear: both to the subhyphae block --- templates/asset.qtpl.go | 2 +- templates/default.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/asset.qtpl.go b/templates/asset.qtpl.go index 7e951aa..cfecdf5 100644 --- a/templates/asset.qtpl.go +++ b/templates/asset.qtpl.go @@ -146,7 +146,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25 .binary-container_with-video video, .binary-container_with-audio audio {width: 100%} -.subhyphae__title { padding-bottom: .5rem; } +.subhyphae__title { padding-bottom: .5rem; clear: both; } .navi-title { padding-bottom: .5rem; margin: .25rem 0; } .navi-title a {text-decoration:none; } .navi-title__separator { margin: 0 .25rem; } diff --git a/templates/default.css b/templates/default.css index 31c7313..bc4f3e1 100644 --- a/templates/default.css +++ b/templates/default.css @@ -121,7 +121,7 @@ article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25 .binary-container_with-video video, .binary-container_with-audio audio {width: 100%} -.subhyphae__title { padding-bottom: .5rem; } +.subhyphae__title { padding-bottom: .5rem; clear: both; } .navi-title { padding-bottom: .5rem; margin: .25rem 0; } .navi-title a {text-decoration:none; } .navi-title__separator { margin: 0 .25rem; } From c83710f155077e328cf1ba6707c31058fd3a7566 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Tue, 23 Feb 2021 19:25:07 +0500 Subject: [PATCH 42/53] Move mutators.qtpl and auth.qtpl to the views --- http_auth.go | 8 +- http_mutators.go | 5 +- templates/common.qtpl | 19 --- templates/common.qtpl.go | 183 -------------------------- {templates => views}/auth.qtpl | 0 {templates => views}/auth.qtpl.go | 146 ++++++++++---------- {templates => views}/mutators.qtpl | 6 +- {templates => views}/mutators.qtpl.go | 130 +++++++++--------- 8 files changed, 147 insertions(+), 350 deletions(-) delete mode 100644 templates/common.qtpl delete mode 100644 templates/common.qtpl.go rename {templates => views}/auth.qtpl (100%) rename {templates => views}/auth.qtpl.go (62%) rename {templates => views}/mutators.qtpl (91%) rename {templates => views}/mutators.qtpl.go (60%) diff --git a/http_auth.go b/http_auth.go index a9ba5de..9981520 100644 --- a/http_auth.go +++ b/http_auth.go @@ -4,9 +4,9 @@ import ( "log" "net/http" - "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" + "github.com/bouncepaw/mycorrhiza/views" ) func init() { @@ -29,7 +29,7 @@ func handlerLogout(w http.ResponseWriter, rq *http.Request) { log.Println("Unknown user tries to log out") w.WriteHeader(http.StatusForbidden) } - w.Write([]byte(base("Logout?", templates.LogoutHTML(can), u))) + w.Write([]byte(base("Logout?", views.LogoutHTML(can), u))) } func handlerLogoutConfirm(w http.ResponseWriter, rq *http.Request) { @@ -45,7 +45,7 @@ func handlerLoginData(w http.ResponseWriter, rq *http.Request) { err = user.LoginDataHTTP(w, rq, username, password) ) if err != "" { - w.Write([]byte(base(err, templates.LoginErrorHTML(err), user.EmptyUser()))) + w.Write([]byte(base(err, views.LoginErrorHTML(err), user.EmptyUser()))) } else { http.Redirect(w, rq, "/", http.StatusSeeOther) } @@ -59,5 +59,5 @@ func handlerLogin(w http.ResponseWriter, rq *http.Request) { } else { w.WriteHeader(http.StatusForbidden) } - w.Write([]byte(base("Login", templates.LoginHTML(), user.EmptyUser()))) + w.Write([]byte(base("Login", views.LoginHTML(), user.EmptyUser()))) } diff --git a/http_mutators.go b/http_mutators.go index 0cc3f56..5835420 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -9,7 +9,6 @@ import ( "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/markup" "github.com/bouncepaw/mycorrhiza/shroom" - "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" "github.com/bouncepaw/mycorrhiza/views" @@ -161,7 +160,7 @@ func handlerEdit(w http.ResponseWriter, rq *http.Request) { w, base( "Edit "+hyphaName, - templates.EditHTML(rq, hyphaName, textAreaFill, warning), + views.EditHTML(rq, hyphaName, textAreaFill, warning), u)) } @@ -193,7 +192,7 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) { w, base( "Preview "+hyphaName, - templates.PreviewHTML( + views.PreviewHTML( rq, hyphaName, textData, diff --git a/templates/common.qtpl b/templates/common.qtpl deleted file mode 100644 index 2f225ac..0000000 --- a/templates/common.qtpl +++ /dev/null @@ -1,19 +0,0 @@ -{% import "net/http" %} -{% import "github.com/bouncepaw/mycorrhiza/user" %} -{% import "github.com/bouncepaw/mycorrhiza/views" %} - -{% func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) %} -{%s= views.NavHTML(rq, hyphaName, navType, revisionHash...) %} -{% endfunc %} - -{% func userMenuHTML(u *user.User) %} -{%s= views.UserMenuHTML(u) %} -{% endfunc %} - -{% func relativeHyphae(relatives string) %} -{%s= views.RelativeHyphaeHTML(relatives) %} -{% endfunc %} - -{% func subhyphaeMatrix(subhyphae string) %} -{%s= views.SubhyphaeHTML(subhyphae) %} -{% endfunc %} diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go deleted file mode 100644 index 40293c8..0000000 --- a/templates/common.qtpl.go +++ /dev/null @@ -1,183 +0,0 @@ -// Code generated by qtc from "common.qtpl". DO NOT EDIT. -// See https://github.com/valyala/quicktemplate for details. - -//line templates/common.qtpl:1 -package templates - -//line templates/common.qtpl:1 -import "net/http" - -//line templates/common.qtpl:2 -import "github.com/bouncepaw/mycorrhiza/user" - -//line templates/common.qtpl:3 -import "github.com/bouncepaw/mycorrhiza/views" - -//line templates/common.qtpl:5 -import ( - qtio422016 "io" - - qt422016 "github.com/valyala/quicktemplate" -) - -//line templates/common.qtpl:5 -var ( - _ = qtio422016.Copy - _ = qt422016.AcquireByteBuffer -) - -//line templates/common.qtpl:5 -func streamnavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line templates/common.qtpl:5 - qw422016.N().S(` -`) -//line templates/common.qtpl:6 - qw422016.N().S(views.NavHTML(rq, hyphaName, navType, revisionHash...)) -//line templates/common.qtpl:6 - qw422016.N().S(` -`) -//line templates/common.qtpl:7 -} - -//line templates/common.qtpl:7 -func writenavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line templates/common.qtpl:7 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:7 - streamnavHTML(qw422016, rq, hyphaName, navType, revisionHash...) -//line templates/common.qtpl:7 - qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:7 -} - -//line templates/common.qtpl:7 -func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string { -//line templates/common.qtpl:7 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:7 - writenavHTML(qb422016, rq, hyphaName, navType, revisionHash...) -//line templates/common.qtpl:7 - qs422016 := string(qb422016.B) -//line templates/common.qtpl:7 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:7 - return qs422016 -//line templates/common.qtpl:7 -} - -//line templates/common.qtpl:9 -func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) { -//line templates/common.qtpl:9 - qw422016.N().S(` -`) -//line templates/common.qtpl:10 - qw422016.N().S(views.UserMenuHTML(u)) -//line templates/common.qtpl:10 - qw422016.N().S(` -`) -//line templates/common.qtpl:11 -} - -//line templates/common.qtpl:11 -func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) { -//line templates/common.qtpl:11 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:11 - streamuserMenuHTML(qw422016, u) -//line templates/common.qtpl:11 - qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:11 -} - -//line templates/common.qtpl:11 -func userMenuHTML(u *user.User) string { -//line templates/common.qtpl:11 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:11 - writeuserMenuHTML(qb422016, u) -//line templates/common.qtpl:11 - qs422016 := string(qb422016.B) -//line templates/common.qtpl:11 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:11 - return qs422016 -//line templates/common.qtpl:11 -} - -//line templates/common.qtpl:13 -func streamrelativeHyphae(qw422016 *qt422016.Writer, relatives string) { -//line templates/common.qtpl:13 - qw422016.N().S(` -`) -//line templates/common.qtpl:14 - qw422016.N().S(views.RelativeHyphaeHTML(relatives)) -//line templates/common.qtpl:14 - qw422016.N().S(` -`) -//line templates/common.qtpl:15 -} - -//line templates/common.qtpl:15 -func writerelativeHyphae(qq422016 qtio422016.Writer, relatives string) { -//line templates/common.qtpl:15 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:15 - streamrelativeHyphae(qw422016, relatives) -//line templates/common.qtpl:15 - qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:15 -} - -//line templates/common.qtpl:15 -func relativeHyphae(relatives string) string { -//line templates/common.qtpl:15 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:15 - writerelativeHyphae(qb422016, relatives) -//line templates/common.qtpl:15 - qs422016 := string(qb422016.B) -//line templates/common.qtpl:15 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:15 - return qs422016 -//line templates/common.qtpl:15 -} - -//line templates/common.qtpl:17 -func streamsubhyphaeMatrix(qw422016 *qt422016.Writer, subhyphae string) { -//line templates/common.qtpl:17 - qw422016.N().S(` -`) -//line templates/common.qtpl:18 - qw422016.N().S(views.SubhyphaeHTML(subhyphae)) -//line templates/common.qtpl:18 - qw422016.N().S(` -`) -//line templates/common.qtpl:19 -} - -//line templates/common.qtpl:19 -func writesubhyphaeMatrix(qq422016 qtio422016.Writer, subhyphae string) { -//line templates/common.qtpl:19 - qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/common.qtpl:19 - streamsubhyphaeMatrix(qw422016, subhyphae) -//line templates/common.qtpl:19 - qt422016.ReleaseWriter(qw422016) -//line templates/common.qtpl:19 -} - -//line templates/common.qtpl:19 -func subhyphaeMatrix(subhyphae string) string { -//line templates/common.qtpl:19 - qb422016 := qt422016.AcquireByteBuffer() -//line templates/common.qtpl:19 - writesubhyphaeMatrix(qb422016, subhyphae) -//line templates/common.qtpl:19 - qs422016 := string(qb422016.B) -//line templates/common.qtpl:19 - qt422016.ReleaseByteBuffer(qb422016) -//line templates/common.qtpl:19 - return qs422016 -//line templates/common.qtpl:19 -} diff --git a/templates/auth.qtpl b/views/auth.qtpl similarity index 100% rename from templates/auth.qtpl rename to views/auth.qtpl diff --git a/templates/auth.qtpl.go b/views/auth.qtpl.go similarity index 62% rename from templates/auth.qtpl.go rename to views/auth.qtpl.go index 25bb21a..fec28c1 100644 --- a/templates/auth.qtpl.go +++ b/views/auth.qtpl.go @@ -1,36 +1,36 @@ // Code generated by qtc from "auth.qtpl". DO NOT EDIT. // See https://github.com/valyala/quicktemplate for details. -//line templates/auth.qtpl:1 -package templates +//line views/auth.qtpl:1 +package views -//line templates/auth.qtpl:1 +//line views/auth.qtpl:1 import "github.com/bouncepaw/mycorrhiza/user" -//line templates/auth.qtpl:3 +//line views/auth.qtpl:3 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/auth.qtpl:3 +//line views/auth.qtpl:3 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/auth.qtpl:3 +//line views/auth.qtpl:3 func StreamLoginHTML(qw422016 *qt422016.Writer) { -//line templates/auth.qtpl:3 +//line views/auth.qtpl:3 qw422016.N().S(`
    `) -//line templates/auth.qtpl:7 +//line views/auth.qtpl:7 if user.AuthUsed { -//line templates/auth.qtpl:7 +//line views/auth.qtpl:7 qw422016.N().S(`

    Login

    @@ -48,177 +48,177 @@ func StreamLoginHTML(qw422016 *qt422016.Writer) { Cancel
    `) -//line templates/auth.qtpl:23 +//line views/auth.qtpl:23 } else { -//line templates/auth.qtpl:23 +//line views/auth.qtpl:23 qw422016.N().S(`

    Administrator of this wiki have not configured any authorization method. You can make edits anonymously.

    ← Go home

    `) -//line templates/auth.qtpl:26 +//line views/auth.qtpl:26 } -//line templates/auth.qtpl:26 +//line views/auth.qtpl:26 qw422016.N().S(`
    `) -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 } -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 func WriteLoginHTML(qq422016 qtio422016.Writer) { -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 StreamLoginHTML(qw422016) -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 qt422016.ReleaseWriter(qw422016) -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 } -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 func LoginHTML() string { -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 qb422016 := qt422016.AcquireByteBuffer() -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 WriteLoginHTML(qb422016) -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 qs422016 := string(qb422016.B) -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 qt422016.ReleaseByteBuffer(qb422016) -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 return qs422016 -//line templates/auth.qtpl:30 +//line views/auth.qtpl:30 } -//line templates/auth.qtpl:32 +//line views/auth.qtpl:32 func StreamLoginErrorHTML(qw422016 *qt422016.Writer, err string) { -//line templates/auth.qtpl:32 +//line views/auth.qtpl:32 qw422016.N().S(`
    `) -//line templates/auth.qtpl:36 +//line views/auth.qtpl:36 switch err { -//line templates/auth.qtpl:37 +//line views/auth.qtpl:37 case "unknown username": -//line templates/auth.qtpl:37 +//line views/auth.qtpl:37 qw422016.N().S(`

    Unknown username.

    `) -//line templates/auth.qtpl:39 +//line views/auth.qtpl:39 case "wrong password": -//line templates/auth.qtpl:39 +//line views/auth.qtpl:39 qw422016.N().S(`

    Wrong password.

    `) -//line templates/auth.qtpl:41 +//line views/auth.qtpl:41 default: -//line templates/auth.qtpl:41 +//line views/auth.qtpl:41 qw422016.N().S(`

    `) -//line templates/auth.qtpl:42 +//line views/auth.qtpl:42 qw422016.E().S(err) -//line templates/auth.qtpl:42 +//line views/auth.qtpl:42 qw422016.N().S(`

    `) -//line templates/auth.qtpl:43 +//line views/auth.qtpl:43 } -//line templates/auth.qtpl:43 +//line views/auth.qtpl:43 qw422016.N().S(`

    ← Try again

    `) -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 } -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 func WriteLoginErrorHTML(qq422016 qtio422016.Writer, err string) { -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 StreamLoginErrorHTML(qw422016, err) -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 qt422016.ReleaseWriter(qw422016) -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 } -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 func LoginErrorHTML(err string) string { -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 qb422016 := qt422016.AcquireByteBuffer() -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 WriteLoginErrorHTML(qb422016, err) -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 qs422016 := string(qb422016.B) -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 qt422016.ReleaseByteBuffer(qb422016) -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 return qs422016 -//line templates/auth.qtpl:48 +//line views/auth.qtpl:48 } -//line templates/auth.qtpl:50 +//line views/auth.qtpl:50 func StreamLogoutHTML(qw422016 *qt422016.Writer, can bool) { -//line templates/auth.qtpl:50 +//line views/auth.qtpl:50 qw422016.N().S(`
    `) -//line templates/auth.qtpl:54 +//line views/auth.qtpl:54 if can { -//line templates/auth.qtpl:54 +//line views/auth.qtpl:54 qw422016.N().S(`

    Log out?

    Confirm

    Cancel

    `) -//line templates/auth.qtpl:58 +//line views/auth.qtpl:58 } else { -//line templates/auth.qtpl:58 +//line views/auth.qtpl:58 qw422016.N().S(`

    You cannot log out because you are not logged in.

    Login

    ← Home

    `) -//line templates/auth.qtpl:62 +//line views/auth.qtpl:62 } -//line templates/auth.qtpl:62 +//line views/auth.qtpl:62 qw422016.N().S(`
    `) -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 } -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 func WriteLogoutHTML(qq422016 qtio422016.Writer, can bool) { -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 StreamLogoutHTML(qw422016, can) -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 qt422016.ReleaseWriter(qw422016) -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 } -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 func LogoutHTML(can bool) string { -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 qb422016 := qt422016.AcquireByteBuffer() -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 WriteLogoutHTML(qb422016, can) -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 qs422016 := string(qb422016.B) -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 qt422016.ReleaseByteBuffer(qb422016) -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 return qs422016 -//line templates/auth.qtpl:66 +//line views/auth.qtpl:66 } diff --git a/templates/mutators.qtpl b/views/mutators.qtpl similarity index 91% rename from templates/mutators.qtpl rename to views/mutators.qtpl index a90b767..233c3d5 100644 --- a/templates/mutators.qtpl +++ b/views/mutators.qtpl @@ -2,7 +2,7 @@ {% import "github.com/bouncepaw/mycorrhiza/util" %} {% func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) %} -{%s= navHTML(rq, hyphaName, "edit") %} +{%s= NavHTML(rq, hyphaName, "edit") %}

    Edit {%s util.BeautifulName(hyphaName) %}

    @@ -20,10 +20,10 @@ {% endfunc %} {% func PreviewHTML(rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) %} -{%s= navHTML(rq, hyphaName, "edit") %} +{%s= NavHTML(rq, hyphaName, "edit") %}
    -

    Edit {%s hyphaName %} (preview)

    +

    Edit {%s util.BeautifulName(hyphaName) %} (preview)

    {%s= warning %}
    diff --git a/templates/mutators.qtpl.go b/views/mutators.qtpl.go similarity index 60% rename from templates/mutators.qtpl.go rename to views/mutators.qtpl.go index b1642cf..5510ceb 100644 --- a/templates/mutators.qtpl.go +++ b/views/mutators.qtpl.go @@ -1,176 +1,176 @@ // Code generated by qtc from "mutators.qtpl". DO NOT EDIT. // See https://github.com/valyala/quicktemplate for details. -//line templates/mutators.qtpl:1 -package templates +//line views/mutators.qtpl:1 +package views -//line templates/mutators.qtpl:1 +//line views/mutators.qtpl:1 import "net/http" -//line templates/mutators.qtpl:2 +//line views/mutators.qtpl:2 import "github.com/bouncepaw/mycorrhiza/util" -//line templates/mutators.qtpl:4 +//line views/mutators.qtpl:4 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/mutators.qtpl:4 +//line views/mutators.qtpl:4 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/mutators.qtpl:4 +//line views/mutators.qtpl:4 func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string) { -//line templates/mutators.qtpl:4 +//line views/mutators.qtpl:4 qw422016.N().S(` `) -//line templates/mutators.qtpl:5 - qw422016.N().S(navHTML(rq, hyphaName, "edit")) -//line templates/mutators.qtpl:5 +//line views/mutators.qtpl:5 + qw422016.N().S(NavHTML(rq, hyphaName, "edit")) +//line views/mutators.qtpl:5 qw422016.N().S(`

    Edit `) -//line templates/mutators.qtpl:8 +//line views/mutators.qtpl:8 qw422016.E().S(util.BeautifulName(hyphaName)) -//line templates/mutators.qtpl:8 +//line views/mutators.qtpl:8 qw422016.N().S(`

    `) -//line templates/mutators.qtpl:9 +//line views/mutators.qtpl:9 qw422016.N().S(warning) -//line templates/mutators.qtpl:9 +//line views/mutators.qtpl:9 qw422016.N().S(`
    Cancel
    `) -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 } -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 func WriteEditHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string) { -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 StreamEditHTML(qw422016, rq, hyphaName, textAreaFill, warning) -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 qt422016.ReleaseWriter(qw422016) -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 } -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) string { -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 qb422016 := qt422016.AcquireByteBuffer() -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 WriteEditHTML(qb422016, rq, hyphaName, textAreaFill, warning) -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 qs422016 := string(qb422016.B) -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 qt422016.ReleaseByteBuffer(qb422016) -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 return qs422016 -//line templates/mutators.qtpl:20 +//line views/mutators.qtpl:20 } -//line templates/mutators.qtpl:22 +//line views/mutators.qtpl:22 func StreamPreviewHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) { -//line templates/mutators.qtpl:22 +//line views/mutators.qtpl:22 qw422016.N().S(` `) -//line templates/mutators.qtpl:23 - qw422016.N().S(navHTML(rq, hyphaName, "edit")) -//line templates/mutators.qtpl:23 +//line views/mutators.qtpl:23 + qw422016.N().S(NavHTML(rq, hyphaName, "edit")) +//line views/mutators.qtpl:23 qw422016.N().S(`

    Edit `) -//line templates/mutators.qtpl:26 - qw422016.E().S(hyphaName) -//line templates/mutators.qtpl:26 +//line views/mutators.qtpl:26 + qw422016.E().S(util.BeautifulName(hyphaName)) +//line views/mutators.qtpl:26 qw422016.N().S(` (preview)

    `) -//line templates/mutators.qtpl:27 +//line views/mutators.qtpl:27 qw422016.N().S(warning) -//line templates/mutators.qtpl:27 +//line views/mutators.qtpl:27 qw422016.N().S(`

    Cancel

    Note that the hypha is not saved yet. You can preview the changes ↓

    `) -//line templates/mutators.qtpl:37 +//line views/mutators.qtpl:37 qw422016.N().S(renderedPage) -//line templates/mutators.qtpl:37 +//line views/mutators.qtpl:37 qw422016.N().S(`
    `) -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 } -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 func WritePreviewHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) { -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 StreamPreviewHTML(qw422016, rq, hyphaName, textAreaFill, warning, renderedPage) -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 qt422016.ReleaseWriter(qw422016) -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 } -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 func PreviewHTML(rq *http.Request, hyphaName, textAreaFill, warning string, renderedPage string) string { -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 qb422016 := qt422016.AcquireByteBuffer() -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 WritePreviewHTML(qb422016, rq, hyphaName, textAreaFill, warning, renderedPage) -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 qs422016 := string(qb422016.B) -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 qt422016.ReleaseByteBuffer(qb422016) -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 return qs422016 -//line templates/mutators.qtpl:40 +//line views/mutators.qtpl:40 } From 170240177eff1fbf8d66e693f442ab0aa7989f07 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Tue, 23 Feb 2021 19:36:12 +0500 Subject: [PATCH 43/53] Slight redesign of the login form --- views/auth.qtpl | 32 ++++---- views/auth.qtpl.go | 178 +++++++++++++++++++++++---------------------- 2 files changed, 110 insertions(+), 100 deletions(-) diff --git a/views/auth.qtpl b/views/auth.qtpl index d51e588..f3f257a 100644 --- a/views/auth.qtpl +++ b/views/auth.qtpl @@ -1,28 +1,30 @@ {% import "github.com/bouncepaw/mycorrhiza/user" %} +{% import "github.com/bouncepaw/mycorrhiza/util" %} {% func LoginHTML() %}
    {% if user.AuthUsed %} -

    Login

    -
    -

    Use the data you were given by an administrator.

    -
    - Username - + +
    + Log in to {%s util.SiteName %} +

    Use the data you were given by an administrator.

    + +
    + +
    + +
    + +

    By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you. You will stay logged in until you log out.

    + + Cancel
    -
    - Password - -
    -

    By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you. You will stay logged in until you log out.

    - - Cancel {% else %} -

    Administrator of this wiki have not configured any authorization method. You can make edits anonymously.

    -

    ← Go home

    +

    Administrators of this wiki have not configured any authorization method. You can make edits anonymously.

    +

    ← Go home

    {% endif %}
    diff --git a/views/auth.qtpl.go b/views/auth.qtpl.go index fec28c1..74d83b1 100644 --- a/views/auth.qtpl.go +++ b/views/auth.qtpl.go @@ -7,218 +7,226 @@ package views //line views/auth.qtpl:1 import "github.com/bouncepaw/mycorrhiza/user" -//line views/auth.qtpl:3 +//line views/auth.qtpl:2 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/auth.qtpl:4 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line views/auth.qtpl:3 +//line views/auth.qtpl:4 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line views/auth.qtpl:3 +//line views/auth.qtpl:4 func StreamLoginHTML(qw422016 *qt422016.Writer) { -//line views/auth.qtpl:3 +//line views/auth.qtpl:4 qw422016.N().S(`
    `) -//line views/auth.qtpl:7 +//line views/auth.qtpl:8 if user.AuthUsed { -//line views/auth.qtpl:7 +//line views/auth.qtpl:8 qw422016.N().S(` -

    Login

    -
    -

    Use the data you were given by an administrator.

    -
    - Username - + +
    + Log in to `) +//line views/auth.qtpl:11 + qw422016.E().S(util.SiteName) +//line views/auth.qtpl:11 + qw422016.N().S(` +

    Use the data you were given by an administrator.

    + +
    + +
    + +
    + +

    By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you. You will stay logged in until you log out.

    + + Cancel
    -
    - Password - -
    -

    By submitting this form you give this wiki a permission to store cookies in your browser. It lets the engine associate your edits with you. You will stay logged in until you log out.

    - - Cancel `) -//line views/auth.qtpl:23 +//line views/auth.qtpl:25 } else { -//line views/auth.qtpl:23 +//line views/auth.qtpl:25 qw422016.N().S(` -

    Administrator of this wiki have not configured any authorization method. You can make edits anonymously.

    -

    ← Go home

    +

    Administrators of this wiki have not configured any authorization method. You can make edits anonymously.

    +

    ← Go home

    `) -//line views/auth.qtpl:26 +//line views/auth.qtpl:28 } -//line views/auth.qtpl:26 +//line views/auth.qtpl:28 qw422016.N().S(`
    `) -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 } -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 func WriteLoginHTML(qq422016 qtio422016.Writer) { -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 StreamLoginHTML(qw422016) -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 qt422016.ReleaseWriter(qw422016) -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 } -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 func LoginHTML() string { -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 qb422016 := qt422016.AcquireByteBuffer() -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 WriteLoginHTML(qb422016) -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 qs422016 := string(qb422016.B) -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 qt422016.ReleaseByteBuffer(qb422016) -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 return qs422016 -//line views/auth.qtpl:30 +//line views/auth.qtpl:32 } -//line views/auth.qtpl:32 +//line views/auth.qtpl:34 func StreamLoginErrorHTML(qw422016 *qt422016.Writer, err string) { -//line views/auth.qtpl:32 +//line views/auth.qtpl:34 qw422016.N().S(`
    `) -//line views/auth.qtpl:36 +//line views/auth.qtpl:38 switch err { -//line views/auth.qtpl:37 +//line views/auth.qtpl:39 case "unknown username": -//line views/auth.qtpl:37 +//line views/auth.qtpl:39 qw422016.N().S(`

    Unknown username.

    `) -//line views/auth.qtpl:39 +//line views/auth.qtpl:41 case "wrong password": -//line views/auth.qtpl:39 +//line views/auth.qtpl:41 qw422016.N().S(`

    Wrong password.

    `) -//line views/auth.qtpl:41 +//line views/auth.qtpl:43 default: -//line views/auth.qtpl:41 +//line views/auth.qtpl:43 qw422016.N().S(`

    `) -//line views/auth.qtpl:42 +//line views/auth.qtpl:44 qw422016.E().S(err) -//line views/auth.qtpl:42 +//line views/auth.qtpl:44 qw422016.N().S(`

    `) -//line views/auth.qtpl:43 +//line views/auth.qtpl:45 } -//line views/auth.qtpl:43 +//line views/auth.qtpl:45 qw422016.N().S(`

    ← Try again

    `) -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 } -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 func WriteLoginErrorHTML(qq422016 qtio422016.Writer, err string) { -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 StreamLoginErrorHTML(qw422016, err) -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 qt422016.ReleaseWriter(qw422016) -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 } -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 func LoginErrorHTML(err string) string { -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 qb422016 := qt422016.AcquireByteBuffer() -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 WriteLoginErrorHTML(qb422016, err) -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 qs422016 := string(qb422016.B) -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 qt422016.ReleaseByteBuffer(qb422016) -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 return qs422016 -//line views/auth.qtpl:48 +//line views/auth.qtpl:50 } -//line views/auth.qtpl:50 +//line views/auth.qtpl:52 func StreamLogoutHTML(qw422016 *qt422016.Writer, can bool) { -//line views/auth.qtpl:50 +//line views/auth.qtpl:52 qw422016.N().S(`
    `) -//line views/auth.qtpl:54 +//line views/auth.qtpl:56 if can { -//line views/auth.qtpl:54 +//line views/auth.qtpl:56 qw422016.N().S(`

    Log out?

    Confirm

    Cancel

    `) -//line views/auth.qtpl:58 +//line views/auth.qtpl:60 } else { -//line views/auth.qtpl:58 +//line views/auth.qtpl:60 qw422016.N().S(`

    You cannot log out because you are not logged in.

    Login

    ← Home

    `) -//line views/auth.qtpl:62 +//line views/auth.qtpl:64 } -//line views/auth.qtpl:62 +//line views/auth.qtpl:64 qw422016.N().S(`
    `) -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 } -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 func WriteLogoutHTML(qq422016 qtio422016.Writer, can bool) { -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 StreamLogoutHTML(qw422016, can) -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 qt422016.ReleaseWriter(qw422016) -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 } -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 func LogoutHTML(can bool) string { -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 qb422016 := qt422016.AcquireByteBuffer() -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 WriteLogoutHTML(qb422016, can) -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 qs422016 := string(qb422016.B) -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 qt422016.ReleaseByteBuffer(qb422016) -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 return qs422016 -//line views/auth.qtpl:66 +//line views/auth.qtpl:68 } From 22420bf690804bde1d679fc22f3d39b696b9520f Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Tue, 23 Feb 2021 19:41:22 +0500 Subject: [PATCH 44/53] Move assets from templates to the assets module --- templates/asset.qtpl => assets/assets.qtpl | 0 .../asset.qtpl.go => assets/assets.qtpl.go | 180 +++++++++--------- {templates => assets}/default.css | 0 .../icon/gemini-protocol-icon.svg | 0 .../icon/gopher-protocol-icon.svg | 0 .../icon/http-protocol-icon.svg | 0 .../icon/mailto-protocol-icon.svg | 0 main.go | 14 +- 8 files changed, 97 insertions(+), 97 deletions(-) rename templates/asset.qtpl => assets/assets.qtpl (100%) rename templates/asset.qtpl.go => assets/assets.qtpl.go (86%) rename {templates => assets}/default.css (100%) rename {templates => assets}/icon/gemini-protocol-icon.svg (100%) rename {templates => assets}/icon/gopher-protocol-icon.svg (100%) rename {templates => assets}/icon/http-protocol-icon.svg (100%) rename {templates => assets}/icon/mailto-protocol-icon.svg (100%) diff --git a/templates/asset.qtpl b/assets/assets.qtpl similarity index 100% rename from templates/asset.qtpl rename to assets/assets.qtpl diff --git a/templates/asset.qtpl.go b/assets/assets.qtpl.go similarity index 86% rename from templates/asset.qtpl.go rename to assets/assets.qtpl.go index cfecdf5..83a3131 100644 --- a/templates/asset.qtpl.go +++ b/assets/assets.qtpl.go @@ -1,28 +1,28 @@ -// Code generated by qtc from "asset.qtpl". DO NOT EDIT. +// Code generated by qtc from "assets.qtpl". DO NOT EDIT. // See https://github.com/valyala/quicktemplate for details. -//line templates/asset.qtpl:1 -package templates +//line assets/assets.qtpl:1 +package assets -//line templates/asset.qtpl:1 +//line assets/assets.qtpl:1 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/asset.qtpl:1 +//line assets/assets.qtpl:1 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/asset.qtpl:1 +//line assets/assets.qtpl:1 func StreamDefaultCSS(qw422016 *qt422016.Writer) { -//line templates/asset.qtpl:1 +//line assets/assets.qtpl:1 qw422016.N().S(` `) -//line templates/asset.qtpl:2 +//line assets/assets.qtpl:2 qw422016.N().S(`.modal__title { font-size: 2rem; } .modal__confirmation-msg { margin: 0 0 .5rem 0; } .modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } @@ -295,168 +295,168 @@ mark { background: rgba(130, 80, 30, 5); color: inherit; } .backlinks { display: none; } `) -//line templates/asset.qtpl:2 +//line assets/assets.qtpl:2 qw422016.N().S(` `) -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 } -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 func WriteDefaultCSS(qq422016 qtio422016.Writer) { -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 StreamDefaultCSS(qw422016) -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 qt422016.ReleaseWriter(qw422016) -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 } -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 func DefaultCSS() string { -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 qb422016 := qt422016.AcquireByteBuffer() -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 WriteDefaultCSS(qb422016) -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 qs422016 := string(qb422016.B) -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 qt422016.ReleaseByteBuffer(qb422016) -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 return qs422016 -//line templates/asset.qtpl:3 +//line assets/assets.qtpl:3 } // Next three are from https://remixicon.com/ -//line templates/asset.qtpl:6 +//line assets/assets.qtpl:6 func StreamIconHTTP(qw422016 *qt422016.Writer) { -//line templates/asset.qtpl:6 +//line assets/assets.qtpl:6 qw422016.N().S(` `) -//line templates/asset.qtpl:7 +//line assets/assets.qtpl:7 qw422016.N().S(` `) -//line templates/asset.qtpl:7 +//line assets/assets.qtpl:7 qw422016.N().S(` `) -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 } -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 func WriteIconHTTP(qq422016 qtio422016.Writer) { -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 StreamIconHTTP(qw422016) -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 qt422016.ReleaseWriter(qw422016) -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 } -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 func IconHTTP() string { -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 qb422016 := qt422016.AcquireByteBuffer() -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 WriteIconHTTP(qb422016) -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 qs422016 := string(qb422016.B) -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 qt422016.ReleaseByteBuffer(qb422016) -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 return qs422016 -//line templates/asset.qtpl:8 +//line assets/assets.qtpl:8 } -//line templates/asset.qtpl:10 +//line assets/assets.qtpl:10 func StreamIconGemini(qw422016 *qt422016.Writer) { -//line templates/asset.qtpl:10 +//line assets/assets.qtpl:10 qw422016.N().S(` `) -//line templates/asset.qtpl:11 +//line assets/assets.qtpl:11 qw422016.N().S(` `) -//line templates/asset.qtpl:11 +//line assets/assets.qtpl:11 qw422016.N().S(` `) -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 } -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 func WriteIconGemini(qq422016 qtio422016.Writer) { -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 StreamIconGemini(qw422016) -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 qt422016.ReleaseWriter(qw422016) -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 } -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 func IconGemini() string { -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 qb422016 := qt422016.AcquireByteBuffer() -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 WriteIconGemini(qb422016) -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 qs422016 := string(qb422016.B) -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 qt422016.ReleaseByteBuffer(qb422016) -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 return qs422016 -//line templates/asset.qtpl:12 +//line assets/assets.qtpl:12 } -//line templates/asset.qtpl:14 +//line assets/assets.qtpl:14 func StreamIconMailto(qw422016 *qt422016.Writer) { -//line templates/asset.qtpl:14 +//line assets/assets.qtpl:14 qw422016.N().S(` `) -//line templates/asset.qtpl:15 +//line assets/assets.qtpl:15 qw422016.N().S(` `) -//line templates/asset.qtpl:15 +//line assets/assets.qtpl:15 qw422016.N().S(` `) -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 } -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 func WriteIconMailto(qq422016 qtio422016.Writer) { -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 StreamIconMailto(qw422016) -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 qt422016.ReleaseWriter(qw422016) -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 } -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 func IconMailto() string { -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 qb422016 := qt422016.AcquireByteBuffer() -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 WriteIconMailto(qb422016) -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 qs422016 := string(qb422016.B) -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 qt422016.ReleaseByteBuffer(qb422016) -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 return qs422016 -//line templates/asset.qtpl:16 +//line assets/assets.qtpl:16 } // This is a modified version of https://www.svgrepo.com/svg/232085/rat -//line templates/asset.qtpl:19 +//line assets/assets.qtpl:19 func StreamIconGopher(qw422016 *qt422016.Writer) { -//line templates/asset.qtpl:19 +//line assets/assets.qtpl:19 qw422016.N().S(` `) -//line templates/asset.qtpl:20 +//line assets/assets.qtpl:20 qw422016.N().S(` `) -//line templates/asset.qtpl:20 +//line assets/assets.qtpl:20 qw422016.N().S(` `) -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 } -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 func WriteIconGopher(qq422016 qtio422016.Writer) { -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 StreamIconGopher(qw422016) -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 qt422016.ReleaseWriter(qw422016) -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 } -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 func IconGopher() string { -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 qb422016 := qt422016.AcquireByteBuffer() -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 WriteIconGopher(qb422016) -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 qs422016 := string(qb422016.B) -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 qt422016.ReleaseByteBuffer(qb422016) -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 return qs422016 -//line templates/asset.qtpl:21 +//line assets/assets.qtpl:21 } diff --git a/templates/default.css b/assets/default.css similarity index 100% rename from templates/default.css rename to assets/default.css diff --git a/templates/icon/gemini-protocol-icon.svg b/assets/icon/gemini-protocol-icon.svg similarity index 100% rename from templates/icon/gemini-protocol-icon.svg rename to assets/icon/gemini-protocol-icon.svg diff --git a/templates/icon/gopher-protocol-icon.svg b/assets/icon/gopher-protocol-icon.svg similarity index 100% rename from templates/icon/gopher-protocol-icon.svg rename to assets/icon/gopher-protocol-icon.svg diff --git a/templates/icon/http-protocol-icon.svg b/assets/icon/http-protocol-icon.svg similarity index 100% rename from templates/icon/http-protocol-icon.svg rename to assets/icon/http-protocol-icon.svg diff --git a/templates/icon/mailto-protocol-icon.svg b/assets/icon/mailto-protocol-icon.svg similarity index 100% rename from templates/icon/mailto-protocol-icon.svg rename to assets/icon/mailto-protocol-icon.svg diff --git a/main.go b/main.go index 288ff7f..ba4ce5b 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ //go:generate go get -u github.com/valyala/quicktemplate/qtc -//go:generate qtc -dir=templates +//go:generate qtc -dir=assets //go:generate qtc -dir=views package main @@ -12,10 +12,10 @@ import ( "os" "strings" + "github.com/bouncepaw/mycorrhiza/assets" "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/shroom" - "github.com/bouncepaw/mycorrhiza/templates" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" "github.com/bouncepaw/mycorrhiza/views" @@ -102,7 +102,7 @@ func handlerStyle(w http.ResponseWriter, rq *http.Request) { http.ServeFile(w, rq, util.WikiDir+"/static/common.css") } else { w.Header().Set("Content-Type", "text/css;charset=utf-8") - w.Write([]byte(templates.DefaultCSS())) + w.Write([]byte(assets.DefaultCSS())) } if bytes, err := ioutil.ReadFile(util.WikiDir + "/static/custom.css"); err == nil { w.Write(bytes) @@ -126,13 +126,13 @@ func handlerIcon(w http.ResponseWriter, rq *http.Request) { w.Header().Set("Content-Type", "image/svg+xml") switch iconName { case "gemini": - w.Write([]byte(templates.IconGemini())) + w.Write([]byte(assets.IconGemini())) case "mailto": - w.Write([]byte(templates.IconMailto())) + w.Write([]byte(assets.IconMailto())) case "gopher": - w.Write([]byte(templates.IconGopher())) + w.Write([]byte(assets.IconGopher())) default: - w.Write([]byte(templates.IconHTTP())) + w.Write([]byte(assets.IconHTTP())) } } From a8a2735363ce19e39eec92152fb7effd95fa0a53 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Wed, 24 Feb 2021 22:34:42 +0500 Subject: [PATCH 45/53] Add the attachment tab --- assets/assets.qtpl.go | 7 +- assets/default.css | 5 + http_readers.go | 15 ++ main.go | 2 +- views/modal.qtpl | 2 +- views/modal.qtpl.go | 2 +- views/nav.qtpl | 1 + views/nav.qtpl.go | 213 ++++++++++----------- views/readers.qtpl | 90 +++++++-- views/readers.qtpl.go | 431 +++++++++++++++++++++++++++++------------- 10 files changed, 514 insertions(+), 254 deletions(-) diff --git a/assets/assets.qtpl.go b/assets/assets.qtpl.go index 83a3131..1b8fd71 100644 --- a/assets/assets.qtpl.go +++ b/assets/assets.qtpl.go @@ -23,7 +23,11 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) { qw422016.N().S(` `) //line assets/assets.qtpl:2 - qw422016.N().S(`.modal__title { font-size: 2rem; } + qw422016.N().S(`.amnt-grid { display: grid; grid-template-columns: 1fr 1fr; } +.upload-binary__input { display: block; margin: .25rem 0; } + +.modal__title { font-size: 2rem; } +.modal__title_small { font-size: 1.5rem; } .modal__confirmation-msg { margin: 0 0 .5rem 0; } .modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } .modal__submit { border: 1px #999 solid; } @@ -56,6 +60,7 @@ header { width: 100%; margin-bottom: 1rem; } .backlinks__link { text-decoration: none; display: block; padding: .25rem; padding-left: 1.25rem; } @media screen and (max-width: 800px) { + .amnt-grid { grid-template-columns: 1fr; } .layout { grid-template-column: auto; grid-template-row: auto auto auto; } .main-width { width: 100%; } main { padding: 1rem; margin: 0; } diff --git a/assets/default.css b/assets/default.css index bc4f3e1..d785cfc 100644 --- a/assets/default.css +++ b/assets/default.css @@ -1,4 +1,8 @@ +.amnt-grid { display: grid; grid-template-columns: 1fr 1fr; } +.upload-binary__input { display: block; margin: .25rem 0; } + .modal__title { font-size: 2rem; } +.modal__title_small { font-size: 1.5rem; } .modal__confirmation-msg { margin: 0 0 .5rem 0; } .modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } .modal__submit { border: 1px #999 solid; } @@ -31,6 +35,7 @@ header { width: 100%; margin-bottom: 1rem; } .backlinks__link { text-decoration: none; display: block; padding: .25rem; padding-left: 1.25rem; } @media screen and (max-width: 800px) { + .amnt-grid { grid-template-columns: 1fr; } .layout { grid-template-column: auto; grid-template-row: auto auto auto; } .main-width { width: 100%; } main { padding: 1rem; margin: 0; } diff --git a/http_readers.go b/http_readers.go index b7711c6..a75b682 100644 --- a/http_readers.go +++ b/http_readers.go @@ -24,6 +24,21 @@ func init() { http.HandleFunc("/text/", handlerText) http.HandleFunc("/binary/", handlerBinary) http.HandleFunc("/rev/", handlerRevision) + http.HandleFunc("/attachment/", handlerAttachment) +} + +func handlerAttachment(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + var ( + hyphaName = HyphaNameFromRq(rq, "attachment") + h = hyphae.ByName(hyphaName) + u = user.FromRequest(rq) + ) + util.HTTP200Page(w, + views.BaseHTML( + fmt.Sprintf("Attachment of %s", util.BeautifulName(hyphaName)), + views.AttachmentMenuHTML(rq, h, u), + u)) } // handlerRevision displays a specific revision of text part a page diff --git a/main.go b/main.go index ba4ce5b..f8780b1 100644 --- a/main.go +++ b/main.go @@ -178,7 +178,7 @@ func main() { // See http_admin.go for /admin, /admin/* initAdmin() - // See http_readers.go for /page/, /hypha/, /text/, /binary/ + // See http_readers.go for /page/, /hypha/, /text/, /binary/, /attachment/ // See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/, /unattach-ask/, /unattach-confirm/ // See http_auth.go for /login, /login-data, /logout, /logout-confirm // See http_history.go for /history/, /recent-changes diff --git a/views/modal.qtpl b/views/modal.qtpl index 8ca4ec6..bb1a559 100644 --- a/views/modal.qtpl +++ b/views/modal.qtpl @@ -16,7 +16,7 @@ {% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %} {%= NavHTML(rq, hyphaName, "unattach-ask") %} {%= modalBegin( - "unattach-confirm", + "unattach", hyphaName, "", "Unattach "+util.BeautifulName(hyphaName)+"?") %} diff --git a/views/modal.qtpl.go b/views/modal.qtpl.go index 9e81e54..3efb837 100644 --- a/views/modal.qtpl.go +++ b/views/modal.qtpl.go @@ -94,7 +94,7 @@ func StreamUnattachAskHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaNam `) //line views/modal.qtpl:18 streammodalBegin(qw422016, - "unattach-confirm", + "unattach", hyphaName, "", "Unattach "+util.BeautifulName(hyphaName)+"?") diff --git a/views/nav.qtpl b/views/nav.qtpl index 900b8e1..cecdc63 100644 --- a/views/nav.qtpl +++ b/views/nav.qtpl @@ -12,6 +12,7 @@ type navEntry struct { var navEntries = []navEntry{ {"page", "Hypha"}, {"edit", "Edit"}, + {"attachment", "Attachment"}, {"history", "History"}, {"revision", "NOT REACHED"}, {"rename-ask", "Rename"}, diff --git a/views/nav.qtpl.go b/views/nav.qtpl.go index 82c062d..b1cabdb 100644 --- a/views/nav.qtpl.go +++ b/views/nav.qtpl.go @@ -40,6 +40,7 @@ type navEntry struct { var navEntries = []navEntry{ {"page", "Hypha"}, {"edit", "Edit"}, + {"attachment", "Attachment"}, {"history", "History"}, {"revision", "NOT REACHED"}, {"rename-ask", "Rename"}, @@ -47,268 +48,268 @@ var navEntries = []navEntry{ {"text", "Raw text"}, } -//line views/nav.qtpl:23 +//line views/nav.qtpl:24 func StreamNavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line views/nav.qtpl:23 +//line views/nav.qtpl:24 qw422016.N().S(` `) -//line views/nav.qtpl:25 +//line views/nav.qtpl:26 u := user.FromRequest(rq) -//line views/nav.qtpl:26 +//line views/nav.qtpl:27 qw422016.N().S(` `) -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 } -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 func WriteNavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) { -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 StreamNavHTML(qw422016, rq, hyphaName, navType, revisionHash...) -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 qt422016.ReleaseWriter(qw422016) -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 } -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 func NavHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string { -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 qb422016 := qt422016.AcquireByteBuffer() -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 WriteNavHTML(qb422016, rq, hyphaName, navType, revisionHash...) -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 qs422016 := string(qb422016.B) -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 qt422016.ReleaseByteBuffer(qb422016) -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 return qs422016 -//line views/nav.qtpl:46 +//line views/nav.qtpl:47 } -//line views/nav.qtpl:48 +//line views/nav.qtpl:49 func StreamUserMenuHTML(qw422016 *qt422016.Writer, u *user.User) { -//line views/nav.qtpl:48 +//line views/nav.qtpl:49 qw422016.N().S(` `) -//line views/nav.qtpl:49 +//line views/nav.qtpl:50 if user.AuthUsed { -//line views/nav.qtpl:49 +//line views/nav.qtpl:50 qw422016.N().S(`
  • `) -//line views/nav.qtpl:51 +//line views/nav.qtpl:52 if u.Group == "anon" { -//line views/nav.qtpl:51 +//line views/nav.qtpl:52 qw422016.N().S(` Login `) -//line views/nav.qtpl:53 +//line views/nav.qtpl:54 } else { -//line views/nav.qtpl:53 +//line views/nav.qtpl:54 qw422016.N().S(` `) -//line views/nav.qtpl:54 +//line views/nav.qtpl:55 qw422016.E().S(u.Name) -//line views/nav.qtpl:54 +//line views/nav.qtpl:55 qw422016.N().S(` `) -//line views/nav.qtpl:55 +//line views/nav.qtpl:56 } -//line views/nav.qtpl:55 +//line views/nav.qtpl:56 qw422016.N().S(`
    • `) -//line views/nav.qtpl:57 +//line views/nav.qtpl:58 } -//line views/nav.qtpl:57 +//line views/nav.qtpl:58 qw422016.N().S(` `) -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 } -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 func WriteUserMenuHTML(qq422016 qtio422016.Writer, u *user.User) { -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 StreamUserMenuHTML(qw422016, u) -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 qt422016.ReleaseWriter(qw422016) -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 } -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 func UserMenuHTML(u *user.User) string { -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 qb422016 := qt422016.AcquireByteBuffer() -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 WriteUserMenuHTML(qb422016, u) -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 qs422016 := string(qb422016.B) -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 qt422016.ReleaseByteBuffer(qb422016) -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 return qs422016 -//line views/nav.qtpl:58 +//line views/nav.qtpl:59 } -//line views/nav.qtpl:60 +//line views/nav.qtpl:61 func StreamRelativeHyphaeHTML(qw422016 *qt422016.Writer, relatives string) { -//line views/nav.qtpl:60 +//line views/nav.qtpl:61 qw422016.N().S(` `) -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 } -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 func WriteRelativeHyphaeHTML(qq422016 qtio422016.Writer, relatives string) { -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 StreamRelativeHyphaeHTML(qw422016, relatives) -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 qt422016.ReleaseWriter(qw422016) -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 } -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 func RelativeHyphaeHTML(relatives string) string { -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 qb422016 := qt422016.AcquireByteBuffer() -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 WriteRelativeHyphaeHTML(qb422016, relatives) -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 qs422016 := string(qb422016.B) -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 qt422016.ReleaseByteBuffer(qb422016) -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 return qs422016 -//line views/nav.qtpl:65 +//line views/nav.qtpl:66 } -//line views/nav.qtpl:67 +//line views/nav.qtpl:68 func StreamSubhyphaeHTML(qw422016 *qt422016.Writer, subhyphae string) { -//line views/nav.qtpl:67 +//line views/nav.qtpl:68 qw422016.N().S(` `) -//line views/nav.qtpl:68 +//line views/nav.qtpl:69 if strings.TrimSpace(subhyphae) != "" { -//line views/nav.qtpl:68 +//line views/nav.qtpl:69 qw422016.N().S(`

    Subhyphae

    `) -//line views/nav.qtpl:77 +//line views/nav.qtpl:78 } -//line views/nav.qtpl:77 +//line views/nav.qtpl:78 qw422016.N().S(` `) -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 } -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 func WriteSubhyphaeHTML(qq422016 qtio422016.Writer, subhyphae string) { -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 StreamSubhyphaeHTML(qw422016, subhyphae) -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 qt422016.ReleaseWriter(qw422016) -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 } -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 func SubhyphaeHTML(subhyphae string) string { -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 qb422016 := qt422016.AcquireByteBuffer() -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 WriteSubhyphaeHTML(qb422016, subhyphae) -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 qs422016 := string(qb422016.B) -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 qt422016.ReleaseByteBuffer(qb422016) -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 return qs422016 -//line views/nav.qtpl:78 +//line views/nav.qtpl:79 } diff --git a/views/readers.qtpl b/views/readers.qtpl index 9bbdb9e..2a80c4f 100644 --- a/views/readers.qtpl +++ b/views/readers.qtpl @@ -1,10 +1,75 @@ {% import "net/http" %} +{% import "strings" %} {% import "path" %} +{% import "os" %} {% import "github.com/bouncepaw/mycorrhiza/hyphae" %} +{% import "github.com/bouncepaw/mycorrhiza/mimetype" %} +{% import "github.com/bouncepaw/mycorrhiza/tree" %} {% import "github.com/bouncepaw/mycorrhiza/user" %} {% import "github.com/bouncepaw/mycorrhiza/util" %} -{% import "github.com/bouncepaw/mycorrhiza/tree" %} + +{% func AttachmentMenuHTML(rq *http.Request, h *hyphae.Hypha, u *user.User) %} +{%= NavHTML(rq, h.Name, "attachment") %} +
    +
    +

    Attachment of {%s util.BeautifulName(h.Name) %}

    + {% if h.BinaryPath == "" %} +

    This hypha has no attachment, you can upload it here.

    + {% else %} +

    You can manage the hypha's attachment on this page.

    + {% endif %} + +
    + + {% if h.BinaryPath != "" %} + {% code + mime := mimetype.FromExtension(path.Ext(h.BinaryPath)) + fileinfo, err := os.Stat(h.BinaryPath) %} + {% if err == nil %} +
    + Stat +

    File size: {%dl fileinfo.Size() %} bytes

    +

    MIME type: {%s mime %}

    +
    + {% endif %} + + {% if strings.HasPrefix(mime, "image/") %} +
    + Include +

    This attachment is an image. To include it to a page, use a syntax like this:

    + 
    img { {%s h.Name %} }
    +
    + {% endif %} + {% endif %} + + {% if u.CanProceed("upload-binary") %} +
    +
    + Attach +

    You can upload a new attachment. Please do not upload too big pictures unless you need to because no server-side compression is done and other readers may not want to wait for big pictures to load.

    + + +
    +
    + {% endif %} + + {% if h.BinaryPath != "" && u.CanProceed("unattach-confirm") %} +
    +
    + Unattach +

    Please note that you don't have to unattach before uploading a new attachment.

    + +
    +
    + {% endif %} + +
    +
    +
    +{% endfunc %} If `contents` == "", a helpful message is shown instead. {% func HyphaHTML(rq *http.Request, h *hyphae.Hypha, contents string) %} @@ -18,6 +83,16 @@ If `contents` == "", a helpful message is shown instead. {%s= NaviTitleHTML(h) %} {% if contents == "" %}

    This hypha has no text. Why not create it?

    + {% if u := user.FromRequest(rq); (!user.AuthUsed || u.Group != "anon") && !h.Exists %} +
    + + + +
    +
    + {% endif %} {% else %} {%s= contents %} {% endif %} @@ -30,19 +105,6 @@ If `contents` == "", a helpful message is shown instead. {% endif %} -{% if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" %} -
    - {% if h.Exists && h.BinaryPath != "" %} - Unattach current attachment? - {% endif %} - -
    - - -
    -{% endif %} {%= SubhyphaeHTML(subhyphae) %}
    {%= RelativeHyphaeHTML(relatives) %} diff --git a/views/readers.qtpl.go b/views/readers.qtpl.go index fc358ff..4244b5c 100644 --- a/views/readers.qtpl.go +++ b/views/readers.qtpl.go @@ -8,276 +8,447 @@ package views import "net/http" //line views/readers.qtpl:2 +import "strings" + +//line views/readers.qtpl:3 import "path" //line views/readers.qtpl:4 -import "github.com/bouncepaw/mycorrhiza/hyphae" - -//line views/readers.qtpl:5 -import "github.com/bouncepaw/mycorrhiza/user" +import "os" //line views/readers.qtpl:6 -import "github.com/bouncepaw/mycorrhiza/util" +import "github.com/bouncepaw/mycorrhiza/hyphae" //line views/readers.qtpl:7 +import "github.com/bouncepaw/mycorrhiza/mimetype" + +//line views/readers.qtpl:8 import "github.com/bouncepaw/mycorrhiza/tree" -// If `contents` == "", a helpful message is shown instead. +//line views/readers.qtpl:9 +import "github.com/bouncepaw/mycorrhiza/user" //line views/readers.qtpl:10 +import "github.com/bouncepaw/mycorrhiza/util" + +//line views/readers.qtpl:12 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line views/readers.qtpl:10 +//line views/readers.qtpl:12 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line views/readers.qtpl:10 -func StreamHyphaHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents string) { -//line views/readers.qtpl:10 +//line views/readers.qtpl:12 +func StreamAttachmentMenuHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, u *user.User) { +//line views/readers.qtpl:12 qw422016.N().S(` `) -//line views/readers.qtpl:12 - relatives, subhyphae, prevHyphaName, nextHyphaName := tree.Tree(h.Name) - +//line views/readers.qtpl:13 + StreamNavHTML(qw422016, rq, h.Name, "attachment") //line views/readers.qtpl:13 qw422016.N().S(` +
    +
    +

    Attachment of `) +//line views/readers.qtpl:16 + qw422016.E().S(util.BeautifulName(h.Name)) +//line views/readers.qtpl:16 + qw422016.N().S(`

    + `) +//line views/readers.qtpl:17 + if h.BinaryPath == "" { +//line views/readers.qtpl:17 + qw422016.N().S(` +

    This hypha has no attachment, you can upload it here.

    + `) +//line views/readers.qtpl:19 + } else { +//line views/readers.qtpl:19 + qw422016.N().S(` +

    You can manage the hypha's attachment on this page.

    + `) +//line views/readers.qtpl:21 + } +//line views/readers.qtpl:21 + qw422016.N().S(` + +
    + + `) +//line views/readers.qtpl:25 + if h.BinaryPath != "" { +//line views/readers.qtpl:25 + qw422016.N().S(` + `) +//line views/readers.qtpl:27 + mime := mimetype.FromExtension(path.Ext(h.BinaryPath)) + fileinfo, err := os.Stat(h.BinaryPath) + +//line views/readers.qtpl:28 + qw422016.N().S(` + `) +//line views/readers.qtpl:29 + if err == nil { +//line views/readers.qtpl:29 + qw422016.N().S(` +
    + Stat +

    File size: `) +//line views/readers.qtpl:32 + qw422016.N().DL(fileinfo.Size()) +//line views/readers.qtpl:32 + qw422016.N().S(` bytes

    +

    MIME type: `) +//line views/readers.qtpl:33 + qw422016.E().S(mime) +//line views/readers.qtpl:33 + qw422016.N().S(`

    +
    + `) +//line views/readers.qtpl:35 + } +//line views/readers.qtpl:35 + qw422016.N().S(` + + `) +//line views/readers.qtpl:37 + if strings.HasPrefix(mime, "image/") { +//line views/readers.qtpl:37 + qw422016.N().S(` +
    + Include +

    This attachment is an image. To include it to a page, use a syntax like this:

    + 
    img { `)
+//line views/readers.qtpl:41
+			qw422016.E().S(h.Name)
+//line views/readers.qtpl:41
+			qw422016.N().S(` }
    +
    + `) +//line views/readers.qtpl:43 + } +//line views/readers.qtpl:43 + qw422016.N().S(` + `) +//line views/readers.qtpl:44 + } +//line views/readers.qtpl:44 + qw422016.N().S(` + + `) +//line views/readers.qtpl:46 + if u.CanProceed("upload-binary") { +//line views/readers.qtpl:46 + qw422016.N().S(` +
    +
    + Attach +

    You can upload a new attachment. Please do not upload too big pictures unless you need to because no server-side compression is done and other readers may not want to wait for big pictures to load.

    + + +
    +
    + `) +//line views/readers.qtpl:57 + } +//line views/readers.qtpl:57 + qw422016.N().S(` + + `) +//line views/readers.qtpl:59 + if h.BinaryPath != "" && u.CanProceed("unattach-confirm") { +//line views/readers.qtpl:59 + qw422016.N().S(` +
    +
    + Unattach +

    Please note that you don't have to unattach before uploading a new attachment.

    + +
    +
    + `) +//line views/readers.qtpl:67 + } +//line views/readers.qtpl:67 + qw422016.N().S(` + +
    +
    +
    `) -//line views/readers.qtpl:14 +//line views/readers.qtpl:72 +} + +//line views/readers.qtpl:72 +func WriteAttachmentMenuHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, u *user.User) { +//line views/readers.qtpl:72 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/readers.qtpl:72 + StreamAttachmentMenuHTML(qw422016, rq, h, u) +//line views/readers.qtpl:72 + qt422016.ReleaseWriter(qw422016) +//line views/readers.qtpl:72 +} + +//line views/readers.qtpl:72 +func AttachmentMenuHTML(rq *http.Request, h *hyphae.Hypha, u *user.User) string { +//line views/readers.qtpl:72 + qb422016 := qt422016.AcquireByteBuffer() +//line views/readers.qtpl:72 + WriteAttachmentMenuHTML(qb422016, rq, h, u) +//line views/readers.qtpl:72 + qs422016 := string(qb422016.B) +//line views/readers.qtpl:72 + qt422016.ReleaseByteBuffer(qb422016) +//line views/readers.qtpl:72 + return qs422016 +//line views/readers.qtpl:72 +} + +// If `contents` == "", a helpful message is shown instead. + +//line views/readers.qtpl:75 +func StreamHyphaHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents string) { +//line views/readers.qtpl:75 + qw422016.N().S(` +`) +//line views/readers.qtpl:77 + relatives, subhyphae, prevHyphaName, nextHyphaName := tree.Tree(h.Name) + +//line views/readers.qtpl:78 + qw422016.N().S(` +`) +//line views/readers.qtpl:79 StreamNavHTML(qw422016, rq, h.Name, "page") -//line views/readers.qtpl:14 +//line views/readers.qtpl:79 qw422016.N().S(`
    `) -//line views/readers.qtpl:18 +//line views/readers.qtpl:83 qw422016.N().S(NaviTitleHTML(h)) -//line views/readers.qtpl:18 +//line views/readers.qtpl:83 qw422016.N().S(` `) -//line views/readers.qtpl:19 +//line views/readers.qtpl:84 if contents == "" { -//line views/readers.qtpl:19 +//line views/readers.qtpl:84 qw422016.N().S(`

    This hypha has no text. Why not create it?

    `) -//line views/readers.qtpl:21 - } else { -//line views/readers.qtpl:21 - qw422016.N().S(` - `) -//line views/readers.qtpl:22 - qw422016.N().S(contents) -//line views/readers.qtpl:22 +//line views/readers.qtpl:86 + if u := user.FromRequest(rq); (!user.AuthUsed || u.Group != "anon") && !h.Exists { +//line views/readers.qtpl:86 + qw422016.N().S(` +
    + + + +
    +
    + `) +//line views/readers.qtpl:95 + } +//line views/readers.qtpl:95 qw422016.N().S(` `) -//line views/readers.qtpl:23 +//line views/readers.qtpl:96 + } else { +//line views/readers.qtpl:96 + qw422016.N().S(` + `) +//line views/readers.qtpl:97 + qw422016.N().S(contents) +//line views/readers.qtpl:97 + qw422016.N().S(` + `) +//line views/readers.qtpl:98 } -//line views/readers.qtpl:23 +//line views/readers.qtpl:98 qw422016.N().S(`
    `) -//line views/readers.qtpl:26 +//line views/readers.qtpl:101 if prevHyphaName != "" { -//line views/readers.qtpl:26 +//line views/readers.qtpl:101 qw422016.N().S(` `) -//line views/readers.qtpl:28 +//line views/readers.qtpl:103 } -//line views/readers.qtpl:28 +//line views/readers.qtpl:103 qw422016.N().S(` `) -//line views/readers.qtpl:29 +//line views/readers.qtpl:104 if nextHyphaName != "" { -//line views/readers.qtpl:29 +//line views/readers.qtpl:104 qw422016.N().S(` `) -//line views/readers.qtpl:31 +//line views/readers.qtpl:106 } -//line views/readers.qtpl:31 +//line views/readers.qtpl:106 qw422016.N().S(`
    `) -//line views/readers.qtpl:33 - if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" { -//line views/readers.qtpl:33 - qw422016.N().S(` -
    - `) -//line views/readers.qtpl:37 - if h.Exists && h.BinaryPath != "" { -//line views/readers.qtpl:37 - qw422016.N().S(` - Unattach current attachment? - `) -//line views/readers.qtpl:39 - } -//line views/readers.qtpl:39 - qw422016.N().S(` - -
    - - -
    -`) -//line views/readers.qtpl:45 - } -//line views/readers.qtpl:45 - qw422016.N().S(` -`) -//line views/readers.qtpl:46 +//line views/readers.qtpl:108 StreamSubhyphaeHTML(qw422016, subhyphae) -//line views/readers.qtpl:46 +//line views/readers.qtpl:108 qw422016.N().S(`
    `) -//line views/readers.qtpl:48 +//line views/readers.qtpl:110 StreamRelativeHyphaeHTML(qw422016, relatives) -//line views/readers.qtpl:48 +//line views/readers.qtpl:110 qw422016.N().S(` `) -//line views/readers.qtpl:49 +//line views/readers.qtpl:111 StreamBackLinksHTML(qw422016, h) -//line views/readers.qtpl:49 +//line views/readers.qtpl:111 qw422016.N().S(`
    `) -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 } -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 func WriteHyphaHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents string) { -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 StreamHyphaHTML(qw422016, rq, h, contents) -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 qt422016.ReleaseWriter(qw422016) -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 } -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 func HyphaHTML(rq *http.Request, h *hyphae.Hypha, contents string) string { -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 qb422016 := qt422016.AcquireByteBuffer() -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 WriteHyphaHTML(qb422016, rq, h, contents) -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 qs422016 := string(qb422016.B) -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 qt422016.ReleaseByteBuffer(qb422016) -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 return qs422016 -//line views/readers.qtpl:51 +//line views/readers.qtpl:113 } -//line views/readers.qtpl:53 +//line views/readers.qtpl:115 func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, revHash string) { -//line views/readers.qtpl:53 +//line views/readers.qtpl:115 qw422016.N().S(` `) -//line views/readers.qtpl:55 +//line views/readers.qtpl:117 relatives, subhyphae, _, _ := tree.Tree(h.Name) -//line views/readers.qtpl:56 +//line views/readers.qtpl:118 qw422016.N().S(` `) -//line views/readers.qtpl:57 +//line views/readers.qtpl:119 StreamNavHTML(qw422016, rq, h.Name, "revision", revHash) -//line views/readers.qtpl:57 +//line views/readers.qtpl:119 qw422016.N().S(`

    Please note that viewing binary parts of hyphae is not supported in history for now.

    `) -//line views/readers.qtpl:62 +//line views/readers.qtpl:124 qw422016.N().S(NaviTitleHTML(h)) -//line views/readers.qtpl:62 +//line views/readers.qtpl:124 qw422016.N().S(` `) -//line views/readers.qtpl:63 +//line views/readers.qtpl:125 qw422016.N().S(contents) -//line views/readers.qtpl:63 +//line views/readers.qtpl:125 qw422016.N().S(`
    `) -//line views/readers.qtpl:65 +//line views/readers.qtpl:127 StreamSubhyphaeHTML(qw422016, subhyphae) -//line views/readers.qtpl:65 +//line views/readers.qtpl:127 qw422016.N().S(`
    `) -//line views/readers.qtpl:67 +//line views/readers.qtpl:129 StreamRelativeHyphaeHTML(qw422016, relatives) -//line views/readers.qtpl:67 +//line views/readers.qtpl:129 qw422016.N().S(`
    `) -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 } -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, contents, revHash string) { -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 StreamRevisionHTML(qw422016, rq, h, contents, revHash) -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 qt422016.ReleaseWriter(qw422016) -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 } -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 func RevisionHTML(rq *http.Request, h *hyphae.Hypha, contents, revHash string) string { -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 qb422016 := qt422016.AcquireByteBuffer() -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 WriteRevisionHTML(qb422016, rq, h, contents, revHash) -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 qs422016 := string(qb422016.B) -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 qt422016.ReleaseByteBuffer(qb422016) -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 return qs422016 -//line views/readers.qtpl:69 +//line views/readers.qtpl:131 } From f33eefe5027a34484dbe6c42f9367449ee590f10 Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Wed, 24 Feb 2021 22:37:34 +0500 Subject: [PATCH 46/53] Change the wording slightly --- views/readers.qtpl | 4 ++-- views/readers.qtpl.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/views/readers.qtpl b/views/readers.qtpl index 2a80c4f..08e6eb9 100644 --- a/views/readers.qtpl +++ b/views/readers.qtpl @@ -37,7 +37,7 @@ {% if strings.HasPrefix(mime, "image/") %}
    Include -

    This attachment is an image. To include it to a page, use a syntax like this:

    +

    This attachment is an image. To include it n a hypha, use a syntax like this:

    img { {%s h.Name %} }
    {% endif %} @@ -49,7 +49,7 @@ class="modal amnt-menu-block">
    Attach -

    You can upload a new attachment. Please do not upload too big pictures unless you need to because no server-side compression is done and other readers may not want to wait for big pictures to load.

    +

    You can upload a new attachment. Please do not upload too big pictures unless you need to because may not want to wait for big pictures to load.

    diff --git a/views/readers.qtpl.go b/views/readers.qtpl.go index 4244b5c..f9921e4 100644 --- a/views/readers.qtpl.go +++ b/views/readers.qtpl.go @@ -123,7 +123,7 @@ func StreamAttachmentMenuHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hy qw422016.N().S(`
    Include -

    This attachment is an image. To include it to a page, use a syntax like this:

    +

    This attachment is an image. To include it n a hypha, use a syntax like this:

    img { `)
 //line views/readers.qtpl:41
 			qw422016.E().S(h.Name)
@@ -155,7 +155,7 @@ func StreamAttachmentMenuHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hy
 			class="modal amnt-menu-block">
 		
    
 			Attach
-			
    You can upload a new attachment. Please do not upload too big pictures unless you need to because no server-side compression is done and other readers may not want to wait for big pictures to load.
    
+			
    You can upload a new attachment. Please do not upload too big pictures unless you need to because may not want to wait for big pictures to load.
    
 			
 			
 		
    

From 9052f31e1faedccfdb98808588beea55c4a18560 Mon Sep 17 00:00:00 2001
From: bouncepaw 
Date: Fri, 26 Feb 2021 21:43:45 +0500
Subject: [PATCH 47/53] Fix the bug with git locking

---
 history/operations.go |  8 ++++++--
 shroom/delete.go      |  2 +-
 shroom/rename.go      |  4 ++--
 shroom/unattach.go    |  5 +++--
 shroom/upload.go      | 16 ++++++++--------
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/history/operations.go b/history/operations.go
index b815c28..97e7aa7 100644
--- a/history/operations.go
+++ b/history/operations.go
@@ -59,12 +59,16 @@ func (hop *HistoryOp) gitop(args ...string) *HistoryOp {
 	return hop
 }
 
-// WithError appends the `err` to the list of errors.
-func (hop *HistoryOp) WithError(err error) *HistoryOp {
+// WithErr appends the `err` to the list of errors.
+func (hop *HistoryOp) WithErr(err error) *HistoryOp {
 	hop.Errs = append(hop.Errs, err)
 	return hop
 }
 
+func (hop *HistoryOp) WithErrAbort(err error) *HistoryOp {
+	return hop.WithErr(err).Abort()
+}
+
 // WithFilesRemoved git-rm-s all passed `paths`. Paths can be rooted or not. Paths that are empty strings are ignored.
 func (hop *HistoryOp) WithFilesRemoved(paths ...string) *HistoryOp {
 	args := []string{"rm", "--quiet", "--"}
diff --git a/shroom/delete.go b/shroom/delete.go
index f88f017..2341351 100644
--- a/shroom/delete.go
+++ b/shroom/delete.go
@@ -13,7 +13,7 @@ func DeleteHypha(u *user.User, h *hyphae.Hypha) (hop *history.HistoryOp, errtitl
 	hop = history.Operation(history.TypeDeleteHypha)
 
 	if err, errtitle := CanDelete(u, h); errtitle != "" {
-		hop.WithError(err).Abort()
+		hop.WithErrAbort(err)
 		return hop, errtitle
 	}
 
diff --git a/shroom/rename.go b/shroom/rename.go
index 7689538..1f861b2 100644
--- a/shroom/rename.go
+++ b/shroom/rename.go
@@ -37,11 +37,11 @@ func RenameHypha(h *hyphae.Hypha, newHypha *hyphae.Hypha, recursive bool, u *use
 	hop = history.Operation(history.TypeRenameHypha)
 
 	if err, errtitle := CanRename(u, h); errtitle != "" {
-		hop.WithError(err)
+		hop.WithErrAbort(err)
 		return hop, errtitle
 	}
 	if err, errtitle := canRenameThisToThat(h, newHypha, u); errtitle != "" {
-		hop.WithError(err)
+		hop.WithErrAbort(err)
 		return hop, errtitle
 	}
 
diff --git a/shroom/unattach.go b/shroom/unattach.go
index 5ed5b0f..60f31e6 100644
--- a/shroom/unattach.go
+++ b/shroom/unattach.go
@@ -14,7 +14,7 @@ func UnattachHypha(u *user.User, h *hyphae.Hypha) (hop *history.HistoryOp, errti
 	hop = history.Operation(history.TypeUnattachHypha)
 
 	if err, errtitle := CanUnattach(u, h); errtitle != "" {
-		hop.WithError(err).Abort()
+		hop.WithErrAbort(err)
 		return hop, errtitle
 	}
 
@@ -26,7 +26,8 @@ func UnattachHypha(u *user.User, h *hyphae.Hypha) (hop *history.HistoryOp, errti
 
 	if len(hop.Errs) > 0 {
 		rejectUnattachLog(h, u, "fail")
-		return hop.WithError(errors.New(fmt.Sprintf("Could not unattach this hypha due to internal server errors: %v", hop.Errs))), "Error"
+		// FIXME: something may be wrong here
+		return hop.WithErrAbort(errors.New(fmt.Sprintf("Could not unattach this hypha due to internal server errors: %v", hop.Errs))), "Error"
 	}
 
 	if h.BinaryPath != "" {
diff --git a/shroom/upload.go b/shroom/upload.go
index 08634b2..c72ec9a 100644
--- a/shroom/upload.go
+++ b/shroom/upload.go
@@ -25,10 +25,10 @@ func UploadText(h *hyphae.Hypha, data []byte, u *user.User) (hop *history.Histor
 	}
 
 	if err, errtitle := CanEdit(u, h); err != nil {
-		return hop.WithError(err), errtitle
+		return hop.WithErrAbort(err), errtitle
 	}
 	if len(data) == 0 {
-		return hop.WithError(errors.New("No data passed")), "Empty"
+		return hop.WithErrAbort(errors.New("No data passed")), "Empty"
 	}
 
 	return uploadHelp(h, hop, ".myco", data, u)
@@ -41,13 +41,13 @@ func UploadBinary(h *hyphae.Hypha, mime string, file multipart.File, u *user.Use
 	)
 
 	if err != nil {
-		return hop.WithError(err), err.Error()
+		return hop.WithErrAbort(err), err.Error()
 	}
 	if err, errtitle := CanAttach(u, h); err != nil {
-		return hop.WithError(err), errtitle
+		return hop.WithErrAbort(err), errtitle
 	}
 	if len(data) == 0 {
-		return hop.WithError(errors.New("No data passed")), "Empty"
+		return hop.WithErrAbort(errors.New("No data passed")), "Empty"
 	}
 
 	return uploadHelp(h, hop, mimetype.ToExtension(mime), data, u)
@@ -64,16 +64,16 @@ func uploadHelp(h *hyphae.Hypha, hop *history.HistoryOp, ext string, data []byte
 	}
 
 	if err := os.MkdirAll(filepath.Dir(fullPath), 0777); err != nil {
-		return hop.WithError(err), err.Error()
+		return hop.WithErrAbort(err), err.Error()
 	}
 
 	if err := ioutil.WriteFile(fullPath, data, 0644); err != nil {
-		return hop.WithError(err), err.Error()
+		return hop.WithErrAbort(err), err.Error()
 	}
 
 	if h.Exists && *originalFullPath != fullPath && *originalFullPath != "" {
 		if err := history.Rename(*originalFullPath, fullPath); err != nil {
-			return hop.WithError(err), err.Error()
+			return hop.WithErrAbort(err), err.Error()
 		}
 		log.Println("Move", *originalFullPath, "to", fullPath)
 	}

From 2d14d3060328ba3d1b3d7ee046d405516b7e7a45 Mon Sep 17 00:00:00 2001
From: bouncepaw 
Date: Fri, 26 Feb 2021 21:45:52 +0500
Subject: [PATCH 48/53] Rename Makefile targets

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f1d598f..0b9db7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 run: build
 	./mycorrhiza metarrhiza
 
-run_with_fixed_auth: build
+auth_run: build
 	./mycorrhiza -auth-method fixed metarrhiza
 
-run_with_gemini: build
+gemini_run: build
 	./mycorrhiza -gemini-cert-path "." metarrhiza
 
 build:

From f45758cb0eb8f7678298202b0ade80446f345085 Mon Sep 17 00:00:00 2001
From: bouncepaw 
Date: Sat, 27 Feb 2021 13:42:32 +0500
Subject: [PATCH 49/53] Show only stems of names in the relative hyphae block

---
 tree/tree.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tree/tree.go b/tree/tree.go
index ab56d5f..dc3cf38 100644
--- a/tree/tree.go
+++ b/tree/tree.go
@@ -112,7 +112,7 @@ func Tree(hyphaName string) (relatives, subhyphae, prev, next string) {
 	for i, s := range siblings {
 		if s.name == hyphaName {
 			I = i
-			relatives += fmt.Sprintf(`
  • %s
    • `, util.BeautifulName(hyphaName))
+			relatives += fmt.Sprintf(`
  • %s
    • `, util.BeautifulName(path.Base(hyphaName)))
 		} else {
 			relatives += s.asHTML()
 		}

From fbf94975aabd7e922ba7a2aa6066e112ebb307f6 Mon Sep 17 00:00:00 2001
From: bouncepaw 
Date: Tue, 2 Mar 2021 21:36:57 +0500
Subject: [PATCH 50/53] Add anchor links

---
 assets/assets.qtpl.go |  8 +++-----
 assets/default.css    |  8 +++-----
 hyphae/hyphae.go      | 35 ++++++++++++++++++++++++++++++++++-
 link/link.go          |  8 +++++++-
 markup/lexer.go       |  5 ++++-
 shroom/rename.go      |  4 ++--
 util/util.go          | 19 +++++++++++++++++++
 7 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/assets/assets.qtpl.go b/assets/assets.qtpl.go
index 1b8fd71..160549b 100644
--- a/assets/assets.qtpl.go
+++ b/assets/assets.qtpl.go
@@ -134,6 +134,9 @@ blockquote { margin-left: 0; padding-left: 1rem; }
 
 article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
 main h1, main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; }
+.heading__link { text-decoration: none; display: inline-block; }
+.heading__link::after { width: 1rem; content: "§"; color: transparent; }
+.heading__link:hover::after, .heading__link:active::after { color: #999; }
 article p { margin: .5rem 0; }
 article ul, ol { padding-left: 1.5rem; margin: .5rem 0; }
 article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
@@ -291,12 +294,7 @@ mark { background: rgba(130, 80, 30, 5); color: inherit; }
 @media screen and (max-width: 800px) {
 	.hypha-tabs { background-color: #232323; }
 }
-@media screen and (min-width: 801px) {
-	/* .hypha-tabs__tab { border: 1px #ddd solid; } */
-	/* .hypha-tabs__tab_active { border-bottom: 1px white solid; } */
 }
-}
-
 
 .backlinks { display: none; }
 `)
diff --git a/assets/default.css b/assets/default.css
index d785cfc..9c93b48 100644
--- a/assets/default.css
+++ b/assets/default.css
@@ -109,6 +109,9 @@ blockquote { margin-left: 0; padding-left: 1rem; }
 
 article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
 main h1, main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; }
+.heading__link { text-decoration: none; display: inline-block; }
+.heading__link::after { width: 1rem; content: "§"; color: transparent; }
+.heading__link:hover::after, .heading__link:active::after { color: #999; }
 article p { margin: .5rem 0; }
 article ul, ol { padding-left: 1.5rem; margin: .5rem 0; }
 article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; }
@@ -266,11 +269,6 @@ mark { background: rgba(130, 80, 30, 5); color: inherit; }
 @media screen and (max-width: 800px) {
 	.hypha-tabs { background-color: #232323; }
 }
-@media screen and (min-width: 801px) {
-	/* .hypha-tabs__tab { border: 1px #ddd solid; } */
-	/* .hypha-tabs__tab_active { border-bottom: 1px white solid; } */
 }
-}
-
 
 .backlinks { display: none; }
diff --git a/hyphae/hyphae.go b/hyphae/hyphae.go
index ce2a3d9..59e2763 100644
--- a/hyphae/hyphae.go
+++ b/hyphae/hyphae.go
@@ -88,6 +88,10 @@ func (h *Hypha) Delete() {
 	DecrementCount()
 	byNamesMutex.Unlock()
 	h.Unlock()
+
+	for _, outlinkHypha := range h.OutLinks {
+		outlinkHypha.DropBackLink(h)
+	}
 }
 
 func (h *Hypha) RenameTo(newName string) {
@@ -113,7 +117,16 @@ func (h *Hypha) MergeIn(oh *Hypha) {
 	}
 }
 
-// Link related stuff:
+// ## Link related stuff
+// Notes in pseudocode and whatnot:
+// * (Reader h) does not mutate h => safe
+// * (Rename h) reuses the same hypha object => safe
+// * (Unattach h) and (Attach h) do not change (Backlinks h) => safe
+
+// * (Delete h) does not change (Backlinks h), but changes (Outlinks h), removing h from them => make it safe
+// * (Unattach h) and (Attach h) => h may start or stop existing => may change (Outlinks h) => make it safe
+// * (Edit h) => h may start existing => may change (Backlinks h) => make it safe
+// * (Edit h) may add or remove h to or from (Outlinks h) => make it safe
 
 func (h *Hypha) AddOutLink(oh *Hypha) (added bool) {
 	h.Lock()
@@ -140,3 +153,23 @@ func (h *Hypha) AddBackLink(bh *Hypha) (added bool) {
 	h.BackLinks = append(h.BackLinks, bh)
 	return true
 }
+
+func (h *Hypha) DropBackLink(bh *Hypha) {
+	h.Lock()
+	defer h.Unlock()
+
+	if len(h.BackLinks) <= 1 {
+		h.BackLinks = make([]*Hypha, 0)
+		return
+	}
+	lastBackLinkIndex := len(h.BackLinks)
+	for i, backlink := range h.BackLinks {
+		if backlink == bh {
+			if i != lastBackLinkIndex {
+				h.BackLinks[i] = h.BackLinks[lastBackLinkIndex]
+			}
+			h.BackLinks = h.BackLinks[:lastBackLinkIndex]
+			return
+		}
+	}
+}
diff --git a/link/link.go b/link/link.go
index 8771ca9..6fe3323 100644
--- a/link/link.go
+++ b/link/link.go
@@ -32,6 +32,8 @@ type Link struct {
 	Kind               LinkType
 	DestinationUnknown bool
 
+	// #...
+	Anchor   string
 	Protocol string
 	// How the link address looked originally in source text.
 	SrcAddress string
@@ -66,7 +68,7 @@ func (l *Link) Href() string {
 	case LinkExternal, LinkLocalRoot:
 		return l.Address
 	default:
-		return "/hypha/" + l.Address
+		return "/hypha/" + l.Address + l.Anchor
 	}
 }
 
@@ -117,6 +119,10 @@ func From(address, display, hyphaName string) *Link {
 	case strings.HasPrefix(address, "../"):
 		link.Kind = LinkLocalHypha
 		link.Address = util.CanonicalName(path.Join(path.Dir(hyphaName), address[3:]))
+	case strings.HasPrefix(address, "#"):
+		link.Kind = LinkLocalHypha
+		link.Address = util.CanonicalName(hyphaName)
+		link.Anchor = address
 	default:
 		link.Kind = LinkLocalHypha
 		link.Address = util.CanonicalName(address)
diff --git a/markup/lexer.go b/markup/lexer.go
index 607393f..ef178b0 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"html"
 	"strings"
+
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 // HyphaExists holds function that checks that a hypha is present.
@@ -83,7 +85,8 @@ func lineToAST(line string, state *GemLexerState, ast *[]Line) {
 		return strings.HasPrefix(line, token)
 	}
 	addHeading := func(i int) {
-		addLine(fmt.Sprintf("%s", i, state.id, ParagraphToHtml(state.name, line[i+1:]), i))
+		id := util.LettersNumbersOnly(line[i+1:])
+		addLine(fmt.Sprintf(`%s`, i, state.id, ParagraphToHtml(state.name, line[i+1:]), id, id, i))
 	}
 
 	// Beware! Usage of goto. Some may say it is considered evil but in this case it helped to make a better-structured code.
diff --git a/shroom/rename.go b/shroom/rename.go
index 1f861b2..a2d44da 100644
--- a/shroom/rename.go
+++ b/shroom/rename.go
@@ -89,7 +89,7 @@ func renamingPairs(hyphaeToRename []*hyphae.Hypha, replaceName func(string) stri
 	renameMap := make(map[string]string)
 	newNames := make([]string, len(hyphaeToRename))
 	for _, h := range hyphaeToRename {
-		h.RLock()
+		h.Lock()
 		newNames = append(newNames, replaceName(h.Name))
 		if h.TextPath != "" {
 			renameMap[h.TextPath] = replaceName(h.TextPath)
@@ -97,7 +97,7 @@ func renamingPairs(hyphaeToRename []*hyphae.Hypha, replaceName func(string) stri
 		if h.BinaryPath != "" {
 			renameMap[h.BinaryPath] = replaceName(h.BinaryPath)
 		}
-		h.RUnlock()
+		h.Unlock()
 	}
 	if firstFailure, ok := hyphae.AreFreeNames(newNames...); !ok {
 		return nil, errors.New("Hypha " + firstFailure + " already exists")
diff --git a/util/util.go b/util/util.go
index d7b90a4..6b7590f 100644
--- a/util/util.go
+++ b/util/util.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
+	"unicode"
 )
 
 var (
@@ -22,6 +23,24 @@ var (
 	GeminiCertPath       string
 )
 
+// LettersNumbersOnly keeps letters and numbers only in the given string.
+func LettersNumbersOnly(s string) string {
+	var (
+		ret            strings.Builder
+		usedUnderscore bool
+	)
+	for _, r := range s {
+		if unicode.IsLetter(r) || unicode.IsNumber(r) {
+			ret.WriteRune(r)
+			usedUnderscore = false
+		} else if !usedUnderscore {
+			ret.WriteRune('_')
+			usedUnderscore = true
+		}
+	}
+	return strings.Trim(ret.String(), "_")
+}
+
 // ShorterPath is used by handlerList to display shorter path to the files. It simply strips WikiDir.
 func ShorterPath(path string) string {
 	if strings.HasPrefix(path, WikiDir) {

From 8dfd2fcf9bdfe9957106d4ded4cec39b864ce8af Mon Sep 17 00:00:00 2001
From: hugmouse 
Date: Fri, 5 Mar 2021 14:34:56 +0800
Subject: [PATCH 51/53] Fix lexer for "----" (
    ) case

The point is that there may be another character in the string.
For example, a space or a line break.

Because we check the whole string, not the first 4 characters - we can ignore the variant where it can be "----\s" or "----\r\n" and make the wrong markup.

Alternatively: use `startsWith("----")`, but this is a bit more expensive operation.
---
 markup/lexer.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markup/lexer.go b/markup/lexer.go
index 607393f..fbd87fc 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -235,7 +235,7 @@ normalState:
 	case startsWith("<="):
 		addParagraphIfNeeded()
 		addLine(parseTransclusion(line, state.name))
-	case line == "----":
+	case line[:4] == "----":
 		addParagraphIfNeeded()
 		*ast = append(*ast, Line{id: -1, contents: "
    "})
 	case MatchesImg(line):

From 62c616985d8bb70898fc13093d2bccb454ea82bd Mon Sep 17 00:00:00 2001
From: hugmouse 
Date: Fri, 5 Mar 2021 16:29:39 +0800
Subject: [PATCH 52/53] Replace old method with new that is a little
 overcomplicated

---
 markup/hr.go    | 34 ++++++++++++++++++++++++++++++++++
 markup/lexer.go |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 markup/hr.go

diff --git a/markup/hr.go b/markup/hr.go
new file mode 100644
index 0000000..278138a
--- /dev/null
+++ b/markup/hr.go
@@ -0,0 +1,34 @@
+package markup
+
+import (
+	"unicode"
+)
+
+// MatchesHorizontalLine checks if the string can be interpreted as suitable for rendering as 
    .
+//
+// The rule is: if there are more than 4 characters "-" in the string, then make it a horizontal line.
+// Otherwise it is a paragraph (
    ).
+func MatchesHorizontalLine(line string) bool {
+	counter := 0
+
+	// Check initially that the symbol is "-". If it is not a "-", it is most likely a space or another character.
+	// With unicode.IsLetter() we can separate spaces and characters.
+	for _, ch := range line {
+		if ch == '-' {
+			counter++
+			continue
+		}
+		// If we bump into any other character (letter) in the line, it is immediately an incorrect horizontal line.
+		// There is no point in counting further, we end the loop.
+		if unicode.IsLetter(ch) {
+			counter = 0
+			break
+		}
+	}
+
+	if counter >= 4 {
+		return true
+	}
+
+	return false
+}
diff --git a/markup/lexer.go b/markup/lexer.go
index fbd87fc..bf077e7 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -235,7 +235,7 @@ normalState:
 	case startsWith("<="):
 		addParagraphIfNeeded()
 		addLine(parseTransclusion(line, state.name))
-	case line[:4] == "----":
+	case MatchesHorizontalLine(line):
 		addParagraphIfNeeded()
 		*ast = append(*ast, Line{id: -1, contents: "
    "})
 	case MatchesImg(line):

From f6a41b4818d854543f851aca8d423d9e7103d941 Mon Sep 17 00:00:00 2001
From: bouncepaw 
Date: Fri, 5 Mar 2021 14:39:33 +0500
Subject: [PATCH 53/53] Some adjusting before merging

---
 README.md        | 3 +++
 views/stuff.qtpl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d092c4c..d7269e6 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,8 @@ Options:
         What auth method to use. Variants: "none", "fixed" (default "none")
   -fixed-credentials-path string
         Used when -auth-method=fixed. Path to file with user credentials. (default "mycocredentials.json")
+  -gemini-cert-path string
+        Directory where you store Gemini certificates. Leave empty if you don't want to use Gemini.
   -header-links-hypha string
         Optional hypha that overrides the header links
   -home string
@@ -57,6 +59,7 @@ Options:
 * Hyphae can be renamed (recursive renaming of subhyphae is also supported)
 * Light on resources
 * Authorization with pre-set credentials
+* Basic Gemini protocol support
 
 ## Contributing
 Help is always needed. We have a [tg chat](https://t.me/mycorrhizadev) where some development is coordinated. You can also sponsor on [boosty](https://boosty.to/bouncepaw). Feel free to open an issue or contact directly.
diff --git a/views/stuff.qtpl b/views/stuff.qtpl
index 5fbdc25..4359734 100644
--- a/views/stuff.qtpl
+++ b/views/stuff.qtpl
@@ -97,7 +97,7 @@ for u := range user.YieldUsers() {
 	
    
 		
    About {%s util.SiteName %}