aniani/neonmodem
1
0
Fork 0
mirror of https://github.com/mrusme/neonmodem.git synced 2024-12-04 14:46:37 -05:00
Code

Extended connect cmd, restructured root cmd

Browse Source
This commit is contained in:
マリウス 2022-12-29 22:04:05 -05:00
parent a34fa46c3d
commit 89e9c409cd
No known key found for this signature in database
GPG Key ID: 272ED814BF63261F
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/connect.go
View File

@ -24,7 +24,7 @@ func connectBase() *cobra.Command {
Long: "Add a new connection to a BBS.", Long: "Add a new connection to a BBS.",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
sysConfig = make(map[string]interface{}) sysConfig = make(map[string]interface{})
sys, err := system.New(sysType, &sysConfig) sys, err := system.New(sysType, &sysConfig, LOG)
if err != nil { if err != nil {
LOG.Panicln(err) LOG.Panicln(err)
} }

36
cmd/root.go
View File

@ -1,8 +1,13 @@
package cmd package cmd
import ( import (
"fmt"
"os"
tea "github.com/charmbracelet/bubbletea"
"github.com/mrusme/gobbs/config" "github.com/mrusme/gobbs/config"
"github.com/mrusme/gobbs/system" "github.com/mrusme/gobbs/system"
"github.com/mrusme/gobbs/ui"
"github.com/mrusme/gobbs/ui/ctx" "github.com/mrusme/gobbs/ui/ctx"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
@ -28,9 +33,10 @@ func init() {
} }
func load() { func load() {
var err error
var logger *zap.Logger var logger *zap.Logger
CFG, err := config.Load() CFG, err = config.Load()
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -42,25 +48,18 @@ func load() {
} }
defer logger.Sync() defer logger.Sync()
LOG = logger.Sugar() LOG = logger.Sugar()
// c := ctx.New(&cfg, LOG)
// _ = loadSystems(&c) // TODO: Handle errs
//
// tui := tea.NewProgram(ui.NewModel(&c), tea.WithAltScreen())
// err = tui.Start()
// if err != nil {
// panic(err)
// }
} }
func loadSystems(c *ctx.Ctx) []error { func loadSystems(c *ctx.Ctx) []error {
var errs []error var errs []error
for _, sysCfg := range c.Config.Systems { for _, sysCfg := range c.Config.Systems {
sys, err := system.New(sysCfg.Type, &sysCfg.Config) sys, err := system.New(sysCfg.Type, &sysCfg.Config, LOG)
if err != nil { if err != nil {
c.Logger.Errorf("error loading system: %s", err) c.Logger.Errorf("error loading system: %s", err)
errs = append(errs, err) errs = append(errs, err)
} else {
c.Logger.Debugln("loaded system")
} }
c.AddSystem(&sys) c.AddSystem(&sys)
@ -76,6 +75,21 @@ var rootCmd = &cobra.Command{
Long: "Gobbs is a bulletin board system (BBS) text user interface written " + Long: "Gobbs is a bulletin board system (BBS) text user interface written " +
"in Go, supporting Discourse and Lemmy.\n" + "in Go, supporting Discourse and Lemmy.\n" +
"More info available on https://xn--gckvb8fzb.com/projects/gobbs", "More info available on https://xn--gckvb8fzb.com/projects/gobbs",
Run: func(cmd *cobra.Command, args []string) {
c := ctx.New(&CFG, LOG)
_ = loadSystems(&c) // TODO: Handle errs
posts, err := (*c.Systems[0]).ListPosts()
fmt.Printf("%v\n", posts)
fmt.Printf("%s\n", err)
os.Exit(0)
tui := tea.NewProgram(ui.NewModel(&c), tea.WithAltScreen())
err = tui.Start()
if err != nil {
panic(err)
}
},
} }
func Execute() { func Execute() {