go fmt & update per feedback

pull/261/head
Matti R 5 years ago
parent b0f0de3dde
commit b6044120ef
No known key found for this signature in database
GPG Key ID: 9D8A57ADAA232E95
  1. 16
      cmd/writefreely/config.go
  2. 12
      cmd/writefreely/db.go
  3. 5
      cmd/writefreely/keys.go
  4. 3
      cmd/writefreely/main.go
  5. 4
      cmd/writefreely/user.go
  6. 8
      cmd/writefreely/web.go

@ -30,25 +30,23 @@ var (
Name: "generate",
Aliases: []string{"gen"},
Usage: "Generate a basic configuration",
Action: genConfigAction,
Action: genConfigAction,
}
cmdConfigInteractive cli.Command = cli.Command{
Name: "interactive",
Aliases: []string{"i"},
Usage: "Interactive configuration process",
Name: "start",
Usage: "Interactive configuration process",
Action: interactiveConfigAction,
Flags: []cli.Flag{
&cli.StringFlag{
Name: "sections",
Value: "server db app",
Usage: "Which sections of the configuration to go through (requires --config)\n" +
"valid values are any combination of 'server', 'db' and 'app' \n" +
"example: writefreely --config --sections \"db app\"",
Usage: "Which sections of the configuration to go through\n" +
"valid values of sections flag are any combination of 'server', 'db' and 'app' \n" +
"example: writefreely config start --sections \"db app\"",
},
},
}
)
func genConfigAction(c *cli.Context) error {
@ -60,4 +58,4 @@ func interactiveConfigAction(c *cli.Context) error {
app := writefreely.NewApp(c.String("c"))
writefreely.DoConfig(app, c.String("sections"))
return nil
}
}

@ -27,15 +27,15 @@ var (
}
cmdDBInit cli.Command = cli.Command{
Name: "init",
Usage: "Initialize Database",
Name: "init",
Usage: "Initialize Database",
Action: initDBAction,
}
cmdDBMigrate cli.Command = cli.Command{
Name: "migrate",
Usage: "Migrate Database",
Action: migrateDBAction,
Name: "migrate",
Usage: "Migrate Database",
Action: migrateDBAction,
}
)
@ -47,4 +47,4 @@ func initDBAction(c *cli.Context) error {
func migrateDBAction(c *cli.Context) error {
app := writefreely.NewApp(c.String("c"))
return writefreely.Migrate(app)
}
}

@ -29,12 +29,11 @@ var (
Name: "generate",
Aliases: []string{"gen"},
Usage: "Generate encryption and authentication keys",
Action: genKeysAction,
Action: genKeysAction,
}
)
func genKeysAction(c *cli.Context) error {
app := writefreely.NewApp(c.String("c"))
return writefreely.GenerateKeyFiles(app)
}
}

@ -23,6 +23,9 @@ import (
)
func main() {
cli.VersionPrinter = func(c *cli.Context) {
fmt.Printf("%s\n", c.App.Version)
}
app := &cli.App{
Name: "WriteFreely",
Usage: "A beautifully pared-down blogging platform",

@ -29,9 +29,9 @@ var (
}
cmdAddUser cli.Command = cli.Command{
Name: "add",
Name: "create",
Usage: "Add new user",
Aliases: []string{"a"},
Aliases: []string{"a", "add"},
Flags: []cli.Flag{
&cli.BoolFlag{
Name: "admin",

@ -20,10 +20,10 @@ import (
var (
cmdServe cli.Command = cli.Command{
Name: "serve",
Name: "serve",
Aliases: []string{"web"},
Usage: "Run web application",
Action: serveAction,
Usage: "Run web application",
Action: serveAction,
}
)
@ -46,4 +46,4 @@ func serveAction(c *cli.Context) error {
writefreely.Serve(app, r)
return nil
}
}

Loading…
Cancel
Save