^?!:#@><*|\"\\'&%")
+ default:
+ if hop := hyphaData.RenameHypha(hyphaName, newName, recursive); len(hop.Errs) == 0 {
+ http.Redirect(w, rq, "/page/"+newName, http.StatusSeeOther)
+ } else {
+ HttpErr(w, http.StatusInternalServerError, hyphaName,
+ "Error: could not rename hypha",
+ fmt.Sprintf("Could not rename this hypha due to an internal error. Server errors: %v", hop.Errs))
+ }
+ }
+}
+
+// handlerDeleteAsk shows a delete dialog.
+func handlerDeleteAsk(w http.ResponseWriter, rq *http.Request) {
+ log.Println(rq.URL)
+ var (
+ hyphaName = HyphaNameFromRq(rq, "delete-ask")
+ _, isOld = HyphaStorage[hyphaName]
+ )
+ util.HTTP200Page(w, base("Delete "+hyphaName+"?", templates.DeleteAskHTML(hyphaName, isOld)))
+}
+
+// handlerDeleteConfirm deletes a hypha for sure
+func handlerDeleteConfirm(w http.ResponseWriter, rq *http.Request) {
+ log.Println(rq.URL)
+ var (
+ hyphaName = HyphaNameFromRq(rq, "delete-confirm")
+ hyphaData, isOld = HyphaStorage[hyphaName]
+ )
+ if isOld {
+ // If deleted successfully
+ if hop := hyphaData.DeleteHypha(hyphaName); len(hop.Errs) == 0 {
+ http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther)
+ } else {
+ HttpErr(w, http.StatusInternalServerError, hyphaName,
+ "Error: could not delete hypha",
+ fmt.Sprintf("Could not delete this hypha due to an internal error. Server errors: %v", hop.Errs))
+ }
+ } else {
+ // The precondition is to have the hypha in the first place.
+ HttpErr(w, http.StatusPreconditionFailed, hyphaName,
+ "Error: no such hypha",
+ "Could not delete this hypha because it does not exist.")
+ }
}
// handlerEdit shows the edit form. It doesn't edit anything actually.
diff --git a/http_readers.go b/http_readers.go
index f288210..5843e4d 100644
--- a/http_readers.go
+++ b/http_readers.go
@@ -6,7 +6,6 @@ import (
"log"
"net/http"
"os"
- "path"
"strings"
"github.com/bouncepaw/mycorrhiza/gemtext"
@@ -29,8 +28,9 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
log.Println(rq.URL)
var (
shorterUrl = strings.TrimPrefix(rq.URL.Path, "/rev/")
- revHash = path.Dir(shorterUrl)
- hyphaName = CanonicalName(strings.TrimPrefix(shorterUrl, revHash+"/"))
+ firstSlashIndex = strings.IndexRune(shorterUrl, '/')
+ revHash = shorterUrl[:firstSlashIndex]
+ hyphaName = CanonicalName(shorterUrl[firstSlashIndex+1:])
contents = fmt.Sprintf(`This hypha had no text at this revision.
`) textPath = hyphaName + "&.gmi" textContents, err = history.FileAtRevision(textPath, revHash) @@ -55,15 +55,15 @@ func handlerHistory(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) hyphaName := HyphaNameFromRq(rq, "history") var tbody string - if _, ok := HyphaStorage[hyphaName]; ok { - revs, err := history.Revisions(hyphaName) - if err == nil { - for _, rev := range revs { - tbody += rev.AsHtmlTableRow(hyphaName) - } + + // History can be found for files that do not exist anymore. + revs, err := history.Revisions(hyphaName) + if err == nil { + for _, rev := range revs { + tbody += rev.AsHtmlTableRow(hyphaName) } - log.Println(revs) } + log.Println("Found", len(revs), "revisions for", hyphaName) util.HTTP200Page(w, base(hyphaName, templates.HistoryHTML(hyphaName, tbody))) diff --git a/hypha.go b/hypha.go index d3be116..74a8685 100644 --- a/hypha.go +++ b/hypha.go @@ -7,8 +7,11 @@ import ( "log" "os" "path/filepath" + "strings" "github.com/bouncepaw/mycorrhiza/gemtext" + "github.com/bouncepaw/mycorrhiza/history" + "github.com/bouncepaw/mycorrhiza/util" ) func init() { @@ -37,6 +40,78 @@ type HyphaData struct { binaryType BinaryType } +// DeleteHypha deletes hypha and makes a history record about that. +func (hd *HyphaData) DeleteHypha(hyphaName string) *history.HistoryOp { + hop := history.Operation(history.TypeDeleteHypha). + WithFilesRemoved(hd.textPath, hd.binaryPath). + WithMsg(fmt.Sprintf("Delete โ%sโ", hyphaName)). + WithSignature("anon"). + Apply() + if len(hop.Errs) == 0 { + delete(HyphaStorage, hyphaName) + } + return hop +} + +func findHyphaeToRename(hyphaName string, recursive bool) []string { + hyphae := []string{hyphaName} + if recursive { + hyphae = append(hyphae, util.FindSubhyphae(hyphaName, IterateHyphaNamesWith)...) + } + return hyphae +} + +func renamingPairs(hyphaNames []string, replaceName func(string) string) map[string]string { + renameMap := make(map[string]string) + for _, hn := range hyphaNames { + if hd, ok := HyphaStorage[hn]; ok { + if hd.textPath != "" { + renameMap[hd.textPath] = replaceName(hd.textPath) + } + if hd.binaryPath != "" { + renameMap[hd.binaryPath] = replaceName(hd.binaryPath) + } + } + } + return renameMap +} + +// word Data is plural here +func relocateHyphaData(hyphaNames []string, replaceName func(string) string) { + for _, hyphaName := range hyphaNames { + if hd, ok := HyphaStorage[hyphaName]; ok { + hd.textPath = replaceName(hd.textPath) + hd.binaryPath = replaceName(hd.binaryPath) + HyphaStorage[replaceName(hyphaName)] = hd + delete(HyphaStorage, hyphaName) + } + } +} + +// 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 (hd *HyphaData) RenameHypha(hyphaName, newName string, recursive bool) *history.HistoryOp { + var ( + replaceName = func(str string) string { + return strings.Replace(str, hyphaName, newName, 1) + } + hyphaNames = findHyphaeToRename(hyphaName, recursive) + renameMap = renamingPairs(hyphaNames, replaceName) + renameMsg = "Rename โ%sโ to โ%sโ" + hop = history.Operation(history.TypeRenameHypha) + ) + if recursive { + renameMsg += " recursively" + } + hop.WithFilesRenamed(renameMap). + WithMsg(fmt.Sprintf(renameMsg, hyphaName, newName)). + WithSignature("anon"). + Apply() + if len(hop.Errs) == 0 { + relocateHyphaData(hyphaNames, replaceName) + } + return hop +} + // binaryHtmlBlock creates an html block for binary part of the hypha. func binaryHtmlBlock(hyphaName string, d *HyphaData) string { switch d.binaryType { diff --git a/main.go b/main.go index cb9588f..7956270 100644 --- a/main.go +++ b/main.go @@ -10,6 +10,8 @@ import ( "os" "path/filepath" "regexp" + "strconv" + "strings" "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/templates" @@ -19,7 +21,7 @@ import ( // WikiDir is a rooted path to the wiki storage directory. var WikiDir string -// HyphaPattern is a pattern which all hyphae must match. Not used currently. +// 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. @@ -83,6 +85,20 @@ func handlerRandom(w http.ResponseWriter, rq *http.Request) { http.Redirect(w, rq, "/page/"+randomHyphaName, http.StatusSeeOther) } +// Recent changes +func handlerRecentChanges(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + var ( + noPrefix = strings.TrimPrefix(rq.URL.String(), "/recent-changes/") + n, err = strconv.Atoi(noPrefix) + ) + if err == nil { + util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", history.RecentChanges(n))) + } else { + http.Redirect(w, rq, "/recent-changes/20", http.StatusSeeOther) + } +} + func main() { log.Println("Running MycorrhizaWiki ฮฒ") @@ -104,10 +120,11 @@ func main() { http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(WikiDir+"/static")))) // See http_readers.go for /page/, /text/, /binary/, /history/. - // See http_mutators.go for /upload-binary/, /upload-text/, /edit/. + // See http_mutators.go for /upload-binary/, /upload-text/, /edit/, /delete-ask/, /delete-confirm/, /rename-ask/, /rename-confirm/. http.HandleFunc("/list", handlerList) http.HandleFunc("/reindex", handlerReindex) http.HandleFunc("/random", handlerRandom) + http.HandleFunc("/recent-changes/", handlerRecentChanges) http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, rq *http.Request) { http.ServeFile(w, rq, WikiDir+"/static/favicon.ico") }) diff --git a/metarrhiza b/metarrhiza index bdaaab6..2c0e431 160000 --- a/metarrhiza +++ b/metarrhiza @@ -1 +1 @@ -Subproject commit bdaaab62574023487610d608d1e9f2f351707a7f +Subproject commit 2c0e43199ed28f7022a38463a0eec3af3ecb03c9 diff --git a/templates/common.qtpl b/templates/common.qtpl new file mode 100644 index 0000000..c199fa2 --- /dev/null +++ b/templates/common.qtpl @@ -0,0 +1,32 @@ +This is the