♻️ Move convids cmd code to internal App

internal/cli/convids/app.go

@@ -0,0 +1,60 @@
+package convids
+
+import (
+	"context"
+	"fmt"
+	"io"
+
+	conutils "codeberg.org/danjones000/utils/convids"
+	"github.com/spf13/pflag"
+)
+
+type App struct {
+	Name         string
+	Data         *conutils.Data
+	flags        *pflag.FlagSet
+	stdout       io.Writer
+	stderr       io.Writer
+	stdin        io.Reader
+	walker       conutils.ShowWalker
+	groupPrinter conutils.GroupPrinter
+}
+
+func NewApp(ctx context.Context, name string, args []string, dataPath string, stdout io.Writer, stdin io.Reader, stderr io.Writer) (*App, error) {
+	a := App{Name: name, stdout: stdout, stdin: stdin, stderr: stderr}
+	var err error
+	a.flags, err = ParseFlags(name, args)
+	if err != nil {
+		return nil, err
+	}
+
+	a.walker = GetWalker(ctx, *DryRun, stdin, stdout, stderr)
+	a.Data, err = conutils.NewData(dataPath)
+	if err != nil {
+		return nil, err
+	}
+	a.groupPrinter = conutils.PrintGroupName(stdout)
+
+	return &a, nil
+}
+
+func (a *App) Run(ctx context.Context) error {
+	if *Loop {
+		return a.runInLoop(ctx)
+	}
+	return a.run(ctx)
+}
+
+func (a *App) run(ctx context.Context) error {
+	return conutils.WalkFiles(a.Data, false, a.groupPrinter, a.walker)
+}
+
+func (a *App) runInLoop(ctx context.Context) error {
+	fmt.Fprintln(a.stdout, "Looping")
+	var err error
+	for err == nil {
+		err = a.run(ctx)
+		fmt.Fprintln(a.stdout, err)
+	}
+	return err
+}

internal/cli/convids/walker.go

@@ -0,0 +1,29 @@
+package convids
+
+import (
+	"context"
+	"fmt"
+	"io"
+
+	"codeberg.org/danjones000/utils/chill"
+	"codeberg.org/danjones000/utils/cli/spin"
+	conutils "codeberg.org/danjones000/utils/convids"
+)
+
+func GetWalker(ctx context.Context, dryRun bool, in io.Reader, out, errOut io.Writer) conutils.ShowWalker {
+	if dryRun {
+		return conutils.DryRun(out)
+	}
+
+	gs := conutils.GetShowWithIO(ctx, in, out, errOut)
+	return func(s *conutils.Show, path string) error {
+		ct := chill.Chill(ctx)
+		msg := fmt.Sprintf("Waiting for CPU to cool, for %s", path)
+		sp := spin.Spin(ct, msg)
+		err := sp.Wait()
+		if err != nil {
+			return err
+		}
+		return gs(s, path)
+	}
+}