rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move to github.com/tkw1536/pkglib package

Browse source 
This commit removes various modules that can be migrated to the
github.com/tkw1536/pkglib package without any code changes (beyond
module renamings).
This commit is contained in:
Tom Wiesing 2023-02-26 09:53:25 +01:00
parent 30c25b8e2a
commit c3ca8e2974
No known key found for this signature in database
65 changed files with 103 additions and 1254 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/dis/component/server/cron/cron.go
View file

@ -10,8 +10,8 @@ import (
"time"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/pkg/timex"
"github.com/rs/zerolog"
"github.com/tkw1536/pkglib/timex"
)
type Cron struct {

2
internal/dis/component/server/home/public.go
View file

@ -11,7 +11,7 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/templating"
"github.com/FAU-CDI/wisski-distillery/internal/status"
"github.com/FAU-CDI/wisski-distillery/pkg/httpx"
"github.com/FAU-CDI/wisski-distillery/pkg/pools"
"github.com/tkw1536/pkglib/pools"
)
//go:embed "public.html"

2
internal/dis/component/server/news/news.go
View file

@ -12,8 +12,8 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/assets"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/templating"
"github.com/FAU-CDI/wisski-distillery/pkg/pools"
"github.com/rs/zerolog"
"github.com/tkw1536/pkglib/pools"
"github.com/yuin/goldmark"
gmmeta "github.com/yuin/goldmark-meta"
"github.com/yuin/goldmark/parser"

9
internal/dis/component/server/server.go
View file

@ -8,9 +8,10 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/templating"
"github.com/FAU-CDI/wisski-distillery/pkg/cancel"
"github.com/tkw1536/pkglib/contextx"
"github.com/tkw1536/pkglib/mux"
"github.com/FAU-CDI/wisski-distillery/pkg/httpx"
"github.com/FAU-CDI/wisski-distillery/pkg/mux"
"github.com/gorilla/csrf"
"github.com/rs/zerolog"
)
@ -103,8 +104,8 @@ func (server *Server) Server(ctx context.Context, progress io.Writer) (public ht
}
// apply the given context function
public = httpx.WithContextWrapper(&publicM, func(rcontext context.Context) context.Context { return cancel.ValuesOf(rcontext, ctx) })
internal = httpx.WithContextWrapper(&internalM, func(rcontext context.Context) context.Context { return cancel.ValuesOf(rcontext, ctx) })
public = httpx.WithContextWrapper(&publicM, func(rcontext context.Context) context.Context { return contextx.WithValuesOf(rcontext, ctx) })
internal = httpx.WithContextWrapper(&internalM, func(rcontext context.Context) context.Context { return contextx.WithValuesOf(rcontext, ctx) })
err = nil
return
}

4
internal/dis/component/server/templating/base.go
View file

@ -11,10 +11,10 @@ import (
"time"
"github.com/FAU-CDI/wisski-distillery/pkg/httpx"
"github.com/FAU-CDI/wisski-distillery/pkg/pools"
"github.com/FAU-CDI/wisski-distillery/pkg/timex"
"github.com/gorilla/csrf"
"github.com/rs/zerolog"
"github.com/tkw1536/pkglib/pools"
"github.com/tkw1536/pkglib/timex"
)
//go:embed "src/base.html"

2
internal/dis/component/server/templating/flags.go
View file

@ -9,7 +9,7 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/assets"
"github.com/rs/zerolog"
"github.com/tkw1536/goprogram/lib/reflectx"
"github.com/tkw1536/pkglib/reflectx"
"golang.org/x/exp/slices"
)

2
internal/dis/component/server/templating/menu.go
View file

@ -5,7 +5,7 @@ import (
"net/http"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/pkg/mux"
"github.com/tkw1536/pkglib/mux"
"golang.org/x/exp/slices"
)

2
internal/dis/component/server/templating/parse.go
View file

@ -4,7 +4,7 @@ import (
"html/template"
"reflect"
"github.com/tkw1536/goprogram/lib/reflectx"
"github.com/tkw1536/pkglib/reflectx"
"golang.org/x/exp/slices"
)