mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-04-13 22:33:19 +00:00
Code Issues Releases Wiki Activity

Backlinks: Fix backlinks for media and empty hyphae

Browse Source
This commit is contained in:
Timur Ismagilov 2022-02-26 09:42:54 +03:00
parent 3e82c6f189
commit d8699d46c0
5 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hyphae/existing_hypha.go
View File

@ -2,6 +2,8 @@ package hyphae
import (
"github.com/bouncepaw/mycorrhiza/util"
"os"
"path/filepath"
)
// ExistingHypha is not EmptyHypha. *MediaHypha and *TextualHypha implement this interface.
@ -59,3 +61,19 @@ func Insert(h ExistingHypha) (madeNewRecord bool) {
return !recorded
}
func WriteToMycoFile(h ExistingHypha, data []byte) error {
if err := os.MkdirAll(filepath.Dir(h.TextFilePath()), 0777); err != nil {
return err
}
if err := os.WriteFile(h.TextFilePath(), data, 0666); err != nil {
return err
}
switch h := h.(type) {
case *MediaHypha:
if !h.HasTextFile() {
h.mycoFilePath = h.TextFilePath()
}
}
return nil
}

7
shroom/upload.go
View File

@ -33,11 +33,7 @@ func historyMessageForTextUpload(h hyphae.Hypha, userMessage string) string {
}
func writeTextToDisk(h hyphae.ExistingHypha, data []byte, hop *history.Op) error {
if err := os.MkdirAll(filepath.Dir(h.TextFilePath()), 0777); err != nil {
return err
}
if err := os.WriteFile(h.TextFilePath(), data, 0666); err != nil {
if err := hyphae.WriteToMycoFile(h, data); err != nil {
return err
}
hop.WithFiles(h.TextFilePath())
@ -92,6 +88,7 @@ func UploadText(h hyphae.Hypha, data []byte, userMessage string, u *user.User) e
}
hyphae.Insert(H)
backlinks.UpdateBacklinksAfterEdit(H, "")
case *hyphae.MediaHypha:
oldText, err := FetchTextFile(h)
if err != nil {

4
user/user.go
View File

@ -31,6 +31,10 @@ type User struct {
// Route — Right (more is more right)
var minimalRights = map[string]int{
"text": 0,
"backlinks": 0,
"history": 0,
"attachment": 1,
"edit": 1,
"upload-binary": 1,
"upload-text": 1,

2
views/nav.qtpl
View File

@ -24,7 +24,7 @@
<ul class="hypha-info__list">
{%= hyphaInfoEntry(h, u, "history", lc.Get("ui.history_link")) %}
{%= hyphaInfoEntry(h, u, "rename", lc.Get("ui.rename_link")) %}
{%= hyphaInfoEntry(h, u, "delete-ask", lc.Get("ui.delete_link")) %}
{%= hyphaInfoEntry(h, u, "delete", lc.Get("ui.delete_link")) %}
{%= hyphaInfoEntry(h, u, "text", lc.Get("ui.text_link")) %}
{%= hyphaInfoEntry(h, u, "attachment", lc.Get("ui.attachment_link")) %}
{%= hyphaInfoEntry(h, u, "backlinks", lc.GetPlural("ui.backlinks_link", backs)) %}

2
views/nav.qtpl.go
View File

@ -127,7 +127,7 @@ func streamhyphaInfo(qw422016 *qt422016.Writer, rq *http.Request, h hyphae.Hypha
qw422016.N().S(`
`)
//line views/nav.qtpl:27
streamhyphaInfoEntry(qw422016, h, u, "delete-ask", lc.Get("ui.delete_link"))
streamhyphaInfoEntry(qw422016, h, u, "delete", lc.Get("ui.delete_link"))
//line views/nav.qtpl:27
qw422016.N().S(`
`)