- `, hyphaName)
- }
-}
-
-// 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 == "" {
- 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)
- }
- }
-}
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/files.go b/hyphae/files.go
new file mode 100644
index 0000000..56ccda5
--- /dev/null
+++ b/hyphae/files.go
@@ -0,0 +1,66 @@
+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 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) {
+ 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)
+ }
+
+ 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") {
+ 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, Exists: true}
+ )
+ if !skip {
+ if isText {
+ hypha.TextPath = hyphaPartPath
+ } else {
+ hypha.BinaryPath = hyphaPartPath
+ }
+ ch <- hypha
+ }
+ }
+}
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/hyphae/hyphae.go b/hyphae/hyphae.go
new file mode 100644
index 0000000..59e2763
--- /dev/null
+++ b/hyphae/hyphae.go
@@ -0,0 +1,175 @@
+// 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 (
+ "log"
+ "regexp"
+ "sync"
+)
+
+// HyphaPattern is a pattern which all hyphae must match.
+var HyphaPattern = regexp.MustCompile(`[^?!:#@><*|"\'&%{}]+`)
+
+type Hypha struct {
+ sync.RWMutex
+
+ Name string
+ Exists bool
+ TextPath string
+ BinaryPath string
+ OutLinks []*Hypha
+ BackLinks []*Hypha
+}
+
+var byNames = make(map[string]*Hypha)
+var byNamesMutex = sync.Mutex{}
+
+// 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) {
+ 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) {
+ hp := ByName(h.Name)
+
+ byNamesMutex.Lock()
+ defer byNamesMutex.Unlock()
+ if hp.Exists {
+ hp = h
+ } else {
+ h.Exists = true
+ byNames[h.Name] = h
+ IncrementCount()
+ }
+
+ return !hp.Exists
+}
+
+func (h *Hypha) InsertIfNew() (justCreated bool) {
+ if !h.Exists {
+ return h.Insert()
+ }
+ 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()
+ delete(byNames, h.Name)
+ DecrementCount()
+ byNamesMutex.Unlock()
+ h.Unlock()
+
+ for _, outlinkHypha := range h.OutLinks {
+ outlinkHypha.DropBackLink(h)
+ }
+}
+
+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
+ }
+}
+
+// ## 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()
+ 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
+}
+
+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/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/link/link.go b/link/link.go
new file mode 100644
index 0000000..6fe3323
--- /dev/null
+++ b/link/link.go
@@ -0,0 +1,132 @@
+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
+
+ // #...
+ Anchor string
+ 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
+}
+
+// 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 {
+ 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 for hyperlink. You should always use it.
+func (l *Link) Href() string {
+ switch l.Kind {
+ case LinkExternal, LinkLocalRoot:
+ return l.Address
+ default:
+ return "/hypha/" + l.Address + l.Anchor
+ }
+}
+
+// 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 {
+ address = strings.TrimSpace(address)
+ 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:]))
+ case strings.HasPrefix(address, "#"):
+ link.Kind = LinkLocalHypha
+ link.Address = util.CanonicalName(hyphaName)
+ link.Anchor = address
+ default:
+ link.Kind = LinkLocalHypha
+ link.Address = util.CanonicalName(address)
+ }
+
+ return &link
+}
diff --git a/main.go b/main.go
index c87c96e..f8780b1 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=assets
+//go:generate qtc -dir=views
package main
import (
@@ -9,33 +10,20 @@ import (
"math/rand"
"net/http"
"os"
- "path/filepath"
- "regexp"
"strings"
+ "github.com/bouncepaw/mycorrhiza/assets"
"github.com/bouncepaw/mycorrhiza/history"
"github.com/bouncepaw/mycorrhiza/hyphae"
- "github.com/bouncepaw/mycorrhiza/templates"
+ "github.com/bouncepaw/mycorrhiza/shroom"
"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.
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)
@@ -46,7 +34,7 @@ func HttpErr(w http.ResponseWriter, status int, name, title, errMsg string) {
base(
title,
fmt.Sprintf(
- `%s. Go back to the hypha.
%s. Go back to the hypha.
).
+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/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 + ` `
-}
-
-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(
`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 + ` `
+}
+
+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/lexer.go b/markup/lexer.go
index 4516eb0..e2efcfa 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.
@@ -166,7 +169,7 @@ launchpadState:
switch {
case startsWith("=>"):
href, text, class := Rocketlink(line, state.name)
- state.buf += fmt.Sprintf(` %s %s 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.
diff --git a/markup/mycomarkup.go b/markup/mycomarkup.go
index 656ca28..2fadd4e 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"
)
@@ -47,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(`<.*?>`)
@@ -57,15 +63,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 +81,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 +164,7 @@ func crawl(name, content string) []string {
preAcc += html.EscapeString(line)
}
}
+ break
}
return []string{}
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, "`)
+
+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/markup/paragraph.go b/markup/paragraph.go
index f506bb6..a576fee 100644
--- a/markup/paragraph.go
+++ b/markup/paragraph.go
@@ -55,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)
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/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/name.go b/name.go
index 2a859d8..7da76ba 100644
--- a/name.go
+++ b/name.go
@@ -1,52 +1,34 @@
package main
import (
- "fmt"
+ "log"
"net/http"
"strings"
+ "git.sr.ht/~adnano/go-gemini"
+
"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(`
- %s : `, util.HomePage, util.SiteNavIcon)
- prevAcc = `/page/`
- parts = strings.Split(canonicalName, "/")
- rel = "up"
- )
- for i, part := range parts {
- if i > 0 {
- html += `/ `
+// 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+"/"))
}
- if i == len(parts)-1 {
- rel = "bookmark"
- }
- html += fmt.Sprintf(
- `%s `,
- prevAcc+part,
- rel,
- util.BeautifulName(part),
- )
- prevAcc += part + "/"
}
- return html + " "
+ panic("HyphaNameFromRq: no matching action passed")
}
-// 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+"/"))
+// 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/shroom/backlink.go b/shroom/backlink.go
new file mode 100644
index 0000000..860ba56
--- /dev/null
+++ b/shroom/backlink.go
@@ -0,0 +1,36 @@
+package shroom
+
+import (
+ "io/ioutil"
+ "log"
+
+ "github.com/bouncepaw/mycorrhiza/hyphae"
+ "github.com/bouncepaw/mycorrhiza/markup"
+)
+
+// 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 (
+ textContents, err = ioutil.ReadFile(h.TextPath)
+ )
+ if err == nil {
+ for outlink := range markup.Doc(h.Name, string(textContents)).OutLinks() {
+ outlinkHypha := hyphae.ByName(outlink)
+ if outlinkHypha == h {
+ break
+ }
+
+ outlinkHypha.AddBackLink(h)
+ outlinkHypha.InsertIfNewKeepExistence()
+ h.AddOutLink(outlinkHypha)
+ }
+ } 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..2341351
--- /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.WithErrAbort(err)
+ 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..96a6195
--- /dev/null
+++ b/shroom/init.go
@@ -0,0 +1,38 @@
+package shroom
+
+import (
+ "errors"
+
+ "github.com/bouncepaw/mycorrhiza/hyphae"
+ "github.com/bouncepaw/mycorrhiza/markup"
+ "github.com/bouncepaw/mycorrhiza/util"
+ "github.com/bouncepaw/mycorrhiza/views"
+)
+
+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 = views.AttachmentHTML(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/shroom/rename.go b/shroom/rename.go
new file mode 100644
index 0000000..a2d44da
--- /dev/null
+++ b/shroom/rename.go
@@ -0,0 +1,106 @@
+package shroom
+
+import (
+ "errors"
+ "fmt"
+ "regexp"
+
+ "github.com/bouncepaw/mycorrhiza/history"
+ "github.com/bouncepaw/mycorrhiza/hyphae"
+ "github.com/bouncepaw/mycorrhiza/user"
+ "github.com/bouncepaw/mycorrhiza/util"
+)
+
+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 %[1]s 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 !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 ^?!:#@><*|\"\\'&%"), "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 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 := CanRename(u, h); errtitle != "" {
+ hop.WithErrAbort(err)
+ return hop, errtitle
+ }
+ if err, errtitle := canRenameThisToThat(h, newHypha, u); errtitle != "" {
+ hop.WithErrAbort(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))
+ h.Lock()
+ h.TextPath = replaceName(h.TextPath)
+ h.BinaryPath = replaceName(h.BinaryPath)
+ h.Unlock()
+ }
+ }
+ return hop, ""
+}
+
+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 []*hyphae.Hypha, replaceName func(string) string) (map[string]string, error) {
+ renameMap := make(map[string]string)
+ newNames := make([]string, len(hyphaeToRename))
+ for _, h := range hyphaeToRename {
+ h.Lock()
+ 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.Unlock()
+ }
+ 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..60f31e6
--- /dev/null
+++ b/shroom/unattach.go
@@ -0,0 +1,41 @@
+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.WithErrAbort(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")
+ // 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 != "" {
+ 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..c72ec9a
--- /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.WithErrAbort(err), errtitle
+ }
+ if len(data) == 0 {
+ return hop.WithErrAbort(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.WithErrAbort(err), err.Error()
+ }
+ if err, errtitle := CanAttach(u, h); err != nil {
+ return hop.WithErrAbort(err), errtitle
+ }
+ if len(data) == 0 {
+ return hop.WithErrAbort(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.WithErrAbort(err), err.Error()
+ }
+
+ if err := ioutil.WriteFile(fullPath, data, 0644); err != nil {
+ return hop.WithErrAbort(err), err.Error()
+ }
+
+ if h.Exists && *originalFullPath != fullPath && *originalFullPath != "" {
+ if err := history.Rename(*originalFullPath, fullPath); err != nil {
+ return hop.WithErrAbort(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/shroom/view.go b/shroom/view.go
new file mode 100644
index 0000000..05becb9
--- /dev/null
+++ b/shroom/view.go
@@ -0,0 +1,38 @@
+package shroom
+
+import (
+ "io/ioutil"
+ "os"
+
+ "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 FetchTextPart(h *hyphae.Hypha) (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
+}
+
+func SetHeaderLinks() {
+ if userLinksHypha := hyphae.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/templates/auth.qtpl b/templates/auth.qtpl
deleted file mode 100644
index 32ab3d8..0000000
--- a/templates/auth.qtpl
+++ /dev/null
@@ -1,60 +0,0 @@
-{% import "github.com/bouncepaw/mycorrhiza/user" %}
-
-{% func LoginHTML() %}
-
-
- {% if user.AuthUsed %}
- Login
-
- {% else %}
- Administrator of this wiki have not configured any authorization method. You can make edits anonymously.
- โ Go home
- {% endif %}
-
-
-{% endfunc %}
-
-{% func LoginErrorHTML(err string) %}
-
-
- {% switch err %}
- {% case "unknown username" %}
- Unknown username.
- {% case "wrong password" %}
- Wrong password.
- {% default %}
- {%s err %}
- {% endswitch %}
- โ Try again
-
-
-{% endfunc %}
-
-{% func LogoutHTML(can bool) %}
-
-
- {% if can %}
- Log out?
- Confirm
- Cancel
- {% else %}
- You cannot log out because you are not logged in.
- Login
- โ Home
- {% endif %}
-
-
-{% endfunc %}
diff --git a/templates/auth.qtpl.go b/templates/auth.qtpl.go
deleted file mode 100644
index ed88d8d..0000000
--- a/templates/auth.qtpl.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// 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 templates/auth.qtpl:1
-import "github.com/bouncepaw/mycorrhiza/user"
-
-//line templates/auth.qtpl:3
-import (
- qtio422016 "io"
-
- qt422016 "github.com/valyala/quicktemplate"
-)
-
-//line templates/auth.qtpl:3
-var (
- _ = qtio422016.Copy
- _ = qt422016.AcquireByteBuffer
-)
-
-//line templates/auth.qtpl:3
-func StreamLoginHTML(qw422016 *qt422016.Writer) {
-//line templates/auth.qtpl:3
- qw422016.N().S(`
-
-
- `)
-//line templates/auth.qtpl:6
- if user.AuthUsed {
-//line templates/auth.qtpl:6
- qw422016.N().S(`
- Login
-
- `)
-//line templates/auth.qtpl:22
- } else {
-//line templates/auth.qtpl:22
- qw422016.N().S(`
- Administrator of this wiki have not configured any authorization method. You can make edits anonymously.
- โ Go home
- `)
-//line templates/auth.qtpl:25
- }
-//line templates/auth.qtpl:25
- qw422016.N().S(`
-
-
-`)
-//line templates/auth.qtpl:28
-}
-
-//line templates/auth.qtpl:28
-func WriteLoginHTML(qq422016 qtio422016.Writer) {
-//line templates/auth.qtpl:28
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/auth.qtpl:28
- StreamLoginHTML(qw422016)
-//line templates/auth.qtpl:28
- qt422016.ReleaseWriter(qw422016)
-//line templates/auth.qtpl:28
-}
-
-//line templates/auth.qtpl:28
-func LoginHTML() string {
-//line templates/auth.qtpl:28
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/auth.qtpl:28
- WriteLoginHTML(qb422016)
-//line templates/auth.qtpl:28
- qs422016 := string(qb422016.B)
-//line templates/auth.qtpl:28
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/auth.qtpl:28
- return qs422016
-//line templates/auth.qtpl:28
-}
-
-//line templates/auth.qtpl:30
-func StreamLoginErrorHTML(qw422016 *qt422016.Writer, err string) {
-//line templates/auth.qtpl:30
- qw422016.N().S(`
-
-
- `)
-//line templates/auth.qtpl:33
- switch err {
-//line templates/auth.qtpl:34
- case "unknown username":
-//line templates/auth.qtpl:34
- qw422016.N().S(`
- Unknown username.
- `)
-//line templates/auth.qtpl:36
- case "wrong password":
-//line templates/auth.qtpl:36
- qw422016.N().S(`
- Wrong password.
- `)
-//line templates/auth.qtpl:38
- default:
-//line templates/auth.qtpl:38
- qw422016.N().S(`
- `)
-//line templates/auth.qtpl:39
- qw422016.E().S(err)
-//line templates/auth.qtpl:39
- qw422016.N().S(`
- `)
-//line templates/auth.qtpl:40
- }
-//line templates/auth.qtpl:40
- qw422016.N().S(`
- โ Try again
-
-
-`)
-//line templates/auth.qtpl:44
-}
-
-//line templates/auth.qtpl:44
-func WriteLoginErrorHTML(qq422016 qtio422016.Writer, err string) {
-//line templates/auth.qtpl:44
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/auth.qtpl:44
- StreamLoginErrorHTML(qw422016, err)
-//line templates/auth.qtpl:44
- qt422016.ReleaseWriter(qw422016)
-//line templates/auth.qtpl:44
-}
-
-//line templates/auth.qtpl:44
-func LoginErrorHTML(err string) string {
-//line templates/auth.qtpl:44
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/auth.qtpl:44
- WriteLoginErrorHTML(qb422016, err)
-//line templates/auth.qtpl:44
- qs422016 := string(qb422016.B)
-//line templates/auth.qtpl:44
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/auth.qtpl:44
- return qs422016
-//line templates/auth.qtpl:44
-}
-
-//line templates/auth.qtpl:46
-func StreamLogoutHTML(qw422016 *qt422016.Writer, can bool) {
-//line templates/auth.qtpl:46
- qw422016.N().S(`
-
-
- `)
-//line templates/auth.qtpl:49
- if can {
-//line templates/auth.qtpl:49
- qw422016.N().S(`
- Log out?
- Confirm
- Cancel
- `)
-//line templates/auth.qtpl:53
- } else {
-//line templates/auth.qtpl:53
- qw422016.N().S(`
- You cannot log out because you are not logged in.
- Login
- โ Home
- `)
-//line templates/auth.qtpl:57
- }
-//line templates/auth.qtpl:57
- qw422016.N().S(`
-
-
-`)
-//line templates/auth.qtpl:60
-}
-
-//line templates/auth.qtpl:60
-func WriteLogoutHTML(qq422016 qtio422016.Writer, can bool) {
-//line templates/auth.qtpl:60
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/auth.qtpl:60
- StreamLogoutHTML(qw422016, can)
-//line templates/auth.qtpl:60
- qt422016.ReleaseWriter(qw422016)
-//line templates/auth.qtpl:60
-}
-
-//line templates/auth.qtpl:60
-func LogoutHTML(can bool) string {
-//line templates/auth.qtpl:60
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/auth.qtpl:60
- WriteLogoutHTML(qb422016, can)
-//line templates/auth.qtpl:60
- qs422016 := string(qb422016.B)
-//line templates/auth.qtpl:60
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/auth.qtpl:60
- return qs422016
-//line templates/auth.qtpl:60
-}
diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go
deleted file mode 100644
index 590cc02..0000000
--- a/templates/common.qtpl.go
+++ /dev/null
@@ -1,214 +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/util"
-
-// This is the seen on top of many pages.
-
-//line templates/common.qtpl:6
-import (
- qtio422016 "io"
-
- qt422016 "github.com/valyala/quicktemplate"
-)
-
-//line templates/common.qtpl:6
-var (
- _ = qtio422016.Copy
- _ = qt422016.AcquireByteBuffer
-)
-
-//line templates/common.qtpl:7
-type navEntry struct {
- path string
- title string
-}
-
-var navEntries = []navEntry{
- {"page", "Hypha"},
- {"edit", "Edit"},
- {"text", "Raw text"},
- {"history", "History"},
- {"revision", "NOT REACHED"},
- {"rename-ask", "Rename"},
- {"delete-ask", "Delete"},
-}
-
-//line templates/common.qtpl:22
-func streamnavHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) {
-//line templates/common.qtpl:22
- qw422016.N().S(`
-`)
-//line templates/common.qtpl:24
- u := user.FromRequest(rq)
-
-//line templates/common.qtpl:25
- qw422016.N().S(`
-
-
-
-`)
-//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(`
- `)
-//line templates/common.qtpl:32
- qw422016.E().S(revisionHash[0])
-//line templates/common.qtpl:32
- qw422016.N().S(`
-
-`)
-//line templates/common.qtpl:34
- } else if navType == entry.path {
-//line templates/common.qtpl:34
- qw422016.N().S(`
- `)
-//line templates/common.qtpl:36
- qw422016.E().S(entry.title)
-//line templates/common.qtpl:36
- qw422016.N().S(`
-
-`)
-//line templates/common.qtpl:38
- } else if entry.path != "revision" && u.CanProceed(entry.path) {
-//line templates/common.qtpl:38
- qw422016.N().S(`
- `)
-//line templates/common.qtpl:40
- qw422016.E().S(entry.title)
-//line templates/common.qtpl:40
- qw422016.N().S(`
-
-`)
-//line templates/common.qtpl:42
- }
-//line templates/common.qtpl:43
- }
-//line templates/common.qtpl:43
- qw422016.N().S(`
-
-`)
-//line templates/common.qtpl:46
-}
-
-//line templates/common.qtpl:46
-func writenavHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, navType string, revisionHash ...string) {
-//line templates/common.qtpl:46
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:46
- streamnavHTML(qw422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:46
- qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:46
-}
-
-//line templates/common.qtpl:46
-func navHTML(rq *http.Request, hyphaName, navType string, revisionHash ...string) string {
-//line templates/common.qtpl:46
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:46
- writenavHTML(qb422016, rq, hyphaName, navType, revisionHash...)
-//line templates/common.qtpl:46
- qs422016 := string(qb422016.B)
-//line templates/common.qtpl:46
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:46
- return qs422016
-//line templates/common.qtpl:46
-}
-
-//line templates/common.qtpl:48
-func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
-//line templates/common.qtpl:48
- qw422016.N().S(`
-`)
-//line templates/common.qtpl:49
- if user.AuthUsed {
-//line templates/common.qtpl:49
- qw422016.N().S(`
-
-`)
-//line templates/common.qtpl:57
- }
-//line templates/common.qtpl:57
- qw422016.N().S(`
-`)
-//line templates/common.qtpl:58
-}
-
-//line templates/common.qtpl:58
-func writeuserMenuHTML(qq422016 qtio422016.Writer, u *user.User) {
-//line templates/common.qtpl:58
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/common.qtpl:58
- streamuserMenuHTML(qw422016, u)
-//line templates/common.qtpl:58
- qt422016.ReleaseWriter(qw422016)
-//line templates/common.qtpl:58
-}
-
-//line templates/common.qtpl:58
-func userMenuHTML(u *user.User) string {
-//line templates/common.qtpl:58
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/common.qtpl:58
- writeuserMenuHTML(qb422016, u)
-//line templates/common.qtpl:58
- qs422016 := string(qb422016.B)
-//line templates/common.qtpl:58
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/common.qtpl:58
- return qs422016
-//line templates/common.qtpl:58
-}
diff --git a/templates/delete.qtpl b/templates/delete.qtpl
deleted file mode 100644
index 1d45e0a..0000000
--- a/templates/delete.qtpl
+++ /dev/null
@@ -1,27 +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") %}
-
-{% if isOld %}
-
- Delete {%s hyphaName %}?
- Do you really want to delete hypha {%s hyphaName %} ?
- In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.
- Confirm
- Cancel
-
-{% else %}
- {%= cannotDeleteDueToNonExistence(hyphaName) %}
-{% endif %}
-
-{% endfunc %}
-
-{% func cannotDeleteDueToNonExistence(hyphaName string) %}
-
- Cannot delete {%s hyphaName %}
- This hypha does not exist.
- Go back
-
-{% endfunc %}
diff --git a/templates/delete.qtpl.go b/templates/delete.qtpl.go
deleted file mode 100644
index 1e67350..0000000
--- a/templates/delete.qtpl.go
+++ /dev/null
@@ -1,154 +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(`
-
-`)
-//line templates/delete.qtpl:7
- if isOld {
-//line templates/delete.qtpl:7
- qw422016.N().S(`
-
- Delete `)
-//line templates/delete.qtpl:9
- qw422016.E().S(hyphaName)
-//line templates/delete.qtpl:9
- qw422016.N().S(`?
- Do you really want to delete hypha `)
-//line templates/delete.qtpl:10
- qw422016.E().S(hyphaName)
-//line templates/delete.qtpl:10
- qw422016.N().S(` ?
- In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.
- Confirm
- Cancel
-
-`)
-//line templates/delete.qtpl:15
- } else {
-//line templates/delete.qtpl:15
- qw422016.N().S(`
- `)
-//line templates/delete.qtpl:16
- streamcannotDeleteDueToNonExistence(qw422016, hyphaName)
-//line templates/delete.qtpl:16
- qw422016.N().S(`
-`)
-//line templates/delete.qtpl:17
- }
-//line templates/delete.qtpl:17
- qw422016.N().S(`
-
-`)
-//line templates/delete.qtpl:19
-}
-
-//line templates/delete.qtpl:19
-func WriteDeleteAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) {
-//line templates/delete.qtpl:19
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/delete.qtpl:19
- StreamDeleteAskHTML(qw422016, rq, hyphaName, isOld)
-//line templates/delete.qtpl:19
- qt422016.ReleaseWriter(qw422016)
-//line templates/delete.qtpl:19
-}
-
-//line templates/delete.qtpl:19
-func DeleteAskHTML(rq *http.Request, hyphaName string, isOld bool) string {
-//line templates/delete.qtpl:19
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/delete.qtpl:19
- WriteDeleteAskHTML(qb422016, rq, hyphaName, isOld)
-//line templates/delete.qtpl:19
- qs422016 := string(qb422016.B)
-//line templates/delete.qtpl:19
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/delete.qtpl:19
- return qs422016
-//line templates/delete.qtpl:19
-}
-
-//line templates/delete.qtpl:21
-func streamcannotDeleteDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) {
-//line templates/delete.qtpl:21
- qw422016.N().S(`
-
- Cannot delete `)
-//line templates/delete.qtpl:23
- qw422016.E().S(hyphaName)
-//line templates/delete.qtpl:23
- qw422016.N().S(`
- This hypha does not exist.
- Go back
-
-`)
-//line templates/delete.qtpl:27
-}
-
-//line templates/delete.qtpl:27
-func writecannotDeleteDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) {
-//line templates/delete.qtpl:27
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/delete.qtpl:27
- streamcannotDeleteDueToNonExistence(qw422016, hyphaName)
-//line templates/delete.qtpl:27
- qt422016.ReleaseWriter(qw422016)
-//line templates/delete.qtpl:27
-}
-
-//line templates/delete.qtpl:27
-func cannotDeleteDueToNonExistence(hyphaName string) string {
-//line templates/delete.qtpl:27
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/delete.qtpl:27
- writecannotDeleteDueToNonExistence(qb422016, hyphaName)
-//line templates/delete.qtpl:27
- qs422016 := string(qb422016.B)
-//line templates/delete.qtpl:27
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/delete.qtpl:27
- return qs422016
-//line templates/delete.qtpl:27
-}
diff --git a/templates/http_readers.qtpl b/templates/http_readers.qtpl
deleted file mode 100644
index a9d7304..0000000
--- a/templates/http_readers.qtpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{% import "net/http" %}
-{% import "path" %}
-{% import "github.com/bouncepaw/mycorrhiza/user" %}
-
-{% func HistoryHTML(rq *http.Request, hyphaName, list string) %}
-{%= navHTML(rq, hyphaName, "history") %}
-
-
- History of {%s hyphaName %}
- {%s= list %}
-
-
-{% endfunc %}
-
-{% func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) %}
-{%= navHTML(rq, hyphaName, "revision", revHash) %}
-
-
- Please note that viewing binary parts of hyphae is not supported in history for now.
- {%s= naviTitle %}
- {%s= contents %}
-
-
-{% endfunc %}
-
-If `contents` == "", a helpful message is shown instead.
-{% func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) %}
-{%= navHTML(rq, hyphaName, "page") %}
-
-
- {%s= naviTitle %}
- {% if contents == "" %}
- This hypha has no text. Why not create it ?
- {% else %}
- {%s= contents %}
- {% endif %}
-
-
-{% if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" %}
-
-{% endif %}
-
-
-{% endfunc %}
diff --git a/templates/http_readers.qtpl.go b/templates/http_readers.qtpl.go
deleted file mode 100644
index d9000da..0000000
--- a/templates/http_readers.qtpl.go
+++ /dev/null
@@ -1,301 +0,0 @@
-// Code generated by qtc from "http_readers.qtpl". DO NOT EDIT.
-// See https://github.com/valyala/quicktemplate for details.
-
-//line templates/http_readers.qtpl:1
-package templates
-
-//line templates/http_readers.qtpl:1
-import "net/http"
-
-//line templates/http_readers.qtpl:2
-import "path"
-
-//line templates/http_readers.qtpl:3
-import "github.com/bouncepaw/mycorrhiza/user"
-
-//line templates/http_readers.qtpl:5
-import (
- qtio422016 "io"
-
- qt422016 "github.com/valyala/quicktemplate"
-)
-
-//line templates/http_readers.qtpl:5
-var (
- _ = qtio422016.Copy
- _ = qt422016.AcquireByteBuffer
-)
-
-//line templates/http_readers.qtpl:5
-func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) {
-//line templates/http_readers.qtpl:5
- qw422016.N().S(`
-`)
-//line templates/http_readers.qtpl:6
- streamnavHTML(qw422016, rq, hyphaName, "history")
-//line templates/http_readers.qtpl:6
- qw422016.N().S(`
-
-
- History of `)
-//line templates/http_readers.qtpl:9
- qw422016.E().S(hyphaName)
-//line templates/http_readers.qtpl:9
- qw422016.N().S(`
- `)
-//line templates/http_readers.qtpl:10
- qw422016.N().S(list)
-//line templates/http_readers.qtpl:10
- qw422016.N().S(`
-
-
-`)
-//line templates/http_readers.qtpl:13
-}
-
-//line templates/http_readers.qtpl:13
-func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) {
-//line templates/http_readers.qtpl:13
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:13
- StreamHistoryHTML(qw422016, rq, hyphaName, list)
-//line templates/http_readers.qtpl:13
- qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:13
-}
-
-//line templates/http_readers.qtpl:13
-func HistoryHTML(rq *http.Request, hyphaName, list string) string {
-//line templates/http_readers.qtpl:13
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:13
- WriteHistoryHTML(qb422016, rq, hyphaName, list)
-//line templates/http_readers.qtpl:13
- qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:13
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:13
- return qs422016
-//line templates/http_readers.qtpl:13
-}
-
-//line templates/http_readers.qtpl:15
-func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) {
-//line templates/http_readers.qtpl:15
- qw422016.N().S(`
-`)
-//line templates/http_readers.qtpl:16
- streamnavHTML(qw422016, rq, hyphaName, "revision", revHash)
-//line templates/http_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
- qw422016.N().S(naviTitle)
-//line templates/http_readers.qtpl:20
- qw422016.N().S(`
- `)
-//line templates/http_readers.qtpl:21
- qw422016.N().S(contents)
-//line templates/http_readers.qtpl:21
- qw422016.N().S(`
-
-
- `)
-//line templates/http_readers.qtpl:25
- qw422016.N().S(tree)
-//line templates/http_readers.qtpl:25
- qw422016.N().S(`
-
-
-`)
-//line templates/http_readers.qtpl:28
-}
-
-//line templates/http_readers.qtpl:28
-func WriteRevisionHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) {
-//line templates/http_readers.qtpl:28
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:28
- StreamRevisionHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, revHash)
-//line templates/http_readers.qtpl:28
- qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:28
-}
-
-//line templates/http_readers.qtpl:28
-func RevisionHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, revHash string) string {
-//line templates/http_readers.qtpl:28
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:28
- WriteRevisionHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, revHash)
-//line templates/http_readers.qtpl:28
- qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:28
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:28
- return qs422016
-//line templates/http_readers.qtpl:28
-}
-
-// If `contents` == "", a helpful message is shown instead.
-
-//line templates/http_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
- qw422016.N().S(`
-`)
-//line templates/http_readers.qtpl:32
- streamnavHTML(qw422016, rq, hyphaName, "page")
-//line templates/http_readers.qtpl:32
- qw422016.N().S(`
-
-
- `)
-//line templates/http_readers.qtpl:35
- qw422016.N().S(naviTitle)
-//line templates/http_readers.qtpl:35
- qw422016.N().S(`
- `)
-//line templates/http_readers.qtpl:36
- if contents == "" {
-//line templates/http_readers.qtpl:36
- qw422016.N().S(`
- This hypha has no text. Why not create it ?
- `)
-//line templates/http_readers.qtpl:38
- } else {
-//line templates/http_readers.qtpl:38
- qw422016.N().S(`
- `)
-//line templates/http_readers.qtpl:39
- qw422016.N().S(contents)
-//line templates/http_readers.qtpl:39
- qw422016.N().S(`
- `)
-//line templates/http_readers.qtpl:40
- }
-//line templates/http_readers.qtpl:40
- qw422016.N().S(`
-
-
-`)
-//line templates/http_readers.qtpl:50
- if u := user.FromRequest(rq); !user.AuthUsed || u.Group != "anon" {
-//line templates/http_readers.qtpl:50
- qw422016.N().S(`
-
-`)
-//line templates/http_readers.qtpl:62
- }
-//line templates/http_readers.qtpl:62
- qw422016.N().S(`
-
- `)
-//line templates/http_readers.qtpl:64
- qw422016.N().S(tree)
-//line templates/http_readers.qtpl:64
- qw422016.N().S(`
-
-
-`)
-//line templates/http_readers.qtpl:67
-}
-
-//line templates/http_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
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_readers.qtpl:67
- StreamPageHTML(qw422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName, hasAmnt)
-//line templates/http_readers.qtpl:67
- qt422016.ReleaseWriter(qw422016)
-//line templates/http_readers.qtpl:67
-}
-
-//line templates/http_readers.qtpl:67
-func PageHTML(rq *http.Request, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName string, hasAmnt bool) string {
-//line templates/http_readers.qtpl:67
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_readers.qtpl:67
- WritePageHTML(qb422016, rq, hyphaName, naviTitle, contents, tree, prevHyphaName, nextHyphaName, hasAmnt)
-//line templates/http_readers.qtpl:67
- qs422016 := string(qb422016.B)
-//line templates/http_readers.qtpl:67
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_readers.qtpl:67
- return qs422016
-//line templates/http_readers.qtpl:67
-}
diff --git a/templates/http_stuff.qtpl b/templates/http_stuff.qtpl
deleted file mode 100644
index 8723860..0000000
--- a/templates/http_stuff.qtpl
+++ /dev/null
@@ -1,78 +0,0 @@
-{% import "github.com/bouncepaw/mycorrhiza/util" %}
-{% import "github.com/bouncepaw/mycorrhiza/user" %}
-
-{% func BaseHTML(title, body string, u *user.User, headElements ...string) %}
-
-
-
- {%s title %}
- {% for _, el := range headElements %}{%s= el %}{% endfor %}
-
-
-
- {%s= body %}
-
-
-{% endfunc %}
-
-{% func HyphaListHTML(tbody string, pageCount int) %}
-
- List of hyphae
- This wiki has {%d pageCount %} hyphae.
-
-
-
- Full name
- Binary part type
-
-
-
- {%s= tbody %}
-
-
-
-{% endfunc %}
-
-{% func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) %}
-
- {%s hyphaName %} {%s binaryMime %}
- {% else %}
-
-{% endfunc %}
-
-{% func AboutHTML() %}
-
-
- About {%s util.SiteName %}
-
- MycorrhizaWiki version:User count: {%d user.Count() %}Home page: {%s util.HomePage %} Administrators: {%- for i, username := range user.ListUsersWithGroup("admin") -%}
- {%- if i > 0 -%},
- {%- endif -%}
- {%s username %} {%- endfor -%}This wiki does not use authorization
- {%- endif -%}
-
- See /list for information about hyphae on this wiki.
-
-
-{% endfunc %}
diff --git a/templates/http_stuff.qtpl.go b/templates/http_stuff.qtpl.go
deleted file mode 100644
index 2de5906..0000000
--- a/templates/http_stuff.qtpl.go
+++ /dev/null
@@ -1,335 +0,0 @@
-// Code generated by qtc from "http_stuff.qtpl". DO NOT EDIT.
-// See https://github.com/valyala/quicktemplate for details.
-
-//line templates/http_stuff.qtpl:1
-package templates
-
-//line templates/http_stuff.qtpl:1
-import "github.com/bouncepaw/mycorrhiza/util"
-
-//line templates/http_stuff.qtpl:2
-import "github.com/bouncepaw/mycorrhiza/user"
-
-//line templates/http_stuff.qtpl:4
-import (
- qtio422016 "io"
-
- qt422016 "github.com/valyala/quicktemplate"
-)
-
-//line templates/http_stuff.qtpl:4
-var (
- _ = qtio422016.Copy
- _ = qt422016.AcquireByteBuffer
-)
-
-//line templates/http_stuff.qtpl:4
-func StreamBaseHTML(qw422016 *qt422016.Writer, title, body string, u *user.User, headElements ...string) {
-//line templates/http_stuff.qtpl:4
- qw422016.N().S(`
-
-
-
- `)
-//line templates/http_stuff.qtpl:10
- qw422016.E().S(title)
-//line templates/http_stuff.qtpl:10
- qw422016.N().S(`
- `)
-//line templates/http_stuff.qtpl:11
- for _, el := range headElements {
-//line templates/http_stuff.qtpl:11
- qw422016.N().S(el)
-//line templates/http_stuff.qtpl:11
- }
-//line templates/http_stuff.qtpl:11
- qw422016.N().S(`
-
-
-
- `)
-//line templates/http_stuff.qtpl:24
- qw422016.N().S(body)
-//line templates/http_stuff.qtpl:24
- qw422016.N().S(`
-
-
-`)
-//line templates/http_stuff.qtpl:27
-}
-
-//line templates/http_stuff.qtpl:27
-func WriteBaseHTML(qq422016 qtio422016.Writer, title, body string, u *user.User, headElements ...string) {
-//line templates/http_stuff.qtpl:27
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:27
- StreamBaseHTML(qw422016, title, body, u, headElements...)
-//line templates/http_stuff.qtpl:27
- qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:27
-}
-
-//line templates/http_stuff.qtpl:27
-func BaseHTML(title, body string, u *user.User, headElements ...string) string {
-//line templates/http_stuff.qtpl:27
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:27
- WriteBaseHTML(qb422016, title, body, u, headElements...)
-//line templates/http_stuff.qtpl:27
- qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:27
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:27
- return qs422016
-//line templates/http_stuff.qtpl:27
-}
-
-//line templates/http_stuff.qtpl:29
-func StreamHyphaListHTML(qw422016 *qt422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:29
- qw422016.N().S(`
-
- List of hyphae
- This wiki has `)
-//line templates/http_stuff.qtpl:32
- qw422016.N().D(pageCount)
-//line templates/http_stuff.qtpl:32
- qw422016.N().S(` hyphae.
-
-
-
- Full name
- Binary part type
-
-
-
- `)
-//line templates/http_stuff.qtpl:41
- qw422016.N().S(tbody)
-//line templates/http_stuff.qtpl:41
- qw422016.N().S(`
-
-
-
-`)
-//line templates/http_stuff.qtpl:45
-}
-
-//line templates/http_stuff.qtpl:45
-func WriteHyphaListHTML(qq422016 qtio422016.Writer, tbody string, pageCount int) {
-//line templates/http_stuff.qtpl:45
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:45
- StreamHyphaListHTML(qw422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:45
- qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:45
-}
-
-//line templates/http_stuff.qtpl:45
-func HyphaListHTML(tbody string, pageCount int) string {
-//line templates/http_stuff.qtpl:45
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:45
- WriteHyphaListHTML(qb422016, tbody, pageCount)
-//line templates/http_stuff.qtpl:45
- qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:45
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:45
- return qs422016
-//line templates/http_stuff.qtpl:45
-}
-
-//line templates/http_stuff.qtpl:47
-func StreamHyphaListRowHTML(qw422016 *qt422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:47
- qw422016.N().S(`
-
- `)
-//line templates/http_stuff.qtpl:49
- qw422016.E().S(hyphaName)
-//line templates/http_stuff.qtpl:49
- qw422016.N().S(` `)
-//line templates/http_stuff.qtpl:51
- qw422016.E().S(binaryMime)
-//line templates/http_stuff.qtpl:51
- qw422016.N().S(`
- `)
-//line templates/http_stuff.qtpl:52
- } else {
-//line templates/http_stuff.qtpl:52
- qw422016.N().S(`
-
-`)
-//line templates/http_stuff.qtpl:56
-}
-
-//line templates/http_stuff.qtpl:56
-func WriteHyphaListRowHTML(qq422016 qtio422016.Writer, hyphaName, binaryMime string, binaryPresent bool) {
-//line templates/http_stuff.qtpl:56
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:56
- StreamHyphaListRowHTML(qw422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:56
- qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:56
-}
-
-//line templates/http_stuff.qtpl:56
-func HyphaListRowHTML(hyphaName, binaryMime string, binaryPresent bool) string {
-//line templates/http_stuff.qtpl:56
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:56
- WriteHyphaListRowHTML(qb422016, hyphaName, binaryMime, binaryPresent)
-//line templates/http_stuff.qtpl:56
- qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:56
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:56
- return qs422016
-//line templates/http_stuff.qtpl:56
-}
-
-//line templates/http_stuff.qtpl:58
-func StreamAboutHTML(qw422016 *qt422016.Writer) {
-//line templates/http_stuff.qtpl:58
- qw422016.N().S(`
-
-
- About `)
-//line templates/http_stuff.qtpl:61
- qw422016.E().S(util.SiteName)
-//line templates/http_stuff.qtpl:61
- qw422016.N().S(`
-
- See /list for information about hyphae on this wiki.
-
-
-`)
-//line templates/http_stuff.qtpl:78
-}
-
-//line templates/http_stuff.qtpl:78
-func WriteAboutHTML(qq422016 qtio422016.Writer) {
-//line templates/http_stuff.qtpl:78
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/http_stuff.qtpl:78
- StreamAboutHTML(qw422016)
-//line templates/http_stuff.qtpl:78
- qt422016.ReleaseWriter(qw422016)
-//line templates/http_stuff.qtpl:78
-}
-
-//line templates/http_stuff.qtpl:78
-func AboutHTML() string {
-//line templates/http_stuff.qtpl:78
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/http_stuff.qtpl:78
- WriteAboutHTML(qb422016)
-//line templates/http_stuff.qtpl:78
- qs422016 := string(qb422016.B)
-//line templates/http_stuff.qtpl:78
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/http_stuff.qtpl:78
- return qs422016
-//line templates/http_stuff.qtpl:78
-}
diff --git a/templates/recent_changes.qtpl.go b/templates/recent_changes.qtpl.go
deleted file mode 100644
index 329ccc5..0000000
--- a/templates/recent_changes.qtpl.go
+++ /dev/null
@@ -1,159 +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(`
-
- Recent Changes
- โ Back
-
-
- See
- `)
-//line templates/recent_changes.qtpl:8
- for _, m := range []int{20, 0, 50, 0, 100} {
-//line templates/recent_changes.qtpl:8
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:9
- switch m {
-//line templates/recent_changes.qtpl:10
- case 0:
-//line templates/recent_changes.qtpl:10
- qw422016.N().S(`
- |
- `)
-//line templates/recent_changes.qtpl:12
- case n:
-//line templates/recent_changes.qtpl:12
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:13
- qw422016.N().D(n)
-//line templates/recent_changes.qtpl:13
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:14
- default:
-//line templates/recent_changes.qtpl:14
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:15
- qw422016.N().D(m)
-//line templates/recent_changes.qtpl:15
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:16
- }
-//line templates/recent_changes.qtpl:16
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:17
- }
-//line templates/recent_changes.qtpl:17
- qw422016.N().S(`
- recent changes
-
-
- RSS , Atom or JSON feed .
-
- `)
-//line templates/recent_changes.qtpl:28
- qw422016.N().S(`
-
-
- `)
-//line templates/recent_changes.qtpl:31
- if len(changes) == 0 {
-//line templates/recent_changes.qtpl:31
- qw422016.N().S(`
- Could not find any recent changes.
- `)
-//line templates/recent_changes.qtpl:33
- } else {
-//line templates/recent_changes.qtpl:33
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:34
- for i, entry := range changes {
-//line templates/recent_changes.qtpl:34
- qw422016.N().S(`
-
- `)
-//line templates/recent_changes.qtpl:37
- qw422016.N().S(entry)
-//line templates/recent_changes.qtpl:37
- qw422016.N().S(`
-
- `)
-//line templates/recent_changes.qtpl:39
- }
-//line templates/recent_changes.qtpl:39
- qw422016.N().S(`
- `)
-//line templates/recent_changes.qtpl:40
- }
-//line templates/recent_changes.qtpl:40
- qw422016.N().S(`
-
-
-`)
-//line templates/recent_changes.qtpl:43
-}
-
-//line templates/recent_changes.qtpl:43
-func WriteRecentChangesHTML(qq422016 qtio422016.Writer, changes []string, n int) {
-//line templates/recent_changes.qtpl:43
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/recent_changes.qtpl:43
- StreamRecentChangesHTML(qw422016, changes, n)
-//line templates/recent_changes.qtpl:43
- qt422016.ReleaseWriter(qw422016)
-//line templates/recent_changes.qtpl:43
-}
-
-//line templates/recent_changes.qtpl:43
-func RecentChangesHTML(changes []string, n int) string {
-//line templates/recent_changes.qtpl:43
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/recent_changes.qtpl:43
- WriteRecentChangesHTML(qb422016, changes, n)
-//line templates/recent_changes.qtpl:43
- qs422016 := string(qb422016.B)
-//line templates/recent_changes.qtpl:43
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/recent_changes.qtpl:43
- return qs422016
-//line templates/recent_changes.qtpl:43
-}
diff --git a/templates/rename.qtpl b/templates/rename.qtpl
deleted file mode 100644
index aee28ce..0000000
--- a/templates/rename.qtpl
+++ /dev/null
@@ -1,37 +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") %}
-
-{%- if isOld -%}
-
- Rename {%s hyphaName %}
-
-
-{%- else -%}
- {%= cannotRenameDueToNonExistence(hyphaName) %}
-{%- endif -%}
-
-{% endfunc %}
-
-{% func cannotRenameDueToNonExistence(hyphaName string) %}
-
- Cannot rename {%s hyphaName %}
- This hypha does not exist.
- Go back
-
-{% endfunc %}
diff --git a/templates/rename.qtpl.go b/templates/rename.qtpl.go
deleted file mode 100644
index 2347bcd..0000000
--- a/templates/rename.qtpl.go
+++ /dev/null
@@ -1,158 +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(`
-
-`)
-//line templates/rename.qtpl:6
- if isOld {
-//line templates/rename.qtpl:6
- qw422016.N().S(`
- Rename `)
-//line templates/rename.qtpl:8
- qw422016.E().S(hyphaName)
-//line templates/rename.qtpl:8
- qw422016.N().S(`
-
-
-`)
-//line templates/rename.qtpl:25
- } else {
-//line templates/rename.qtpl:25
- qw422016.N().S(` `)
-//line templates/rename.qtpl:26
- streamcannotRenameDueToNonExistence(qw422016, hyphaName)
-//line templates/rename.qtpl:26
- qw422016.N().S(`
-`)
-//line templates/rename.qtpl:27
- }
-//line templates/rename.qtpl:27
- qw422016.N().S(`
-`)
-//line templates/rename.qtpl:29
-}
-
-//line templates/rename.qtpl:29
-func WriteRenameAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) {
-//line templates/rename.qtpl:29
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/rename.qtpl:29
- StreamRenameAskHTML(qw422016, rq, hyphaName, isOld)
-//line templates/rename.qtpl:29
- qt422016.ReleaseWriter(qw422016)
-//line templates/rename.qtpl:29
-}
-
-//line templates/rename.qtpl:29
-func RenameAskHTML(rq *http.Request, hyphaName string, isOld bool) string {
-//line templates/rename.qtpl:29
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/rename.qtpl:29
- WriteRenameAskHTML(qb422016, rq, hyphaName, isOld)
-//line templates/rename.qtpl:29
- qs422016 := string(qb422016.B)
-//line templates/rename.qtpl:29
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/rename.qtpl:29
- return qs422016
-//line templates/rename.qtpl:29
-}
-
-//line templates/rename.qtpl:31
-func streamcannotRenameDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) {
-//line templates/rename.qtpl:31
- qw422016.N().S(`
-
- Cannot rename `)
-//line templates/rename.qtpl:33
- qw422016.E().S(hyphaName)
-//line templates/rename.qtpl:33
- qw422016.N().S(`
- This hypha does not exist.
- Go back
-
-`)
-//line templates/rename.qtpl:37
-}
-
-//line templates/rename.qtpl:37
-func writecannotRenameDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) {
-//line templates/rename.qtpl:37
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/rename.qtpl:37
- streamcannotRenameDueToNonExistence(qw422016, hyphaName)
-//line templates/rename.qtpl:37
- qt422016.ReleaseWriter(qw422016)
-//line templates/rename.qtpl:37
-}
-
-//line templates/rename.qtpl:37
-func cannotRenameDueToNonExistence(hyphaName string) string {
-//line templates/rename.qtpl:37
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/rename.qtpl:37
- writecannotRenameDueToNonExistence(qb422016, hyphaName)
-//line templates/rename.qtpl:37
- qs422016 := string(qb422016.B)
-//line templates/rename.qtpl:37
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/rename.qtpl:37
- return qs422016
-//line templates/rename.qtpl:37
-}
diff --git a/templates/unattach.qtpl b/templates/unattach.qtpl
deleted file mode 100644
index e4f0ae2..0000000
--- a/templates/unattach.qtpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{% import "net/http" %}
-{% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %}
-
-{%= navHTML(rq, hyphaName, "unattach-ask") %}
-{%- if isOld -%}
-
- Unattach {%s hyphaName %}?
- Do you really want to unattach hypha {%s hyphaName %} ?
- Confirm
- Cancel
-
-{%- else -%}
- {%= cannotUnattachDueToNonExistence(hyphaName) %}
-{%- endif -%}
-
-{% endfunc %}
-
-{% func cannotUnattachDueToNonExistence(hyphaName string) %}
-
- Cannot unattach {%s hyphaName %}
- This hypha does not exist.
- Go back
-
-{% endfunc %}
diff --git a/templates/unattach.qtpl.go b/templates/unattach.qtpl.go
deleted file mode 100644
index c00bc80..0000000
--- a/templates/unattach.qtpl.go
+++ /dev/null
@@ -1,148 +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:4
- streamnavHTML(qw422016, rq, hyphaName, "unattach-ask")
-//line templates/unattach.qtpl:4
- qw422016.N().S(`
-`)
-//line templates/unattach.qtpl:5
- if isOld {
-//line templates/unattach.qtpl:5
- qw422016.N().S(`
- Unattach `)
-//line templates/unattach.qtpl:7
- qw422016.E().S(hyphaName)
-//line templates/unattach.qtpl:7
- qw422016.N().S(`?
- Do you really want to unattach hypha `)
-//line templates/unattach.qtpl:8
- qw422016.E().S(hyphaName)
-//line templates/unattach.qtpl:8
- qw422016.N().S(` ?
- Confirm
- Cancel
-
-`)
-//line templates/unattach.qtpl:12
- } else {
-//line templates/unattach.qtpl:12
- qw422016.N().S(` `)
-//line templates/unattach.qtpl:13
- streamcannotUnattachDueToNonExistence(qw422016, hyphaName)
-//line templates/unattach.qtpl:13
- qw422016.N().S(`
-`)
-//line templates/unattach.qtpl:14
- }
-//line templates/unattach.qtpl:14
- qw422016.N().S(`
-`)
-//line templates/unattach.qtpl:16
-}
-
-//line templates/unattach.qtpl:16
-func WriteUnattachAskHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName string, isOld bool) {
-//line templates/unattach.qtpl:16
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/unattach.qtpl:16
- StreamUnattachAskHTML(qw422016, rq, hyphaName, isOld)
-//line templates/unattach.qtpl:16
- qt422016.ReleaseWriter(qw422016)
-//line templates/unattach.qtpl:16
-}
-
-//line templates/unattach.qtpl:16
-func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) string {
-//line templates/unattach.qtpl:16
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/unattach.qtpl:16
- WriteUnattachAskHTML(qb422016, rq, hyphaName, isOld)
-//line templates/unattach.qtpl:16
- qs422016 := string(qb422016.B)
-//line templates/unattach.qtpl:16
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/unattach.qtpl:16
- return qs422016
-//line templates/unattach.qtpl:16
-}
-
-//line templates/unattach.qtpl:18
-func streamcannotUnattachDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) {
-//line templates/unattach.qtpl:18
- qw422016.N().S(`
-
- Cannot unattach `)
-//line templates/unattach.qtpl:20
- qw422016.E().S(hyphaName)
-//line templates/unattach.qtpl:20
- qw422016.N().S(`
- This hypha does not exist.
- Go back
-
-`)
-//line templates/unattach.qtpl:24
-}
-
-//line templates/unattach.qtpl:24
-func writecannotUnattachDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) {
-//line templates/unattach.qtpl:24
- qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/unattach.qtpl:24
- streamcannotUnattachDueToNonExistence(qw422016, hyphaName)
-//line templates/unattach.qtpl:24
- qt422016.ReleaseWriter(qw422016)
-//line templates/unattach.qtpl:24
-}
-
-//line templates/unattach.qtpl:24
-func cannotUnattachDueToNonExistence(hyphaName string) string {
-//line templates/unattach.qtpl:24
- qb422016 := qt422016.AcquireByteBuffer()
-//line templates/unattach.qtpl:24
- writecannotUnattachDueToNonExistence(qb422016, hyphaName)
-//line templates/unattach.qtpl:24
- qs422016 := string(qb422016.B)
-//line templates/unattach.qtpl:24
- qt422016.ReleaseByteBuffer(qb422016)
-//line templates/unattach.qtpl:24
- return qs422016
-//line templates/unattach.qtpl:24
-}
diff --git a/tree/tree.go b/tree/tree.go
index 476b540..dc3cf38 100644
--- a/tree/tree.go
+++ b/tree/tree.go
@@ -6,103 +6,135 @@ import (
"sort"
"strings"
+ "github.com/bouncepaw/mycorrhiza/hyphae"
"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(
+ `%s %s %s `, m.name, util.BeautifulName(path.Base(m.name)))
+ for _, child := range m.children {
+ html += child.asHTML()
+ }
+ return html + ` %s
- %s
-
-`, class, name, beautifulName(name))
+func findSiblings(hyphaName string) []*sibling {
+ siblings := []*sibling{&sibling{name: hyphaName, hasChildren: true}}
+ 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
+ })
+ return siblings
}
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
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
}
diff --git a/util/util.go b/util/util.go
index c977992..6b7590f 100644
--- a/util/util.go
+++ b/util/util.go
@@ -4,7 +4,9 @@ import (
"crypto/rand"
"encoding/hex"
"net/http"
+ "regexp"
"strings"
+ "unicode"
)
var (
@@ -18,8 +20,27 @@ var (
HeaderLinksHypha string
AuthMethod string
FixedCredentialsPath string
+ 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) {
@@ -39,17 +60,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 {
@@ -65,3 +75,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)
+}
diff --git a/views/auth.qtpl b/views/auth.qtpl
new file mode 100644
index 0000000..f3f257a
--- /dev/null
+++ b/views/auth.qtpl
@@ -0,0 +1,68 @@
+{% import "github.com/bouncepaw/mycorrhiza/user" %}
+{% import "github.com/bouncepaw/mycorrhiza/util" %}
+
+{% func LoginHTML() %}
+
+
+
+ {% if user.AuthUsed %}
+
+ {% else %}
+ Administrators of this wiki have not configured any authorization method. You can make edits anonymously.
+ โ Go home
+ {% endif %}
+
+
+
+
+
+ {% switch err %}
+ {% case "unknown username" %}
+ Unknown username.
+ {% case "wrong password" %}
+ Wrong password.
+ {% default %}
+ {%s err %}
+ {% endswitch %}
+ โ Try again
+
+
+
+
+
+ {% if can %}
+ Log out?
+ Confirm
+ Cancel
+ {% else %}
+ You cannot log out because you are not logged in.
+ Login
+ โ Home
+ {% endif %}
+
+
+
+
+
+ `)
+//line views/auth.qtpl:8
+ if user.AuthUsed {
+//line views/auth.qtpl:8
+ qw422016.N().S(`
+
+ `)
+//line views/auth.qtpl:25
+ } else {
+//line views/auth.qtpl:25
+ qw422016.N().S(`
+ Administrators of this wiki have not configured any authorization method. You can make edits anonymously.
+ โ Go home
+ `)
+//line views/auth.qtpl:28
+ }
+//line views/auth.qtpl:28
+ qw422016.N().S(`
+
+
+
+
+
+ `)
+//line views/auth.qtpl:38
+ switch err {
+//line views/auth.qtpl:39
+ case "unknown username":
+//line views/auth.qtpl:39
+ qw422016.N().S(`
+ Unknown username.
+ `)
+//line views/auth.qtpl:41
+ case "wrong password":
+//line views/auth.qtpl:41
+ qw422016.N().S(`
+ Wrong password.
+ `)
+//line views/auth.qtpl:43
+ default:
+//line views/auth.qtpl:43
+ qw422016.N().S(`
+ `)
+//line views/auth.qtpl:44
+ qw422016.E().S(err)
+//line views/auth.qtpl:44
+ qw422016.N().S(`
+ `)
+//line views/auth.qtpl:45
+ }
+//line views/auth.qtpl:45
+ qw422016.N().S(`
+ โ Try again
+
+
+
+
+
+ `)
+//line views/auth.qtpl:56
+ if can {
+//line views/auth.qtpl:56
+ qw422016.N().S(`
+ Log out?
+ Confirm
+ Cancel
+ `)
+//line views/auth.qtpl:60
+ } else {
+//line views/auth.qtpl:60
+ qw422016.N().S(`
+ You cannot log out because you are not logged in.
+ Login
+ โ Home
+ `)
+//line views/auth.qtpl:64
+ }
+//line views/auth.qtpl:64
+ qw422016.N().S(`
+
+
+
+{% import "net/http" %}
+
+{% import "github.com/bouncepaw/mycorrhiza/util" %}
+{% import "github.com/bouncepaw/mycorrhiza/history" %}
+
+{% func RecentChangesHTML(n int) %}
+
+
Recent Changes
โ Back
@@ -27,6 +33,9 @@
How come? I'll add the role anyway. -- bouncepaw
{% endcomment %}
+ {% code
+ changes := history.RecentChanges(n)
+ %}
{% if len(changes) == 0 %}
Could not find any recent changes.
@@ -34,10 +43,30 @@
{% for i, entry := range changes %}
- {%s= entry %}
+ {%s= recentChangesEntry(entry) %}
{% endfor %}
{% endif %}
+
{%s rev.TimeString() %} {%s rev.Hash %}
+{%s= rev.HyphaeLinksHTML() %}
+{%s rev.Message %} {% if rev.Username != "anon" %}by {%s rev.Username %} {% endif %}
+{% endfunc %}
+
+{% func HistoryHTML(rq *http.Request, hyphaName, list string) %}
+{%= NavHTML(rq, hyphaName, "history") %}
+
+
+
+ History of {%s util.BeautifulName(hyphaName) %}
+ {%s= list %}
+
+
+
+
+ Recent Changes
+ โ Back
+
+
+ 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(`
+ |
+ `)
+//line views/history.qtpl:18
+ case n:
+//line views/history.qtpl:18
+ qw422016.N().S(`
+ `)
+//line views/history.qtpl:19
+ qw422016.N().D(n)
+//line views/history.qtpl:19
+ qw422016.N().S(`
+ `)
+//line views/history.qtpl:20
+ default:
+//line views/history.qtpl:20
+ qw422016.N().S(`
+ `)
+//line views/history.qtpl:21
+ qw422016.N().D(m)
+//line views/history.qtpl:21
+ qw422016.N().S(`
+ `)
+//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
+
+
+ RSS , Atom or JSON feed .
+
+ `)
+//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(`
+
+ `)
+//line views/history.qtpl:40
+ if len(changes) == 0 {
+//line views/history.qtpl:40
+ qw422016.N().S(`
+ Could not find any recent changes.
+ `)
+//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(`
+
+ `)
+//line views/history.qtpl:46
+ qw422016.N().S(recentChangesEntry(entry))
+//line views/history.qtpl:46
+ qw422016.N().S(`
+
+ `)
+//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(`
+
+
+
`)
+//line views/history.qtpl:56
+ qw422016.E().S(rev.TimeString())
+//line views/history.qtpl:56
+ qw422016.N().S(` `)
+//line views/history.qtpl:57
+ qw422016.E().S(rev.Hash)
+//line views/history.qtpl:57
+ qw422016.N().S(`
+`)
+//line views/history.qtpl:58
+ qw422016.N().S(rev.HyphaeLinksHTML())
+//line views/history.qtpl:58
+ qw422016.N().S(`
+`)
+//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(`by `)
+//line views/history.qtpl:59
+ qw422016.E().S(rev.Username)
+//line views/history.qtpl:59
+ qw422016.N().S(` `)
+//line views/history.qtpl:59
+ }
+//line views/history.qtpl:59
+ qw422016.N().S(`
+`)
+//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(`
+
+
+
+ History of `)
+//line views/history.qtpl:67
+ qw422016.E().S(util.BeautifulName(hyphaName))
+//line views/history.qtpl:67
+ qw422016.N().S(`
+ `)
+//line views/history.qtpl:68
+ qw422016.N().S(list)
+//line views/history.qtpl:68
+ qw422016.N().S(`
+
+
+
+{% stripspace %}
+
+ {%-s= util.SiteNavIcon -%}
+ :
+
+
+ {% for i, part := range parts %}
+ {% if i > 0 %}
+ /
+ {% endif %}
+
+
+ {%s= util.BeautifulName(part) %}
+
+ {% code prevAcc += part + "/" %}
+ {% endfor %}
+{% endstripspace %}
+
+{% endfunc %}
+
+{% func BackLinksHTML(h *hyphae.Hypha) %}
+
+{% endfunc %}
+
+{% func AttachmentHTML(h *hyphae.Hypha) %}
+ {% switch filepath.Ext(h.BinaryPath) %}
+
+ {% case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico" %}
+
+
+
+
+
In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.
+{%= modalEnd(hyphaName, true) %}
+{% endfunc %}
+
+{% func UnattachAskHTML(rq *http.Request, hyphaName string, isOld bool) %}
+{%= NavHTML(rq, hyphaName, "unattach-ask") %}
+{%= modalBegin(
+ "unattach",
+ 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)) %}
+ New name
+ Rename subhyphae too
+
+ 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.
+{%= modalEnd(hyphaName, false) %}
+{% endfunc %}
+
+{% func modalReallyWant(hyphaName, verb string) %}
+ Do you really want to {%s verb %} hypha {%s hyphaName %} ?
+{% endfunc %}
+
+{% func modalBegin(path, hyphaName, formAttrs, legend string) %}
+
+{% endfunc %}
diff --git a/views/modal.qtpl.go b/views/modal.qtpl.go
new file mode 100644
index 0000000..3efb837
--- /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(`
+ In this version of MycorrhizaWiki you cannot undelete a deleted hypha but the history can still be accessed.
+`)
+//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",
+ 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(`
+ New name
+ Rename subhyphae too
+
+ 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.
+`)
+//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(`
+ Do you really want to `)
+//line views/modal.qtpl:45
+ qw422016.E().S(verb)
+//line views/modal.qtpl:45
+ qw422016.N().S(` hypha `)
+//line views/modal.qtpl:45
+ qw422016.E().S(hyphaName)
+//line views/modal.qtpl:45
+ qw422016.N().S(` ?
+`)
+//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(`
+
+`)
+//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/templates/http_mutators.qtpl b/views/mutators.qtpl
similarity index 74%
rename from templates/http_mutators.qtpl
rename to views/mutators.qtpl
index 39a37ba..233c3d5 100644
--- a/templates/http_mutators.qtpl
+++ b/views/mutators.qtpl
@@ -1,9 +1,11 @@
{% import "net/http" %}
+{% import "github.com/bouncepaw/mycorrhiza/util" %}
{% func EditHTML(rq *http.Request, hyphaName, textAreaFill, warning string) %}
-{%s= navHTML(rq, hyphaName, "edit") %}
-
- Edit {%s hyphaName %}
+{%s= NavHTML(rq, hyphaName, "edit") %}
+
+
+ Edit {%s util.BeautifulName(hyphaName) %}
{%s= warning %}
+
- Edit {%s hyphaName %} (preview)
+{%s= NavHTML(rq, hyphaName, "edit") %}
+
+
+ Edit {%s util.BeautifulName(hyphaName) %} (preview)
{%s= warning %}
+
- Edit `)
-//line templates/http_mutators.qtpl:6
- qw422016.E().S(hyphaName)
-//line templates/http_mutators.qtpl:6
+
+
+ Edit `)
+//line views/mutators.qtpl:8
+ qw422016.E().S(util.BeautifulName(hyphaName))
+//line views/mutators.qtpl:8
qw422016.N().S(`
`)
-//line templates/http_mutators.qtpl:7
+//line views/mutators.qtpl:9
qw422016.N().S(warning)
-//line templates/http_mutators.qtpl:7
+//line views/mutators.qtpl:9
qw422016.N().S(`
+
+
+
Edit `)
-//line templates/http_mutators.qtpl:22
- qw422016.E().S(hyphaName)
-//line templates/http_mutators.qtpl:22
+//line views/mutators.qtpl:26
+ qw422016.E().S(util.BeautifulName(hyphaName))
+//line views/mutators.qtpl:26
qw422016.N().S(` (preview)
`)
-//line templates/http_mutators.qtpl:23
+//line views/mutators.qtpl:27
qw422016.N().S(warning)
-//line templates/http_mutators.qtpl:23
+//line views/mutators.qtpl:27
qw422016.N().S(`
Note that the hypha is not saved yet. You can preview the changes โ
`)
-//line templates/http_mutators.qtpl:33
+//line views/mutators.qtpl:37
qw422016.N().S(renderedPage)
-//line templates/http_mutators.qtpl:33
+//line views/mutators.qtpl:37
qw422016.N().S(`
+
+
{%- for _, entry := range navEntries -%}
{%- if navType == "revision" && entry.path == "revision" -%}
- {%s revisionHash[0] %}
+ {%s revisionHash[0] %}
{%- elseif navType == entry.path -%}
- {%s entry.title %}
+ {%s entry.title %}
{%- elseif entry.path != "revision" && u.CanProceed(entry.path) -%}
- {%s entry.title %}
+ {%s entry.title %}
{%- endif -%}
{%- endfor -%}
@@ -45,7 +46,7 @@ var navEntries = []navEntry{
{% endfunc %}
-{% func userMenuHTML(u *user.User) %}
+{% func UserMenuHTML(u *user.User) %}
{% if user.AuthUsed %}