summaryrefslogtreecommitdiff
path: root/cmd/gotosocial/runaction.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2021-12-07 13:31:39 +0100
committerLibravatar GitHub <noreply@github.com>2021-12-07 13:31:39 +0100
commit0884f89431cd26bcc9674b3b7ab628b090f5881e (patch)
treecdd3b3f77f780a8b59d075dbcc3d4d013811e405 /cmd/gotosocial/runaction.go
parentUpdate dependencies (#333) (diff)
downloadgotosocial-0884f89431cd26bcc9674b3b7ab628b090f5881e.tar.xz
Implement Cobra CLI tooling, Viper config tooling (#336)
* start pulling out + replacing urfave and config * replace many many instances of config * move more stuff => viper * properly remove urfave * move some flags to root command * add testrig commands to root * alias config file keys * start adding cli parsing tests * reorder viper init * remove config path alias * fmt * change config file keys to non-nested * we're more or less in business now * tidy up the common func * go fmt * get tests passing again * add note about the cliparsing tests * reorganize * update docs with changes * structure cmd dir better * rename + move some files around * fix dangling comma
Diffstat (limited to 'cmd/gotosocial/runaction.go')
-rw-r--r--cmd/gotosocial/runaction.go82
1 files changed, 0 insertions, 82 deletions
diff --git a/cmd/gotosocial/runaction.go b/cmd/gotosocial/runaction.go
deleted file mode 100644
index 96c4edaf6..000000000
--- a/cmd/gotosocial/runaction.go
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package main
-
-import (
- "fmt"
-
- "github.com/superseriousbusiness/gotosocial/internal/cliactions"
- "github.com/superseriousbusiness/gotosocial/internal/config"
- "github.com/superseriousbusiness/gotosocial/internal/log"
- "github.com/urfave/cli/v2"
-)
-
-type MonkeyPatchedCLIContext struct {
- CLIContext *cli.Context
- AllFlags []cli.Flag
-}
-
-func (f MonkeyPatchedCLIContext) Bool(k string) bool { return f.CLIContext.Bool(k) }
-func (f MonkeyPatchedCLIContext) String(k string) string { return f.CLIContext.String(k) }
-func (f MonkeyPatchedCLIContext) StringSlice(k string) []string { return f.CLIContext.StringSlice(k) }
-func (f MonkeyPatchedCLIContext) Int(k string) int { return f.CLIContext.Int(k) }
-func (f MonkeyPatchedCLIContext) IsSet(k string) bool {
- for _, flag := range f.AllFlags {
- flagNames := flag.Names()
- for _, name := range flagNames {
- if name == k {
- return flag.IsSet()
- }
- }
-
- }
- return false
-}
-
-// runAction builds up the config and logger necessary for any
-// gotosocial action, and then executes the action.
-func runAction(c *cli.Context, allFlags []cli.Flag, a cliactions.GTSAction) error {
-
- // create a new *config.Config based on the config path provided...
- conf, err := config.FromFile(c.String(config.GetFlagNames().ConfigPath))
- if err != nil {
- return fmt.Errorf("error creating config: %s", err)
- }
-
- // ... and the flags set on the *cli.Context by urfave
- //
- // The IsSet function on the cli.Context object `c` here appears to have some issues right now, it always returns false in my tests.
- // However we can re-create the behaviour we want by simply referencing the flag objects we created previously
- // https://picopublish.sequentialread.com/files/chatlog_2021_11_18.txt
- monkeyPatchedCLIContext := MonkeyPatchedCLIContext{
- CLIContext: c,
- AllFlags: allFlags,
- }
- if err := conf.ParseCLIFlags(monkeyPatchedCLIContext, c.App.Version); err != nil {
- return fmt.Errorf("error parsing config: %s", err)
- }
-
- // initialize the global logger to the log level, with formatting and output splitter already set
- err = log.Initialize(conf.LogLevel)
- if err != nil {
- return fmt.Errorf("error creating logger: %s", err)
- }
-
- return a(c.Context, conf)
-}