From cbb7a02c8463d4eafb421fef05f1a619d18a1f5b Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Mon, 19 Oct 2020 01:26:05 +0500 Subject: [PATCH] Fix untracked images for new hyphae --- http_mutators.go | 12 +++-- templates/delete.qtpl.go | 112 +++++++++++++++++++-------------------- 2 files changed, 64 insertions(+), 60 deletions(-) diff --git a/http_mutators.go b/http_mutators.go index 31f9915..aa669c0 100644 --- a/http_mutators.go +++ b/http_mutators.go @@ -153,20 +153,22 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) { return } if !isOld { - HyphaStorage[hyphaName] = &HyphaData{ + hd := HyphaData{ textType: TextGemini, textPath: fullPath, } + HyphaStorage[hyphaName] = &hd + hyphaData = &hd } else { hyphaData.textType = TextGemini hyphaData.textPath = fullPath } - http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) history.Operation(history.TypeEditText). WithFiles(fullPath). WithMsg(fmt.Sprintf("Edit ‘%s’", hyphaName)). WithSignature("anon"). Apply() + http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) } // handlerUploadBinary uploads a new binary part for the hypha. @@ -203,10 +205,12 @@ func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) { log.Println(err) } if !isOld { - HyphaStorage[hyphaName] = &HyphaData{ + hd := HyphaData{ binaryPath: fullPath, binaryType: mimeType, } + HyphaStorage[hyphaName] = &hd + hyphaData = &hd } else { if hyphaData.binaryPath != fullPath { if err := history.Rename(hyphaData.binaryPath, fullPath); err != nil { @@ -224,10 +228,10 @@ func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) { return } log.Println("Written", len(data), "of binary data for", hyphaName, "to path", fullPath) - http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) history.Operation(history.TypeEditText). WithFiles(fullPath, hyphaData.binaryPath). WithMsg(fmt.Sprintf("Upload binary part for ‘%s’ with type ‘%s’", hyphaName, mimeType.Mime())). WithSignature("anon"). Apply() + http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) } diff --git a/templates/delete.qtpl.go b/templates/delete.qtpl.go index ee48b06..f016775 100644 --- a/templates/delete.qtpl.go +++ b/templates/delete.qtpl.go @@ -1,151 +1,151 @@ -// Code generated by qtc from "http_delete.qtpl". DO NOT EDIT. +// Code generated by qtc from "delete.qtpl". DO NOT EDIT. // See https://github.com/valyala/quicktemplate for details. // This dialog is to be shown to a user when they try to delete a hypha. -//line templates/http_delete.qtpl:2 +//line templates/delete.qtpl:2 package templates -//line templates/http_delete.qtpl:2 +//line templates/delete.qtpl:2 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line templates/http_delete.qtpl:2 +//line templates/delete.qtpl:2 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line templates/http_delete.qtpl:2 +//line templates/delete.qtpl:2 func StreamDeleteAskHTML(qw422016 *qt422016.Writer, hyphaName string, isOld bool) { -//line templates/http_delete.qtpl:2 +//line templates/delete.qtpl:2 qw422016.N().S(`
`) -//line templates/http_delete.qtpl:4 +//line templates/delete.qtpl:4 streamnavHTML(qw422016, hyphaName, "delete-ask") -//line templates/http_delete.qtpl:4 +//line templates/delete.qtpl:4 qw422016.N().S(` `) -//line templates/http_delete.qtpl:5 +//line templates/delete.qtpl:5 if isOld { -//line templates/http_delete.qtpl:5 +//line templates/delete.qtpl:5 qw422016.N().S(`

Delete `) -//line templates/http_delete.qtpl:7 +//line templates/delete.qtpl:7 qw422016.E().S(hyphaName) -//line templates/http_delete.qtpl:7 +//line templates/delete.qtpl:7 qw422016.N().S(`?

Do you really want to delete hypha `) -//line templates/http_delete.qtpl:8 +//line templates/delete.qtpl:8 qw422016.E().S(hyphaName) -//line templates/http_delete.qtpl:8 +//line templates/delete.qtpl:8 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/http_delete.qtpl:13 +//line templates/delete.qtpl:13 } else { -//line templates/http_delete.qtpl:13 +//line templates/delete.qtpl:13 qw422016.N().S(` `) -//line templates/http_delete.qtpl:14 +//line templates/delete.qtpl:14 streamcannotDeleteDueToNonExistence(qw422016, hyphaName) -//line templates/http_delete.qtpl:14 +//line templates/delete.qtpl:14 qw422016.N().S(` `) -//line templates/http_delete.qtpl:15 +//line templates/delete.qtpl:15 } -//line templates/http_delete.qtpl:15 +//line templates/delete.qtpl:15 qw422016.N().S(`
`) -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 } -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 func WriteDeleteAskHTML(qq422016 qtio422016.Writer, hyphaName string, isOld bool) { -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 StreamDeleteAskHTML(qw422016, hyphaName, isOld) -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 qt422016.ReleaseWriter(qw422016) -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 } -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 func DeleteAskHTML(hyphaName string, isOld bool) string { -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 qb422016 := qt422016.AcquireByteBuffer() -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 WriteDeleteAskHTML(qb422016, hyphaName, isOld) -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 qs422016 := string(qb422016.B) -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 qt422016.ReleaseByteBuffer(qb422016) -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 return qs422016 -//line templates/http_delete.qtpl:17 +//line templates/delete.qtpl:17 } -//line templates/http_delete.qtpl:19 +//line templates/delete.qtpl:19 func streamcannotDeleteDueToNonExistence(qw422016 *qt422016.Writer, hyphaName string) { -//line templates/http_delete.qtpl:19 +//line templates/delete.qtpl:19 qw422016.N().S(`

Cannot delete `) -//line templates/http_delete.qtpl:21 +//line templates/delete.qtpl:21 qw422016.E().S(hyphaName) -//line templates/http_delete.qtpl:21 +//line templates/delete.qtpl:21 qw422016.N().S(`

This hypha does not exist.

Go back

`) -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 } -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 func writecannotDeleteDueToNonExistence(qq422016 qtio422016.Writer, hyphaName string) { -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 qw422016 := qt422016.AcquireWriter(qq422016) -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 streamcannotDeleteDueToNonExistence(qw422016, hyphaName) -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 qt422016.ReleaseWriter(qw422016) -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 } -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 func cannotDeleteDueToNonExistence(hyphaName string) string { -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 qb422016 := qt422016.AcquireByteBuffer() -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 writecannotDeleteDueToNonExistence(qb422016, hyphaName) -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 qs422016 := string(qb422016.B) -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 qt422016.ReleaseByteBuffer(qb422016) -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 return qs422016 -//line templates/http_delete.qtpl:25 +//line templates/delete.qtpl:25 }