1
0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2024-12-11 13:00:26 +00:00

Move Mycomarkup to SourceHut

Les Arbres didn't work in the end
This commit is contained in:
Timur Ismagilov 2022-08-22 01:52:10 +05:00
parent 2381b6abfe
commit 5f751cca07
12 changed files with 23 additions and 27 deletions

View File

@ -1,12 +1,12 @@
package backlinks
import (
"git.sr.ht/~bouncepaw/mycomarkup/v5"
"git.sr.ht/~bouncepaw/mycomarkup/v5/links"
"git.sr.ht/~bouncepaw/mycomarkup/v5/mycocontext"
"git.sr.ht/~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

8
go.mod
View File

@ -3,6 +3,7 @@ module github.com/bouncepaw/mycorrhiza
go 1.18
require (
git.sr.ht/~bouncepaw/mycomarkup/v5 v5.2.1
github.com/go-ini/ini v1.63.2
github.com/gorilla/feeds v1.1.1
github.com/gorilla/mux v1.8.0
@ -11,7 +12,6 @@ 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,8 +23,4 @@ require (
// Use this trick to test local Mycomarkup changes, replace the path with yours,
// but do not commit the change to the path:
// 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
// Or maybe just R every time, the utility is kinda weird.
// replace git.sr.ht/~bouncepaw/mycomarkup/v5 v5.2.1 => "/Users/bouncepaw/GolandProjects/mycomarkup"

4
go.sum
View File

@ -1,3 +1,5 @@
git.sr.ht/~bouncepaw/mycomarkup/v5 v5.2.1 h1:pq4oM0YaGfSITLMk1/UCtOa0F+rqENX9PLBa6KKd6aE=
git.sr.ht/~bouncepaw/mycomarkup/v5 v5.2.1/go.mod h1:TCzFBqW11En4EjLfcQtJu8C/Ro7FIFR8vZ+nM9f6Q28=
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/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
@ -50,5 +52,3 @@ 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=

View File

@ -2,15 +2,15 @@ package help
// stuff.go is used for meta stuff about the wiki or all hyphae at once.
import (
"git.sr.ht/~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"
"lesarbr.es/mycomarkup/v5/mycocontext"
"git.sr.ht/~bouncepaw/mycomarkup/v5/mycocontext"
)
var (

View File

@ -4,9 +4,9 @@ package interwiki
import (
"encoding/json"
"errors"
"git.sr.ht/~bouncepaw/mycomarkup/v5/options"
"github.com/bouncepaw/mycorrhiza/files"
"github.com/bouncepaw/mycorrhiza/util"
"lesarbr.es/mycomarkup/v5/options"
"log"
"os"
"sync"

View File

@ -1,9 +1,9 @@
package migration
import (
"git.sr.ht/~bouncepaw/mycomarkup/v5/tools"
"github.com/bouncepaw/mycorrhiza/files"
"io/ioutil"
"lesarbr.es/mycomarkup/v5/tools"
"log"
"os"
)

View File

@ -1,9 +1,9 @@
package migration
import (
"git.sr.ht/~bouncepaw/mycomarkup/v5/tools"
"github.com/bouncepaw/mycorrhiza/files"
"io/ioutil"
"lesarbr.es/mycomarkup/v5/tools"
"log"
"os"
)

View File

@ -2,11 +2,11 @@ package mycoopts
import (
"errors"
"git.sr.ht/~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 {

View File

@ -1,13 +1,13 @@
package shroom
import (
"git.sr.ht/~bouncepaw/mycomarkup/v5"
"git.sr.ht/~bouncepaw/mycomarkup/v5/blocks"
"git.sr.ht/~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"
)

View File

@ -8,8 +8,8 @@ import (
"net/http"
"strings"
"git.sr.ht/~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.

View File

@ -2,8 +2,8 @@ package web
import (
"fmt"
"git.sr.ht/~bouncepaw/mycomarkup/v5"
"html/template"
"lesarbr.es/mycomarkup/v5"
"log"
"net/http"
@ -11,7 +11,7 @@ import (
"github.com/bouncepaw/mycorrhiza/mycoopts"
"github.com/bouncepaw/mycorrhiza/viewutil"
"lesarbr.es/mycomarkup/v5/mycocontext"
"git.sr.ht/~bouncepaw/mycomarkup/v5/mycocontext"
"github.com/gorilla/mux"

View File

@ -2,13 +2,13 @@ package web
import (
"fmt"
"git.sr.ht/~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"
"git.sr.ht/~bouncepaw/mycomarkup/v5/mycocontext"
"git.sr.ht/~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) {