Expose Export package and simplify app

cmd/slackdump/main.go

@@ -115,20 +115,12 @@ func run(ctx context.Context, p params) error {
 	// trace startup parameters for debugging
 	trace.Logf(ctx, "info", "params: input: %+v", p)
 
-	// initialise the application
-	application, err := app.New(p.appCfg, provider)
-	if err != nil {
-		trace.Logf(ctx, "error", "app.New: %s", err.Error())
-		return fmt.Errorf("application failed to initialise: %w", err)
-	}
-	defer application.Close()
-
 	// override default handler for SIGTERM and SIGQUIT signals.
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 	defer stop()
 
 	// run the application
-	if err := application.Run(ctx); err != nil {
+	if err := app.Run(ctx, p.appCfg, provider); err != nil {
 		trace.Logf(ctx, "error", "app.Run: %s", err.Error())
 		if isInvalidAuth(err) {
 			return fmt.Errorf("failed to authenticate:  please double check that token/cookie values are correct (error: %w)", err)

internal/app/app.go

@@ -2,150 +2,32 @@ package app
 
 import (
 	"context"
-	"html/template"
 	"runtime/trace"
 	"time"
 
-	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/auth"
-	"github.com/rusq/slackdump/v2/fsadapter"
-	"github.com/rusq/slackdump/v2/logger"
 )
 
-const (
-	OutputTypeJSON = "json"
-	OutputTypeText = "text"
-)
-
-type App struct {
-	sd   *slackdump.Session
-	tmpl *template.Template
-	fs   fsadapter.FS
-
-	prov auth.Provider
-	cfg  Config
-}
-
-// New creates a new slackdump app. It inherits the logging from slack options
-// in the Config.
-func New(cfg Config, provider auth.Provider) (*App, error) {
+// Run starts the Slackdump.
+func Run(ctx context.Context, cfg Config, prov auth.Provider) error {
 	if err := cfg.Validate(); err != nil {
-		return nil, err
-	}
-	tmpl, err := cfg.compileTemplates()
-	if err != nil {
-		return nil, err
-	}
-	fs, err := fsadapter.ForFilename(cfg.Output.Base)
-	if err != nil {
-		return nil, err
-	}
-	app := &App{cfg: cfg, prov: provider, tmpl: tmpl, fs: fs}
-	return app, nil
-}
-
-func (app *App) Run(ctx context.Context) error {
-	ctx, task := trace.NewTask(ctx, "app.Run")
-	defer task.End()
-
-	if err := app.initSlackdump(ctx); err != nil {
 		return err
 	}
-
-	start := time.Now()
-	var err error
-	switch {
-	case app.cfg.ListFlags.FlagsPresent():
-		err = app.runListEntities(ctx)
-	case app.cfg.ExportName != "":
-		app.l().Debug("export mode ON")
-		err = app.runExport(ctx)
-	default:
-		err = app.runDump(ctx)
-	}
-
-	if err != nil {
-		trace.Log(ctx, "error", err.Error())
-		return err
-	}
-
-	app.l().Printf("completed, time taken: %s", time.Since(start))
-	return nil
-}
-
-// Close closes all open handles.
-func (app *App) Close() error {
-	return fsadapter.Close(app.fs)
-}
-
-// initSlackdump initialises the slack dumper app.
-func (app *App) initSlackdump(ctx context.Context) error {
-	sd, err := slackdump.NewWithOptions(
-		ctx,
-		app.prov,
-		app.cfg.Options,
-	)
-	if err != nil {
-		return err
-	}
-	app.sd = sd
-	app.sd.SetFS(app.fs)
-	return nil
-}
-
-func (app *App) runListEntities(ctx context.Context) error {
-	ctx, task := trace.NewTask(ctx, "runListEntities")
+	ctx, task := trace.NewTask(ctx, "Run")
 	defer task.End()
 
-	if err := app.listEntities(ctx, app.cfg.Output, app.cfg.ListFlags); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (app *App) runExport(ctx context.Context) error {
-	ctx, task := trace.NewTask(ctx, "runExport")
-	defer task.End()
+	start := time.Now()
 
-	if err := app.Export(ctx,
-		app.cfg.ExportName,
-	); err != nil {
-		return err
+	var err error
+	if cfg.ExportName != "" {
+		err = Export(ctx, cfg, prov)
+	} else {
+		err = Dump(ctx, cfg, prov)
 	}
-
-	return nil
-}
-
-func (app *App) runDump(ctx context.Context) error {
-	ctx, task := trace.NewTask(ctx, "runDump")
-	defer task.End()
-
-	n, err := app.dump(ctx, app.cfg.Input)
 	if err != nil {
 		return err
 	}
 
-	app.l().Printf("dumped %d item(s)", n)
+	cfg.Logger().Printf("completed, time taken: %s", time.Since(start))
 	return nil
 }
-
-func (app *App) l() logger.Interface {
-	// inherit the logger from the slackdump options
-	if app.cfg.Options.Logger == nil {
-		app.cfg.Options.Logger = logger.Default
-	}
-	return app.cfg.Options.Logger
-}
-
-// td outputs the message to trace and logs a debug message.
-func (app *App) td(ctx context.Context, category string, fmt string, a ...any) {
-	app.l().Debugf(fmt, a...)
-	trace.Logf(ctx, category, fmt, a...)
-}
-
-// td outputs the message to trace and logs a debug message.
-func (app *App) tl(ctx context.Context, category string, fmt string, a ...any) {
-	app.l().Printf(fmt, a...)
-	trace.Logf(ctx, category, fmt, a...)
-}

internal/app/config.go

@@ -10,13 +10,21 @@ import (
 
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/internal/structures"
+	"github.com/rusq/slackdump/v2/logger"
 	"github.com/rusq/slackdump/v2/types"
 )
 
+const (
+	OutputTypeJSON = "json"
+	OutputTypeText = "text"
+)
+
 const (
 	filenameTmplName = "fnt"
 )
 
+var errSkip = errors.New("skip")
+
 type Config struct {
 	ListFlags ListFlags
 
@@ -45,8 +53,6 @@ type Input struct {
 
 var (
 	ErrInvalidInput = errors.New("no valid input")
-
-	errSkip = errors.New("skip")
 )
 
 func (in *Input) IsValid() bool {
@@ -173,3 +179,10 @@ func (in Input) producer(fn func(string) error) error {
 
 	return in.listProducer(fn)
 }
+
+func (cfg Config) Logger() logger.Interface {
+	if cfg.Options.Logger == nil {
+		return logger.Default
+	}
+	return cfg.Options.Logger
+}