From 0884f89431cd26bcc9674b3b7ab628b090f5881e Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 7 Dec 2021 13:31:39 +0100 Subject: 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 --- cmd/gotosocial/server.go | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 cmd/gotosocial/server.go (limited to 'cmd/gotosocial/server.go') diff --git a/cmd/gotosocial/server.go b/cmd/gotosocial/server.go new file mode 100644 index 000000000..742a4f505 --- /dev/null +++ b/cmd/gotosocial/server.go @@ -0,0 +1,49 @@ +/* + 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 . +*/ + +package main + +import ( + "github.com/spf13/cobra" + "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action/server" + "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/flag" + "github.com/superseriousbusiness/gotosocial/internal/config" +) + +// serverCommands returns the 'server' subcommand +func serverCommands() *cobra.Command { + serverCmd := &cobra.Command{ + Use: "server", + Short: "gotosocial server-related tasks", + } + + serverStartCmd := &cobra.Command{ + Use: "start", + Short: "start the gotosocial server", + PreRunE: func(cmd *cobra.Command, args []string) error { + return preRun(cmd) + }, + RunE: func(cmd *cobra.Command, args []string) error { + return run(cmd.Context(), server.Start) + }, + } + flag.Server(serverStartCmd, config.Defaults) + + serverCmd.AddCommand(serverStartCmd) + return serverCmd +} -- cgit v1.2.3