api cleanup

cmd/slackdump/internal/dump/dump.go

@@ -100,7 +100,14 @@ func RunDump(ctx context.Context, cmd *base.Command, args []string) error {
 		return fmt.Errorf("file template error: %w", err)
 	}
 
-	sess, err := slackdump.New(ctx, prov, slackdump.WithLogger(dlog.FromContext(ctx)))
+	fs, err := fsadapter.New(cfg.BaseLocation)
+	if err != nil {
+		base.SetExitStatus(base.SApplicationError)
+		return err
+	}
+	defer fs.Close()
+
+	sess, err := slackdump.New(ctx, prov, slackdump.WithLogger(dlog.FromContext(ctx)), slackdump.WithFilesystem(fs))
 	if err != nil {
 		base.SetExitStatus(base.SApplicationError)
 		return err
@@ -113,14 +120,14 @@ func RunDump(ctx context.Context, cmd *base.Command, args []string) error {
 		dumpFn = dumpv2
 	}
 
-	if err := dumpFn(ctx, sess, list, tmpl); err != nil {
+	if err := dumpFn(ctx, sess, fs, list, tmpl); err != nil {
 		base.SetExitStatus(base.SApplicationError)
 		return err
 	}
 	return nil
 }
 
-func dumpv3(ctx context.Context, sess *slackdump.Session, list *structures.EntityList, t *nametmpl.Template) error {
+func dumpv3(ctx context.Context, sess *slackdump.Session, fs fsadapter.FS, list *structures.EntityList, t *nametmpl.Template) error {
 	ctx, task := trace.NewTask(ctx, "dumpv3")
 	defer task.End()
 
@@ -141,7 +148,7 @@ func dumpv3(ctx context.Context, sess *slackdump.Session, list *structures.Entit
 	}
 	lg.Debugf("using temporary directory:  %s", tmpdir)
 
-	tf := transform.NewStandard(sess.Filesystem(), transform.WithNameFn(t.Execute))
+	tf := transform.NewStandard(fs, transform.WithNameFn(t.Execute))
 	var eg errgroup.Group
 	for _, link := range p.List.Include {
 		lg.Printf("fetching %q", link)
@@ -180,7 +187,7 @@ func convertChunks(ctx context.Context, tf transform.Interface, statefile string
 	return nil
 }
 
-func dumpv2(ctx context.Context, sess *slackdump.Session, list *structures.EntityList, t *nametmpl.Template) error {
+func dumpv2(ctx context.Context, sess *slackdump.Session, fs fsadapter.FS, list *structures.EntityList, t *nametmpl.Template) error {
 	for _, link := range list.Include {
 		conv, err := sess.Dump(ctx, link, time.Time(cfg.Oldest), time.Time(cfg.Latest))
 		if err != nil {
@@ -190,7 +197,7 @@ func dumpv2(ctx context.Context, sess *slackdump.Session, list *structures.Entit
 		if err != nil {
 			return err
 		}
-		if err := save(ctx, sess.Filesystem(), name, conv); err != nil {
+		if err := save(ctx, fs, name, conv); err != nil {
 			return err
 		}
 	}

cmd/slackdump/internal/export/export.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/rusq/dlog"
+	"github.com/rusq/fsadapter"
 
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/auth"
@@ -65,13 +66,18 @@ func runExport(ctx context.Context, cmd *base.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	fsa, err := fsadapter.New(cfg.BaseLocation)
+	if err != nil {
+		return err
+	}
 
 	options.List = list
 	options.Logger = dlog.FromContext(ctx)
 
+	var expfn = exportV3
 	if compat {
-		return exportV2(ctx, sess, list, options)
+		expfn = exportV2
 	}
 
-	return exportV3(ctx, sess, list, options)
+	return expfn(ctx, sess, fsa, list, options)
 }

cmd/slackdump/internal/export/v2.go

@@ -3,12 +3,13 @@ package export
 import (
 	"context"
 
+	"github.com/rusq/fsadapter"
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/export"
 	"github.com/rusq/slackdump/v2/internal/structures"
 )
 
-func exportV2(ctx context.Context, sess *slackdump.Session, list *structures.EntityList, options export.Config) error {
-	exp := export.New(sess, options)
+func exportV2(ctx context.Context, sess *slackdump.Session, fs fsadapter.FS, list *structures.EntityList, options export.Config) error {
+	exp := export.New(sess, fs, options)
 	return exp.Run(ctx)
 }

cmd/slackdump/internal/export/v3.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 
 	"github.com/rusq/dlog"
+	"github.com/rusq/fsadapter"
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/export/expproc"
 	"github.com/rusq/slackdump/v2/export"
@@ -15,7 +16,7 @@ import (
 	"github.com/slack-go/slack"
 )
 
-func exportV3(ctx context.Context, sess *slackdump.Session, list *structures.EntityList, options export.Config) error {
+func exportV3(ctx context.Context, sess *slackdump.Session, fs fsadapter.FS, list *structures.EntityList, options export.Config) error {
 	lg := dlog.FromContext(ctx)
 	tmpdir, err := os.MkdirTemp("", "slackdump-*")
 	if err != nil {

cmd/slackdump/internal/export/wizard.go

@@ -66,7 +66,7 @@ func wizExport(ctx context.Context, cmd *base.Command, args []string) error {
 		return err
 	}
 	// TODO v3
-	exp := export.New(sess, options)
+	exp := export.New(sess, fsa, options)
 
 	// run export
 	return exp.Run(ctx)

cmd/slackdump/internal/list/list.go

@@ -85,6 +85,7 @@ type listFunc func(ctx context.Context, sess *slackdump.Session) (a any, filenam
 // list authenticates and creates a slackdump instance, then calls a listFn.
 // listFn must return the object from the api, a JSON filename and an error.
 func list(ctx context.Context, listFn listFunc) error {
+	// TODO fix users saving JSON to a text file within archive
 	if listType == format.CUnknown {
 		return errors.New("unknown listing format, seek help")
 	}
@@ -130,7 +131,11 @@ func list(ctx context.Context, listFn listFunc) error {
 	}
 
 	if !nosave {
-		if err := saveData(ctx, sess.Filesystem(), data, filename, format.CJSON, users); err != nil {
+		fsa, err := fsadapter.New(cfg.BaseLocation)
+		if err != nil {
+			return err
+		}
+		if err := saveData(ctx, fsa, data, filename, format.CJSON, users); err != nil {
 			return err
 		}
 	}

export/export.go

@@ -33,18 +33,18 @@ type Export struct {
 
 // New creates a new Export instance, that will save export to the
 // provided fs.
-func New(sd *slackdump.Session, cfg Config) *Export {
+func New(sd *slackdump.Session, fs fsadapter.FS, cfg Config) *Export {
 	if cfg.Logger == nil {
 		cfg.Logger = logger.Default
 	}
 	network.Logger = cfg.Logger
 
 	se := &Export{
-		fs:   sd.Filesystem(),
+		fs:   fs,
 		sd:   sd,
 		lg:   cfg.Logger,
 		opts: cfg,
-		dl:   newFileExporter(cfg.Type, sd.Filesystem(), sd.Client(), cfg.Logger, cfg.ExportToken),
+		dl:   newFileExporter(cfg.Type, fs, sd.Client(), cfg.Logger, cfg.ExportToken),
 	}
 	return se
 }

internal/app/dump.go

@@ -25,6 +25,7 @@ import (
 type dump struct {
 	sess *slackdump.Session
 	cfg  config.Params
+	fs   fsadapter.FS
 
 	log logger.Interface
 }
@@ -61,7 +62,7 @@ func newDump(ctx context.Context, cfg config.Params, prov auth.Provider, fs fsad
 		return nil, err
 	}
 
-	return &dump{sess: sess, cfg: cfg, log: cfg.Logger()}, nil
+	return &dump{sess: sess, cfg: cfg, log: cfg.Logger(), fs: fs}, nil
 }
 
 // Dump dumps the input, if dumpfiles is true, it will save the files into a
@@ -90,7 +91,7 @@ func (app *dump) Dump(ctx context.Context) (int, error) {
 
 	total := 0
 	if err := app.cfg.Input.Producer(func(channelID string) error {
-		if err := app.dumpOne(ctx, app.sess.Filesystem(), tmpl, channelID, app.sess.Dump); err != nil {
+		if err := app.dumpOne(ctx, app.fs, tmpl, channelID, app.sess.Dump); err != nil {
 			app.log.Printf("error processing: %q (conversation will be skipped): %s", channelID, err)
 			return config.ErrSkip
 		}

internal/app/export.go

@@ -41,7 +41,7 @@ func Export(ctx context.Context, cfg config.Params, prov auth.Provider) error {
 
 	cfg.Logger().Printf("Export:  staring export to: %s", cfg.ExportName)
 
-	e := export.New(sess, makeExportOptions(cfg))
+	e := export.New(sess, fs, makeExportOptions(cfg))
 	if err := e.Run(ctx); err != nil {
 		return err
 	}

slackdump.go

@@ -162,11 +162,6 @@ func (s *Session) Client() *slack.Client {
 	return s.client.(*slack.Client)
 }
 
-// Filesystem returns the filesystem adapter used by the session.
-func (s *Session) Filesystem() fsadapter.FS {
-	return s.fs
-}
-
 // CurrentUserID returns the user ID of the authenticated user.
 func (s *Session) CurrentUserID() string {
 	return s.wspInfo.UserID