Merge pull request '[BUG] Fix relative links on orgmode' (#2385) from gusted/forgejo-orgmode-relative-links into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2385 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
commit
b604b89108
2 changed files with 55 additions and 1 deletions
modules/markup/orgmode
|
@ -147,11 +147,21 @@ func (r *Writer) resolveLink(node org.Node) string {
|
||||||
}
|
}
|
||||||
if len(link) > 0 && !markup.IsLinkStr(link) &&
|
if len(link) > 0 && !markup.IsLinkStr(link) &&
|
||||||
link[0] != '#' && !strings.HasPrefix(link, mailto) {
|
link[0] != '#' && !strings.HasPrefix(link, mailto) {
|
||||||
base := r.Ctx.Links.Base
|
|
||||||
|
var base string
|
||||||
|
if r.Ctx.IsWiki {
|
||||||
|
base = r.Ctx.Links.WikiLink()
|
||||||
|
} else if r.Ctx.Links.HasBranchInfo() {
|
||||||
|
base = r.Ctx.Links.SrcLink()
|
||||||
|
} else {
|
||||||
|
base = r.Ctx.Links.Base
|
||||||
|
}
|
||||||
|
|
||||||
switch l.Kind() {
|
switch l.Kind() {
|
||||||
case "image", "video":
|
case "image", "video":
|
||||||
base = r.Ctx.Links.ResolveMediaLink(r.Ctx.IsWiki)
|
base = r.Ctx.Links.ResolveMediaLink(r.Ctx.IsWiki)
|
||||||
}
|
}
|
||||||
|
|
||||||
link = util.URLJoin(base, link)
|
link = util.URLJoin(base, link)
|
||||||
}
|
}
|
||||||
return link
|
return link
|
||||||
|
|
|
@ -36,6 +36,10 @@ func TestRender_StandardLinks(t *testing.T) {
|
||||||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
|
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// No BranchPath or TreePath set.
|
||||||
|
test("[[file:comfy][comfy]]",
|
||||||
|
`<p><a href="http://localhost:3000/gogits/gogs/comfy">comfy</a></p>`)
|
||||||
|
|
||||||
test("[[https://google.com/]]",
|
test("[[https://google.com/]]",
|
||||||
`<p><a href="https://google.com/">https://google.com/</a></p>`)
|
`<p><a href="https://google.com/">https://google.com/</a></p>`)
|
||||||
|
|
||||||
|
@ -44,6 +48,46 @@ func TestRender_StandardLinks(t *testing.T) {
|
||||||
`<p><a href="`+lnk+`">WikiPage</a></p>`)
|
`<p><a href="`+lnk+`">WikiPage</a></p>`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRender_BaseLinks(t *testing.T) {
|
||||||
|
setting.AppURL = AppURL
|
||||||
|
setting.AppSubURL = AppSubURL
|
||||||
|
|
||||||
|
testBranch := func(input, expected string) {
|
||||||
|
buffer, err := RenderString(&markup.RenderContext{
|
||||||
|
Ctx: git.DefaultContext,
|
||||||
|
Links: markup.Links{
|
||||||
|
Base: setting.AppSubURL,
|
||||||
|
BranchPath: "branch/main",
|
||||||
|
},
|
||||||
|
}, input)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
|
||||||
|
}
|
||||||
|
|
||||||
|
testBranchTree := func(input, expected string) {
|
||||||
|
buffer, err := RenderString(&markup.RenderContext{
|
||||||
|
Ctx: git.DefaultContext,
|
||||||
|
Links: markup.Links{
|
||||||
|
Base: setting.AppSubURL,
|
||||||
|
BranchPath: "branch/main",
|
||||||
|
TreePath: "deep/nested/folder",
|
||||||
|
},
|
||||||
|
}, input)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
|
||||||
|
}
|
||||||
|
|
||||||
|
testBranch("[[file:comfy][comfy]]",
|
||||||
|
`<p><a href="http://localhost:3000/gogits/gogs/src/branch/main/comfy">comfy</a></p>`)
|
||||||
|
testBranchTree("[[file:comfy][comfy]]",
|
||||||
|
`<p><a href="http://localhost:3000/gogits/gogs/src/branch/main/deep/nested/folder/comfy">comfy</a></p>`)
|
||||||
|
|
||||||
|
testBranch("[[file:./src][./src/]]",
|
||||||
|
`<p><a href="http://localhost:3000/gogits/gogs/src/branch/main/src">./src/</a></p>`)
|
||||||
|
testBranchTree("[[file:./src][./src/]]",
|
||||||
|
`<p><a href="http://localhost:3000/gogits/gogs/src/branch/main/deep/nested/folder/src">./src/</a></p>`)
|
||||||
|
}
|
||||||
|
|
||||||
func TestRender_Media(t *testing.T) {
|
func TestRender_Media(t *testing.T) {
|
||||||
setting.AppURL = AppURL
|
setting.AppURL = AppURL
|
||||||
setting.AppSubURL = AppSubURL
|
setting.AppSubURL = AppSubURL
|
||||||
|
|
Loading…
Reference in a new issue