Andreas/gotty
1
0
Fork 0
mirror of https://github.com/yudai/gotty.git synced 2026-02-17 13:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: decouple gotty app with terminal backends

Browse source
This commit is contained in:
zlji 2017-01-10 00:13:36 +08:00 • committed by Iwasaki Yudai
parent d71e2fcfa8
commit 496ef86339
6 changed files with 226 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

36
main.go
View file

@ -9,22 +9,28 @@ import (
"github.com/codegangsta/cli"
"github.com/yudai/gotty/app"
"github.com/yudai/gotty/backends/ptycommand"
"github.com/yudai/gotty/utils"
)
func main() {
cmd := cli.NewApp()
cmd.Version = app.Version
cmd.Name = "gotty"
cmd.Version = app.Version
cmd.Usage = "Share your terminal as a web application"
cmd.HideHelp = true
cli.AppHelpTemplate = helpTemplate
options := &app.Options{}
if err := utils.ApplyDefaultValues(options); err != nil {
appOptions := &app.Options{}
if err := utils.ApplyDefaultValues(appOptions); err != nil {
exit(err, 1)
}
backendOptions := &ptycommand.Options{}
if err := utils.ApplyDefaultValues(backendOptions); err != nil {
exit(err, 1)
}
cliFlags, flagMappings, err := utils.GenerateFlags(options)
cliFlags, flagMappings, err := utils.GenerateFlags(appOptions, backendOptions)
if err != nil {
exit(err, 3)
}
@ -41,28 +47,33 @@ func main() {
cmd.Action = func(c *cli.Context) {
if len(c.Args()) == 0 {
msg := "Error: No command given."
cli.ShowAppHelp(c)
exit(fmt.Errorf("Error: No command given."), 1)
exit(fmt.Errorf(msg), 1)
}
configFile := c.String("config")
_, err := os.Stat(utils.ExpandHomeDir(configFile))
if configFile != "~/.gotty" || !os.IsNotExist(err) {
if err := utils.ApplyConfigFile(configFile, options); err != nil {
if err := utils.ApplyConfigFile(configFile, appOptions, backendOptions); err != nil {
exit(err, 2)
}
}
utils.ApplyFlags(cliFlags, flagMappings, c, options)
utils.ApplyFlags(cliFlags, flagMappings, c, appOptions, backendOptions)
options.EnableBasicAuth = c.IsSet("credential")
options.EnableTLSClientAuth = c.IsSet("tls-ca-crt")
appOptions.EnableBasicAuth = c.IsSet("credential")
appOptions.EnableTLSClientAuth = c.IsSet("tls-ca-crt")
if err := app.CheckConfig(options); err != nil {
if err := app.CheckConfig(appOptions); err != nil {
exit(err, 6)
}
app, err := app.New(c.Args(), options)
manager, err := ptycommand.NewCommandClientContextManager(c.Args(), backendOptions)
if err != nil {
exit(err, 3)
}
app, err := app.New(manager, appOptions)
if err != nil {
exit(err, 3)
}
@ -74,9 +85,6 @@ func main() {
exit(err, 4)
}
}
cli.AppHelpTemplate = helpTemplate
cmd.Run(os.Args)
}