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

Update to new goprogram version

Browse source
This commit is contained in:
Tom Wiesing 2023-11-01 22:01:24 +01:00
parent 7bd9570bc0
commit 873fdcd5c2
No known key found for this signature in database
106 changed files with 478 additions and 825 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/wisski/ingredient/php/extras/adapters.go
View file

@ -13,7 +13,7 @@ import (
// Prefixes implements reading and writing prefix
type Adapters struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -33,7 +33,7 @@ type DistilleryAdapter struct {
}
func (wisski *Adapters) CreateDistilleryAdapter(ctx context.Context, server *phpx.Server, adapter DistilleryAdapter) error {
return wisski.Dependencies.PHP.ExecScript(
return wisski.dependencies.PHP.ExecScript(
ctx, server, nil, adaptersPHP,
"create_distillery_adapter",
adapter.Label, adapter.MachineName, adapter.Description, adapter.InstanceDomain, adapter.GraphDBRepository, adapter.GraphDBUsername, adapter.GraphDBPassword,

6
internal/wisski/ingredient/php/extras/blocks.go
View file

@ -13,7 +13,7 @@ import (
type Blocks struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -31,11 +31,11 @@ type Block struct {
// Create creates a new block with the given title and html content
func (blocks *Blocks) Create(ctx context.Context, server *phpx.Server, block Block) (err error) {
err = blocks.Dependencies.PHP.ExecScript(ctx, server, nil, blocksPHP, "create_basic_block", block.Info, block.Content, block.Region, block.BlockID)
err = blocks.dependencies.PHP.ExecScript(ctx, server, nil, blocksPHP, "create_basic_block", block.Info, block.Content, block.Region, block.BlockID)
return err
}
func (blocks *Blocks) GetFooterRegion(ctx context.Context, server *phpx.Server) (region string, err error) {
err = blocks.Dependencies.PHP.ExecScript(ctx, server, &region, blocksPHP, "get_footer_region")
err = blocks.dependencies.PHP.ExecScript(ctx, server, &region, blocksPHP, "get_footer_region")
return
}

8
internal/wisski/ingredient/php/extras/pathbuilder.go
View file

@ -13,7 +13,7 @@ import (
type Pathbuilder struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -29,7 +29,7 @@ var pathbuilderPHP string
//
// server is the server to fetch the pathbuilders from, any may be nil.
func (pathbuilder *Pathbuilder) All(ctx context.Context, server *phpx.Server) (ids []string, err error) {
err = pathbuilder.Dependencies.PHP.ExecScript(ctx, server, &ids, pathbuilderPHP, "all_list")
err = pathbuilder.dependencies.PHP.ExecScript(ctx, server, &ids, pathbuilderPHP, "all_list")
slices.Sort(ids)
return
}
@ -39,7 +39,7 @@ func (pathbuilder *Pathbuilder) All(ctx context.Context, server *phpx.Server) (i
//
// server is the server to fetch the pathbuilders from, any may be nil.
func (pathbuilder *Pathbuilder) Get(ctx context.Context, server *phpx.Server, id string) (xml string, err error) {
err = pathbuilder.Dependencies.PHP.ExecScript(ctx, server, &xml, pathbuilderPHP, "one_xml", id)
err = pathbuilder.dependencies.PHP.ExecScript(ctx, server, &xml, pathbuilderPHP, "one_xml", id)
return
}
@ -47,7 +47,7 @@ func (pathbuilder *Pathbuilder) Get(ctx context.Context, server *phpx.Server, id
//
// server is the server to fetch the pathbuilders from, any may be nil.
func (pathbuilder *Pathbuilder) GetAll(ctx context.Context, server *phpx.Server) (pathbuilders map[string]string, err error) {
err = pathbuilder.Dependencies.PHP.ExecScript(ctx, server, &pathbuilders, pathbuilderPHP, "all_xml")
err = pathbuilder.dependencies.PHP.ExecScript(ctx, server, &pathbuilders, pathbuilderPHP, "all_xml")
return
}

8
internal/wisski/ingredient/php/extras/prefixes.go
View file

@ -22,7 +22,7 @@ import (
// Prefixes implements reading and writing prefix
type Prefixes struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
MStore *mstore.MStore
}
@ -63,7 +63,7 @@ func (prefixes *Prefixes) All(ctx context.Context, server *phpx.Server) ([]strin
func (wisski *Prefixes) database(ctx context.Context, server *phpx.Server) (prefixes []string, err error) {
// get all the ugly prefixes
err = wisski.Dependencies.PHP.ExecScript(ctx, server, &prefixes, listURIPrefixesPHP, "list_prefixes")
err = wisski.dependencies.PHP.ExecScript(ctx, server, &prefixes, listURIPrefixesPHP, "list_prefixes")
if err != nil {
return nil, err
}
@ -164,7 +164,7 @@ var prefix = mstore.For[string]("prefix")
// Prefixes returns the cached prefixes from the given instance
func (wisski *Prefixes) AllCached(ctx context.Context) (results []string, err error) {
return prefix.GetAll(ctx, wisski.Dependencies.MStore)
return prefix.GetAll(ctx, wisski.dependencies.MStore)
}
// Update updates the cached prefixes of this instance
@ -173,7 +173,7 @@ func (wisski *Prefixes) Update(ctx context.Context) error {
if err != nil {
return err
}
return prefix.SetAll(ctx, wisski.Dependencies.MStore, prefixes...)
return prefix.SetAll(ctx, wisski.dependencies.MStore, prefixes...)
}
func (prefixes *Prefixes) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {

17
internal/wisski/ingredient/php/extras/requirements.go
View file

@ -2,6 +2,7 @@ package extras
import (
"context"
"strings"
"github.com/FAU-CDI/wisski-distillery/internal/phpx"
"github.com/FAU-CDI/wisski-distillery/internal/status"
@ -14,7 +15,7 @@ import (
type Requirements struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -28,28 +29,28 @@ var requirementsPHP string
// Create creates a new block with the given title and html content
func (requirements *Requirements) Get(ctx context.Context, server *phpx.Server) (data []status.Requirement, err error) {
err = requirements.Dependencies.PHP.ExecScript(ctx, server, &data, requirementsPHP, "get_requirements", requirements.URL().String())
err = requirements.dependencies.PHP.ExecScript(ctx, server, &data, requirementsPHP, "get_requirements", requirements.URL().String())
if err == nil {
// sort first by weight, then by id!
slices.SortFunc(data, func(a, b status.Requirement) bool {
slices.SortFunc(data, func(a, b status.Requirement) int {
// compare first by weight
if a.Weight < b.Weight {
return true
return -1
}
if a.Weight > b.Weight {
return false
return 1
}
// then by severity
if a.Severity < b.Severity {
return true
return -1
}
if a.Severity > b.Severity {
return false
return 1
}
// and finally by id
return a.ID < b.ID
return strings.Compare(a.ID, b.ID)
})
}
return

8
internal/wisski/ingredient/php/extras/settings.go
View file

@ -12,7 +12,7 @@ import (
type Settings struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -21,7 +21,7 @@ type Settings struct {
var settingsPHP string
func (settings *Settings) Get(ctx context.Context, server *phpx.Server, key string) (value any, err error) {
err = settings.Dependencies.PHP.ExecScript(ctx, server, &value, settingsPHP, "get_setting", key)
err = settings.dependencies.PHP.ExecScript(ctx, server, &value, settingsPHP, "get_setting", key)
return
}
@ -29,7 +29,7 @@ var errFailedToSetSetting = errors.New("failed to update setting")
func (settings *Settings) Set(ctx context.Context, server *phpx.Server, key string, value any) error {
var ok bool
err := settings.Dependencies.PHP.ExecScript(ctx, server, &ok, settingsPHP, "set_setting", key, value)
err := settings.dependencies.PHP.ExecScript(ctx, server, &ok, settingsPHP, "set_setting", key, value)
if err == nil && !ok {
err = errFailedToSetSetting
}
@ -41,7 +41,7 @@ var errFailedToSetTrustedDomain = errors.New("failed to set trusted domain")
func (settings *Settings) SetTrustedDomain(ctx context.Context, server *phpx.Server, domain string) error {
var ok bool
err := settings.Dependencies.PHP.ExecScript(ctx, server, &ok, settingsPHP, "set_trusted_domain", domain)
err := settings.dependencies.PHP.ExecScript(ctx, server, &ok, settingsPHP, "set_trusted_domain", domain)
if err == nil && !ok {
err = errFailedToSetTrustedDomain
}

4
internal/wisski/ingredient/php/extras/stats.go
View file

@ -12,7 +12,7 @@ import (
type Stats struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -26,7 +26,7 @@ var statsPHP string
// Get fetches all statistics from the server
func (stats *Stats) Get(ctx context.Context, server *phpx.Server) (data status.Statistics, err error) {
err = stats.Dependencies.PHP.ExecScript(ctx, server, &data, statsPHP, "export_statistics")
err = stats.dependencies.PHP.ExecScript(ctx, server, &data, statsPHP, "export_statistics")
return
}

4
internal/wisski/ingredient/php/extras/theme.go
View file

@ -14,7 +14,7 @@ import (
// Prefixes implements reading and writing prefix
type Theme struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -24,7 +24,7 @@ var themePHP string
// Get returns the currently active theme
func (t *Theme) Get(ctx context.Context, server *phpx.Server) (theme string, err error) {
err = t.Dependencies.PHP.ExecScript(
err = t.dependencies.PHP.ExecScript(
ctx, server, &theme, themePHP,
"get_active_theme",
)

2
internal/wisski/ingredient/php/php.go
View file

@ -11,7 +11,7 @@ import (
type PHP struct {
ingredient.Base
Dependencies struct {
dependencies struct {
Barrel *barrel.Barrel
}
}

2
internal/wisski/ingredient/php/server.go
View file

@ -20,6 +20,6 @@ func (php *PHP) NewServer() *phpx.Server {
}
func (php *PHP) spawn(ctx context.Context, str stream.IOStream, code string) error {
php.Dependencies.Barrel.ShellScript(ctx, str, "drush", "php:eval", code)
php.dependencies.Barrel.ShellScript(ctx, str, "drush", "php:eval", code)
return nil
}

4
internal/wisski/ingredient/php/users/password.go
View file

@ -14,10 +14,10 @@ import (
var errGetValidator = errors.New("`GetPasswordValidator': unknown error")
func (u *Users) GetPasswordValidator(ctx context.Context, username string) (pv PasswordValidator, err error) {
server := u.Dependencies.PHP.NewServer()
server := u.dependencies.PHP.NewServer()
var hash string
err = u.Dependencies.PHP.ExecScript(ctx, server, &hash, usersPHP, "get_password_hash", username)
err = u.dependencies.PHP.ExecScript(ctx, server, &hash, usersPHP, "get_password_hash", username)
if err != nil {
server.Close()
return pv, err

8
internal/wisski/ingredient/php/users/users.go
View file

@ -14,7 +14,7 @@ import (
type Users struct {
ingredient.Base
Dependencies struct {
dependencies struct {
PHP *php.PHP
}
}
@ -28,7 +28,7 @@ var usersPHP string
// All returns all known usernames
func (u *Users) All(ctx context.Context, server *phpx.Server) (users []status.DrupalUser, err error) {
err = u.Dependencies.PHP.ExecScript(ctx, server, &users, usersPHP, "list_users")
err = u.dependencies.PHP.ExecScript(ctx, server, &users, usersPHP, "list_users")
return
}
@ -54,7 +54,7 @@ func (u *Users) LoginWithOpt(ctx context.Context, server *phpx.Server, username
// generate a (relative) link
var path string
err = u.Dependencies.PHP.ExecScript(ctx, server, &path, usersPHP, "get_login_link", username, opts.Destination, opts.CreateIfMissing, opts.GrantAdminRole)
err = u.dependencies.PHP.ExecScript(ctx, server, &path, usersPHP, "get_login_link", username, opts.Destination, opts.CreateIfMissing, opts.GrantAdminRole)
// if something went wrong, return
if err != nil {
@ -80,7 +80,7 @@ var errSetPassword = errors.New("`SetPassword': unknown error")
// SetPassword sets the password for a given user
func (u *Users) SetPassword(ctx context.Context, server *phpx.Server, username, password string) error {
var ok bool
err := u.Dependencies.PHP.ExecScript(ctx, server, &ok, usersPHP, "set_user_password", username, password)
err := u.dependencies.PHP.ExecScript(ctx, server, &ok, usersPHP, "set_user_password", username, password)
if err != nil {
return err
}