maride/gotty
1
0
Fork 0
mirror of https://github.com/sorenisanerd/gotty.git synced 2025-04-02 17:10:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(docker): activate docker and local

Browse Source
This commit is contained in:
Guilhem Bonnefille 2023-08-30 14:59:48 +02:00
parent de9309665b
commit 3f396e0eb5
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main.go
View File

@ -12,7 +12,7 @@ import (
cli "github.com/urfave/cli/v2" cli "github.com/urfave/cli/v2"
//"github.com/sorenisanerd/gotty/backend/localcommand" "github.com/sorenisanerd/gotty/backend/localcommand"
"github.com/sorenisanerd/gotty/backend/docker" "github.com/sorenisanerd/gotty/backend/docker"
"github.com/sorenisanerd/gotty/pkg/homedir" "github.com/sorenisanerd/gotty/pkg/homedir"
"github.com/sorenisanerd/gotty/server" "github.com/sorenisanerd/gotty/server"
@ -30,13 +30,16 @@ func main() {
if err := utils.ApplyDefaultValues(appOptions); err != nil { if err := utils.ApplyDefaultValues(appOptions); err != nil {
exit(err, 1) exit(err, 1)
} }
// backendOptions := &localcommand.Options{} backendLocalOptions := &localcommand.Options{}
backendOptions := &docker.Options{} if err := utils.ApplyDefaultValues(backendLocalOptions); err != nil {
if err := utils.ApplyDefaultValues(backendOptions); err != nil { exit(err, 1)
}
backendDockerOptions := &docker.Options{}
if err := utils.ApplyDefaultValues(backendDockerOptions); err != nil {
exit(err, 1) exit(err, 1)
} }
cliFlags, flagMappings, err := utils.GenerateFlags(appOptions, backendOptions) cliFlags, flagMappings, err := utils.GenerateFlags(appOptions, backendLocalOptions, backendDockerOptions)
if err != nil { if err != nil {
exit(err, 3) exit(err, 3)
} }
@ -61,12 +64,12 @@ func main() {
configFile := c.String("config") configFile := c.String("config")
_, err := os.Stat(homedir.Expand(configFile)) _, err := os.Stat(homedir.Expand(configFile))
if configFile != "~/.gotty" || !os.IsNotExist(err) { if configFile != "~/.gotty" || !os.IsNotExist(err) {
if err := utils.ApplyConfigFile(configFile, appOptions, backendOptions); err != nil { if err := utils.ApplyConfigFile(configFile, appOptions, backendLocalOptions, backendDockerOptions); err != nil {
exit(err, 2) exit(err, 2)
} }
} }
utils.ApplyFlags(cliFlags, flagMappings, c, appOptions, backendOptions) utils.ApplyFlags(cliFlags, flagMappings, c, appOptions, backendLocalOptions, backendDockerOptions)
if appOptions.Quiet { if appOptions.Quiet {
log.SetFlags(0) log.SetFlags(0)
@ -86,8 +89,12 @@ func main() {
} }
args := c.Args() args := c.Args()
// factory, err := localcommand.NewFactory(args.First(), args.Tail(), backendOptions) var factory server.Factory
factory, err := docker.NewFactory(args.First(), args.Tail(), backendOptions) if c.IsSet("docker-container") {
factory, err = docker.NewFactory(args.First(), args.Tail(), backendDockerOptions)
} else {
factory, err = localcommand.NewFactory(args.First(), args.Tail(), backendLocalOptions)
}
if err != nil { if err != nil {
exit(err, 3) exit(err, 3)
} }