From 2381b6abfe76a7c21775ae2616734449ab5e1a1c Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Mon, 22 Aug 2022 01:28:35 +0500 Subject: [PATCH] Move Mycomarkup to Les Arbres I don't really understand how it worked --- backlinks/hooks.go | 8 ++++---- go.mod | 4 ++-- go.sum | 4 ++-- help/web.go | 4 ++-- interwiki/interwiki.go | 2 +- migration/headings.go | 2 +- migration/rockets.go | 2 +- mycoopts/mycoopts.go | 2 +- shroom/header_links.go | 6 +++--- util/util.go | 2 +- web/mutators.go | 5 ++--- web/readers.go | 6 +++--- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/backlinks/hooks.go b/backlinks/hooks.go index 1585475..05c1777 100644 --- a/backlinks/hooks.go +++ b/backlinks/hooks.go @@ -1,12 +1,12 @@ package backlinks import ( - "github.com/bouncepaw/mycomarkup/v5" - "github.com/bouncepaw/mycomarkup/v5/links" - "github.com/bouncepaw/mycomarkup/v5/mycocontext" - "github.com/bouncepaw/mycomarkup/v5/tools" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/mycoopts" + "lesarbr.es/mycomarkup/v5" + "lesarbr.es/mycomarkup/v5/links" + "lesarbr.es/mycomarkup/v5/mycocontext" + "lesarbr.es/mycomarkup/v5/tools" ) // UpdateBacklinksAfterEdit is a creation/editing hook for backlinks index diff --git a/go.mod b/go.mod index 79779d7..26db52b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/bouncepaw/mycorrhiza go 1.18 require ( - github.com/bouncepaw/mycomarkup/v5 v5.1.2 github.com/go-ini/ini v1.63.2 github.com/gorilla/feeds v1.1.1 github.com/gorilla/mux v1.8.0 @@ -12,6 +11,7 @@ require ( golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 + lesarbr.es/mycomarkup/v5 v5.2.0 ) require ( @@ -23,7 +23,7 @@ require ( // Use this trick to test local Mycomarkup changes, replace the path with yours, // but do not commit the change to the path: -// replace github.com/bouncepaw/mycomarkup/v5 v5.1.2 => "/Users/bouncepaw/GolandProjects/mycomarkup" +// replace lesarbr.es/mycomarkup/v5 v5.1.2 => "/Users/bouncepaw/GolandProjects/mycomarkup" // Use this utility every time Mycomarkup gets a major update: // https://github.com/marwan-at-work/mod diff --git a/go.sum b/go.sum index 06428ae..a9677df 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/bouncepaw/mycomarkup/v5 v5.1.2 h1:0ARUfHMRCWygp/ATq8yjdM7Mxf3beXA1XYV9oB3YW9A= -github.com/bouncepaw/mycomarkup/v5 v5.1.2/go.mod h1:jyB/vxKe3X8SsN7FjjPf24IZwFM/H1C4LNvQ5UyXwjU= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-ini/ini v1.63.2 h1:kwN3umicd2HF3Tgvap4um1ZG52/WyKT9GGdPx0CJk6Y= @@ -52,3 +50,5 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +lesarbr.es/mycomarkup/v5 v5.2.0 h1:jNWIzvSQ/XZWk1S2OiF6e1rsWAFIFnS0bdYS+OikfiM= +lesarbr.es/mycomarkup/v5 v5.2.0/go.mod h1:GMhGSivG14LbbW5KGRCUJsdZcKwW1oGTr5jE/fkwciw= diff --git a/help/web.go b/help/web.go index 43c5ec3..dec7145 100644 --- a/help/web.go +++ b/help/web.go @@ -2,15 +2,15 @@ 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/mycoopts" "github.com/bouncepaw/mycorrhiza/viewutil" "github.com/gorilla/mux" "io" + "lesarbr.es/mycomarkup/v5" "net/http" "strings" - "github.com/bouncepaw/mycomarkup/v5/mycocontext" + "lesarbr.es/mycomarkup/v5/mycocontext" ) var ( diff --git a/interwiki/interwiki.go b/interwiki/interwiki.go index 6e2ef36..4ad877b 100644 --- a/interwiki/interwiki.go +++ b/interwiki/interwiki.go @@ -4,9 +4,9 @@ package interwiki import ( "encoding/json" "errors" - "github.com/bouncepaw/mycomarkup/v5/options" "github.com/bouncepaw/mycorrhiza/files" "github.com/bouncepaw/mycorrhiza/util" + "lesarbr.es/mycomarkup/v5/options" "log" "os" "sync" diff --git a/migration/headings.go b/migration/headings.go index 83bec24..939985f 100644 --- a/migration/headings.go +++ b/migration/headings.go @@ -1,9 +1,9 @@ package migration import ( - "github.com/bouncepaw/mycomarkup/v5/tools" "github.com/bouncepaw/mycorrhiza/files" "io/ioutil" + "lesarbr.es/mycomarkup/v5/tools" "log" "os" ) diff --git a/migration/rockets.go b/migration/rockets.go index 1fc38f9..6fcbff7 100644 --- a/migration/rockets.go +++ b/migration/rockets.go @@ -1,9 +1,9 @@ package migration import ( - "github.com/bouncepaw/mycomarkup/v5/tools" "github.com/bouncepaw/mycorrhiza/files" "io/ioutil" + "lesarbr.es/mycomarkup/v5/tools" "log" "os" ) diff --git a/mycoopts/mycoopts.go b/mycoopts/mycoopts.go index a160320..28cea18 100644 --- a/mycoopts/mycoopts.go +++ b/mycoopts/mycoopts.go @@ -2,11 +2,11 @@ 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" + "lesarbr.es/mycomarkup/v5/options" ) func MarkupOptions(hyphaName string) options.Options { diff --git a/shroom/header_links.go b/shroom/header_links.go index 9ec03a5..076ab64 100644 --- a/shroom/header_links.go +++ b/shroom/header_links.go @@ -1,13 +1,13 @@ package shroom import ( - "github.com/bouncepaw/mycomarkup/v5" - "github.com/bouncepaw/mycomarkup/v5/blocks" - "github.com/bouncepaw/mycomarkup/v5/mycocontext" "github.com/bouncepaw/mycorrhiza/cfg" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/mycoopts" "github.com/bouncepaw/mycorrhiza/viewutil" + "lesarbr.es/mycomarkup/v5" + "lesarbr.es/mycomarkup/v5/blocks" + "lesarbr.es/mycomarkup/v5/mycocontext" "os" ) diff --git a/util/util.go b/util/util.go index 74d641f..d3986d0 100644 --- a/util/util.go +++ b/util/util.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/bouncepaw/mycomarkup/v5/util" "github.com/bouncepaw/mycorrhiza/cfg" + "lesarbr.es/mycomarkup/v5/util" ) // PrepareRq strips the trailing / in rq.URL.Path. In the future it might do more stuff for making all request structs uniform. diff --git a/web/mutators.go b/web/mutators.go index 89dac0c..a9358c6 100644 --- a/web/mutators.go +++ b/web/mutators.go @@ -3,16 +3,15 @@ package web import ( "fmt" "html/template" + "lesarbr.es/mycomarkup/v5" "log" "net/http" - "github.com/bouncepaw/mycomarkup/v5" - "github.com/bouncepaw/mycorrhiza/hypview" "github.com/bouncepaw/mycorrhiza/mycoopts" "github.com/bouncepaw/mycorrhiza/viewutil" - "github.com/bouncepaw/mycomarkup/v5/mycocontext" + "lesarbr.es/mycomarkup/v5/mycocontext" "github.com/gorilla/mux" diff --git a/web/readers.go b/web/readers.go index 6d938f2..ae2a066 100644 --- a/web/readers.go +++ b/web/readers.go @@ -2,13 +2,13 @@ package web import ( "fmt" - "github.com/bouncepaw/mycomarkup/v5" "github.com/bouncepaw/mycorrhiza/categories" "github.com/bouncepaw/mycorrhiza/files" views2 "github.com/bouncepaw/mycorrhiza/hypview" "github.com/bouncepaw/mycorrhiza/mycoopts" "github.com/bouncepaw/mycorrhiza/viewutil" "io" + "lesarbr.es/mycomarkup/v5" "log" "net/http" "os" @@ -17,14 +17,14 @@ import ( "github.com/gorilla/mux" - "github.com/bouncepaw/mycomarkup/v5/mycocontext" - "github.com/bouncepaw/mycomarkup/v5/tools" "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/l18n" "github.com/bouncepaw/mycorrhiza/mimetype" "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" + "lesarbr.es/mycomarkup/v5/mycocontext" + "lesarbr.es/mycomarkup/v5/tools" ) func initReaders(r *mux.Router) {