diff --git a/backlinks/hooks.go b/backlinks/hooks.go
index 9a5ec85..1585475 100644
--- a/backlinks/hooks.go
+++ b/backlinks/hooks.go
@@ -4,9 +4,9 @@ import (
"github.com/bouncepaw/mycomarkup/v5"
"github.com/bouncepaw/mycomarkup/v5/links"
"github.com/bouncepaw/mycomarkup/v5/mycocontext"
- "github.com/bouncepaw/mycomarkup/v5/options"
"github.com/bouncepaw/mycomarkup/v5/tools"
"github.com/bouncepaw/mycorrhiza/hyphae"
+ "github.com/bouncepaw/mycorrhiza/mycoopts"
)
// UpdateBacklinksAfterEdit is a creation/editing hook for backlinks index
@@ -35,7 +35,7 @@ func extractHyphaLinks(h hyphae.Hypha) []string {
// extractHyphaLinksFromContent extracts local hypha links from the provided text.
func extractHyphaLinksFromContent(hyphaName string, contents string) []string {
- ctx, _ := mycocontext.ContextFromStringInput(contents, options.Options{HyphaName: hyphaName}.FillTheRest())
+ ctx, _ := mycocontext.ContextFromStringInput(contents, mycoopts.MarkupOptions(hyphaName))
linkVisitor, getLinks := tools.LinkVisitor(ctx)
// Ignore the result of BlockTree because we call it for linkVisitor.
_ = mycomarkup.BlockTree(ctx, linkVisitor)
diff --git a/help/web.go b/help/web.go
index 70cec7d..31ec697 100644
--- a/help/web.go
+++ b/help/web.go
@@ -3,7 +3,7 @@ package help
// stuff.go is used for meta stuff about the wiki or all hyphae at once.
import (
"github.com/bouncepaw/mycomarkup/v5"
- "github.com/bouncepaw/mycorrhiza/shroom"
+ "github.com/bouncepaw/mycorrhiza/mycoopts"
"github.com/bouncepaw/mycorrhiza/viewutil"
"github.com/gorilla/mux"
"io"
@@ -78,7 +78,7 @@ func handlerHelp(w http.ResponseWriter, rq *http.Request) {
}
// TODO: change for the function that uses byte array when there is such function in mycomarkup.
- ctx, _ := mycocontext.ContextFromStringInput(string(content), shroom.MarkupOptions(articlePath))
+ ctx, _ := mycocontext.ContextFromStringInput(string(content), mycoopts.MarkupOptions(articlePath))
ast := mycomarkup.BlockTree(ctx)
result := mycomarkup.BlocksToHTML(ctx, ast)
w.WriteHeader(http.StatusOK)
diff --git a/main.go b/main.go
index fb09898..b7dc89e 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
//go:generate go run github.com/valyala/quicktemplate/qtc -dir=views
//go:generate go run github.com/valyala/quicktemplate/qtc -dir=tree
//go:generate go run github.com/valyala/quicktemplate/qtc -dir=history
+//go:generate go run github.com/valyala/quicktemplate/qtc -dir=mycoopts
// Command mycorrhiza is a program that runs a mycorrhiza wiki.
package main
diff --git a/mycoopts/mycoopts.go b/mycoopts/mycoopts.go
new file mode 100644
index 0000000..a160320
--- /dev/null
+++ b/mycoopts/mycoopts.go
@@ -0,0 +1,54 @@
+package mycoopts
+
+import (
+ "errors"
+ "github.com/bouncepaw/mycomarkup/v5/options"
+ "github.com/bouncepaw/mycorrhiza/cfg"
+ "github.com/bouncepaw/mycorrhiza/hyphae"
+ "github.com/bouncepaw/mycorrhiza/interwiki"
+ "github.com/bouncepaw/mycorrhiza/util"
+)
+
+func MarkupOptions(hyphaName string) options.Options {
+ return options.Options{
+ HyphaName: hyphaName,
+ WebSiteURL: cfg.URL,
+ TransclusionSupported: true,
+ RedLinksSupported: true,
+ InterwikiSupported: true,
+ HyphaExists: func(hyphaName string) bool {
+ switch hyphae.ByName(hyphaName).(type) {
+ case *hyphae.EmptyHypha:
+ return false
+ default:
+ return true
+ }
+ },
+ IterateHyphaNamesWith: func(λ func(string)) {
+ for h := range hyphae.YieldExistingHyphae() {
+ λ(h.CanonicalName())
+ }
+ },
+ HyphaHTMLData: func(hyphaName string) (rawText, binaryBlock string, err error) {
+ switch h := hyphae.ByName(hyphaName).(type) {
+ case *hyphae.EmptyHypha:
+ err = errors.New("Hypha " + hyphaName + " does not exist")
+ case *hyphae.TextualHypha:
+ rawText, err = hyphae.FetchMycomarkupFile(h)
+ case *hyphae.MediaHypha:
+ rawText, err = hyphae.FetchMycomarkupFile(h)
+ binaryBlock = mediaRaw(h)
+ }
+ return
+ },
+ LocalTargetCanonicalName: util.CanonicalName,
+ LocalLinkHref: func(hyphaName string) string {
+ return "/hypha/" + util.CanonicalName(hyphaName)
+ },
+ LocalImgSrc: func(hyphaName string) string {
+ return "/binary/" + util.CanonicalName(hyphaName)
+ },
+ LinkHrefFormatForInterwikiPrefix: interwiki.HrefLinkFormatFor,
+ ImgSrcFormatForInterwikiPrefix: interwiki.ImgSrcFormatFor,
+ }.FillTheRest()
+}
diff --git a/views/hypha.qtpl b/mycoopts/view.qtpl
similarity index 84%
rename from views/hypha.qtpl
rename to mycoopts/view.qtpl
index a3d2bfc..935e4de 100644
--- a/views/hypha.qtpl
+++ b/mycoopts/view.qtpl
@@ -2,11 +2,8 @@
{% import "github.com/bouncepaw/mycorrhiza/hyphae" %}
{% import "github.com/bouncepaw/mycorrhiza/l18n" %}
-{% import "github.com/bouncepaw/mycorrhiza/util" %}
-{% func beautifulLink(hyphaName string) %}{%s util.BeautifulName(hyphaName) %}{% endfunc %}
-
-{% func MediaRaw(h *hyphae.MediaHypha) %}{%= Media(h, l18n.New("en", "en")) %}{% endfunc %}
+{% func mediaRaw(h *hyphae.MediaHypha) %}{%= Media(h, l18n.New("en", "en")) %}{% endfunc %}
{% func Media(h *hyphae.MediaHypha, lc *l18n.Localizer) %}
{% switch filepath.Ext(h.MediaFilePath()) %}
diff --git a/mycoopts/view.qtpl.go b/mycoopts/view.qtpl.go
new file mode 100644
index 0000000..ddb1450
--- /dev/null
+++ b/mycoopts/view.qtpl.go
@@ -0,0 +1,190 @@
+// Code generated by qtc from "view.qtpl". DO NOT EDIT.
+// See https://github.com/valyala/quicktemplate for details.
+
+//line mycoopts/view.qtpl:1
+package mycoopts
+
+//line mycoopts/view.qtpl:1
+import "path/filepath"
+
+//line mycoopts/view.qtpl:3
+import "github.com/bouncepaw/mycorrhiza/hyphae"
+
+//line mycoopts/view.qtpl:4
+import "github.com/bouncepaw/mycorrhiza/l18n"
+
+//line mycoopts/view.qtpl:6
+import (
+ qtio422016 "io"
+
+ qt422016 "github.com/valyala/quicktemplate"
+)
+
+//line mycoopts/view.qtpl:6
+var (
+ _ = qtio422016.Copy
+ _ = qt422016.AcquireByteBuffer
+)
+
+//line mycoopts/view.qtpl:6
+func streammediaRaw(qw422016 *qt422016.Writer, h *hyphae.MediaHypha) {
+//line mycoopts/view.qtpl:6
+ StreamMedia(qw422016, h, l18n.New("en", "en"))
+//line mycoopts/view.qtpl:6
+}
+
+//line mycoopts/view.qtpl:6
+func writemediaRaw(qq422016 qtio422016.Writer, h *hyphae.MediaHypha) {
+//line mycoopts/view.qtpl:6
+ qw422016 := qt422016.AcquireWriter(qq422016)
+//line mycoopts/view.qtpl:6
+ streammediaRaw(qw422016, h)
+//line mycoopts/view.qtpl:6
+ qt422016.ReleaseWriter(qw422016)
+//line mycoopts/view.qtpl:6
+}
+
+//line mycoopts/view.qtpl:6
+func mediaRaw(h *hyphae.MediaHypha) string {
+//line mycoopts/view.qtpl:6
+ qb422016 := qt422016.AcquireByteBuffer()
+//line mycoopts/view.qtpl:6
+ writemediaRaw(qb422016, h)
+//line mycoopts/view.qtpl:6
+ qs422016 := string(qb422016.B)
+//line mycoopts/view.qtpl:6
+ qt422016.ReleaseByteBuffer(qb422016)
+//line mycoopts/view.qtpl:6
+ return qs422016
+//line mycoopts/view.qtpl:6
+}
+
+//line mycoopts/view.qtpl:8
+func StreamMedia(qw422016 *qt422016.Writer, h *hyphae.MediaHypha, lc *l18n.Localizer) {
+//line mycoopts/view.qtpl:8
+ qw422016.N().S(`
+ `)
+//line mycoopts/view.qtpl:9
+ switch filepath.Ext(h.MediaFilePath()) {
+//line mycoopts/view.qtpl:11
+ case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico":
+//line mycoopts/view.qtpl:11
+ qw422016.N().S(`
+
+
+//line mycoopts/view.qtpl:13
+ qw422016.N().S(h.CanonicalName())
+//line mycoopts/view.qtpl:13
+ qw422016.N().S(`)
+
-
-//line views/hypha.qtpl:16
- qw422016.N().S(h.CanonicalName())
-//line views/hypha.qtpl:16
- qw422016.N().S(`)
-