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

pool: Reddo component-like fields

Browse source
This commit is contained in:
Tom Wiesing 2022-12-22 13:49:05 +01:00
parent 99983ee6db
commit 337a5fbeba
No known key found for this signature in database
48 changed files with 291 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,8 +13,9 @@ import (
type Pathbuilder struct {
ingredient.Base
PHP *php.PHP
Dependencies struct {
PHP *php.PHP
}
}
var (
@ -28,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.PHP.ExecScript(ctx, server, &ids, pathbuilderPHP, "all_list")
err = pathbuilder.Dependencies.PHP.ExecScript(ctx, server, &ids, pathbuilderPHP, "all_list")
slices.Sort(ids)
return
}
@ -38,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.PHP.ExecScript(ctx, server, &xml, pathbuilderPHP, "one_xml", id)
err = pathbuilder.Dependencies.PHP.ExecScript(ctx, server, &xml, pathbuilderPHP, "one_xml", id)
return
}
@ -46,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.PHP.ExecScript(ctx, server, &pathbuilders, pathbuilderPHP, "all_xml")
err = pathbuilder.Dependencies.PHP.ExecScript(ctx, server, &pathbuilders, pathbuilderPHP, "all_xml")
return
}

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

@ -20,9 +20,10 @@ import (
// Prefixes implements reading and writing prefix
type Prefixes struct {
ingredient.Base
PHP *php.PHP
MStore *mstore.MStore
Dependencies struct {
PHP *php.PHP
MStore *mstore.MStore
}
}
var (
@ -58,7 +59,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.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
}
@ -149,7 +150,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.MStore)
return prefix.GetAll(ctx, wisski.Dependencies.MStore)
}
// Update updates the cached prefixes of this instance
@ -158,7 +159,7 @@ func (wisski *Prefixes) Update(ctx context.Context) error {
if err != nil {
return err
}
return prefix.SetAll(ctx, wisski.MStore, prefixes...)
return prefix.SetAll(ctx, wisski.Dependencies.MStore, prefixes...)
}
func (prefixes *Prefixes) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {

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

@ -11,18 +11,19 @@ import (
type Settings struct {
ingredient.Base
PHP *php.PHP
Dependencies struct {
PHP *php.PHP
}
}
//go:embed settings.php
var settingsPHP string
func (settings *Settings) Get(ctx context.Context, server *phpx.Server, key string) (value any, err error) {
err = settings.PHP.ExecScript(ctx, server, &value, settingsPHP, "get_setting", key)
err = settings.Dependencies.PHP.ExecScript(ctx, server, &value, settingsPHP, "get_setting", key)
return
}
func (settings *Settings) Set(ctx context.Context, server *phpx.Server, key string, value any) error {
return settings.PHP.ExecScript(ctx, server, nil, settingsPHP, "set_setting", key, value)
return settings.Dependencies.PHP.ExecScript(ctx, server, nil, settingsPHP, "set_setting", key, value)
}

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

@ -12,8 +12,9 @@ import (
type Stats struct {
ingredient.Base
PHP *php.PHP
Dependencies struct {
PHP *php.PHP
}
}
var (
@ -25,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.PHP.ExecScript(ctx, server, &data, statsPHP, "export_statistics")
err = stats.Dependencies.PHP.ExecScript(ctx, server, &data, statsPHP, "export_statistics")
return
}

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

@ -11,8 +11,9 @@ import (
type PHP struct {
ingredient.Base
Barrel *barrel.Barrel
Dependencies struct {
Barrel *barrel.Barrel
}
}
// ExecScript executes the PHP code as a script on the given server.

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

@ -21,6 +21,6 @@ func (php *PHP) NewServer() *phpx.Server {
}
func (php *PHP) spawn(ctx context.Context, str stream.IOStream, code string) error {
php.Barrel.Shell(ctx, str, "-c", shellescape.QuoteCommand([]string{"drush", "php:eval", code}))()
php.Dependencies.Barrel.Shell(ctx, str, "-c", shellescape.QuoteCommand([]string{"drush", "php:eval", code}))()
return nil
}

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

@ -16,10 +16,10 @@ import (
var errGetValidator = errors.New("GetPasswordValidator: Unknown Error")
func (u *Users) GetPasswordValidator(ctx context.Context, username string) (pv PasswordValidator, err error) {
server := u.PHP.NewServer()
server := u.Dependencies.PHP.NewServer()
var hash string
err = u.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

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

@ -14,8 +14,9 @@ import (
type Users struct {
ingredient.Base
PHP *php.PHP
Dependencies struct {
PHP *php.PHP
}
}
var (
@ -27,7 +28,7 @@ var usersPHP string
// All returns all known usernames
func (u *Users) All(ctx context.Context, server *phpx.Server) (users []status.User, err error) {
err = u.PHP.ExecScript(ctx, server, &users, usersPHP, "list_users")
err = u.Dependencies.PHP.ExecScript(ctx, server, &users, usersPHP, "list_users")
return
}
@ -38,7 +39,7 @@ func (u *Users) Login(ctx context.Context, server *phpx.Server, username string)
// generate a (relative) link
var path string
err = u.PHP.ExecScript(ctx, server, &path, usersPHP, "get_login_link", username)
err = u.Dependencies.PHP.ExecScript(ctx, server, &path, usersPHP, "get_login_link", username)
// if something went wrong, return
if err != nil {
@ -64,7 +65,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.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
}