mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up param names for conventions

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-22 11:12:43 +01:00
parent bea08d54f1
commit b33e366500
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmd/rove/main.go
View file

@ -17,7 +17,7 @@ import (
) )
// Command usage // Command usage
func Usage() { func printUsage() {
fmt.Fprintf(os.Stderr, "Usage: %s COMMAND [OPTIONS]...\n", os.Args[0]) fmt.Fprintf(os.Stderr, "Usage: %s COMMAND [OPTIONS]...\n", os.Args[0])
fmt.Fprintln(os.Stderr, "\nCommands:") fmt.Fprintln(os.Stderr, "\nCommands:")
fmt.Fprintln(os.Stderr, "\tstatus \tprints the server status") fmt.Fprintln(os.Stderr, "\tstatus \tprints the server status")
@ -31,14 +31,14 @@ func Usage() {
} }
var home = os.Getenv("HOME") var home = os.Getenv("HOME")
var filepath = path.Join(home, ".local/share/rove.json") var defaultData = path.Join(home, ".local/share/rove.json")
const gRPCport = 9090 const gRPCport = 9090
// General usage // General usage
var ver = flag.Bool("version", false, "Display version number") var ver = flag.Bool("version", false, "Display version number")
var host = flag.String("host", "", "path to game host server") var host = flag.String("host", "", "path to game host server")
var data = flag.String("data", filepath, "data file for storage") var data = flag.String("data", defaultData, "data file for storage")
// For register command // For register command
var name = flag.String("name", "", "used with status command for the account name") var name = flag.String("name", "", "used with status command for the account name")
@ -53,8 +53,8 @@ type Config struct {
Accounts map[string]string `json:"accounts,omitempty"` Accounts map[string]string `json:"accounts,omitempty"`
} }
// verifyId will verify an account ID // verifyID will verify an account ID
func verifyId(id string) error { func verifyID(id string) error {
if len(id) == 0 { if len(id) == 0 {
return fmt.Errorf("no account ID set, must register first") return fmt.Errorf("no account ID set, must register first")
} }
@ -148,7 +148,7 @@ func InnerMain(command string) error {
}, },
} }
if err := verifyId(account); err != nil { if err := verifyID(account); err != nil {
return err return err
} }
@ -163,7 +163,7 @@ func InnerMain(command string) error {
case "radar": case "radar":
dat := rove.RadarRequest{Account: account} dat := rove.RadarRequest{Account: account}
if err := verifyId(account); err != nil { if err := verifyID(account); err != nil {
return err return err
} }
@ -179,7 +179,7 @@ func InnerMain(command string) error {
case "rover": case "rover":
req := rove.RoverRequest{Account: account} req := rove.RoverRequest{Account: account}
if err := verifyId(account); err != nil { if err := verifyID(account); err != nil {
return err return err
} }
response, err := client.Rover(ctx, &req) response, err := client.Rover(ctx, &req)
@ -197,7 +197,7 @@ func InnerMain(command string) error {
default: default:
// Print the usage // Print the usage
fmt.Fprintf(os.Stderr, "Error: unknown command %s\n", command) fmt.Fprintf(os.Stderr, "Error: unknown command %s\n", command)
Usage() printUsage()
os.Exit(1) os.Exit(1)
} }
@ -213,11 +213,11 @@ func InnerMain(command string) error {
// Simple main // Simple main
func main() { func main() {
flag.Usage = Usage flag.Usage = printUsage
// Bail without any args // Bail without any args
if len(os.Args) == 1 { if len(os.Args) == 1 {
Usage() printUsage()
os.Exit(1) os.Exit(1)
} }