Merge pull request #423 from rusq/source-detect

Source detection fix

Author: rusq

cmd/slackdump/internal/bootstrap/progress.go

@@ -2,9 +2,14 @@ package bootstrap
 
 import (
 	"context"
+	"fmt"
+	"io"
 	"log/slog"
+	"time"
 
 	"github.com/schollz/progressbar/v3"
+
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"
 )
 
 func ProgressBar(ctx context.Context, lg *slog.Logger, opts ...progressbar.Option) *progressbar.ProgressBar {
@@ -28,3 +33,60 @@ func newProgressBar(pb *progressbar.ProgressBar, debug bool) *progressbar.Progre
 	}
 	return pb
 }
+
+// TimedSpinner displays a spinner for the duration of the operation.  It runs
+// in a separate goroutine and stops once the stop function is called.
+func TimedSpinner(ctx context.Context, w io.Writer, title string, max int, interval time.Duration) (stop func()) {
+	ctx, cancel := context.WithCancel(ctx)
+
+	var wait func()
+	go func() {
+		wait = fakeProgress(ctx, w, title, max, interval)
+	}()
+	return func() {
+		cancel()
+		wait()
+	}
+}
+
+const defaultInterval = 500 * time.Millisecond
+
+// fakeProgress starts a fake spinner and returns a channel that must be closed
+// once the operation completes. interval is interval between iterations. If not
+// set, will default to 100ms.
+func fakeProgress(ctx context.Context, w io.Writer, title string, max int, interval time.Duration) (wait func()) {
+	if cfg.Log.Enabled(ctx, slog.LevelDebug) {
+		return func() {}
+	}
+	if interval == 0 {
+		interval = defaultInterval
+	}
+	finished := make(chan struct{})
+	go func() {
+		bar := progressbar.NewOptions(
+			max,
+			progressbar.OptionSetDescription(title),
+			progressbar.OptionSetPredictTime(false),
+			progressbar.OptionSpinnerType(61),
+			progressbar.OptionSetWriter(w),
+		)
+		t := time.NewTicker(interval)
+		defer t.Stop()
+
+		for {
+			select {
+			case <-ctx.Done():
+				bar.Clear()
+				bar.Finish()
+				fmt.Fprintln(w)
+				close(finished)
+				return
+			case <-t.C:
+				bar.Add(1)
+			}
+		}
+	}()
+	return func() {
+		<-finished
+	}
+}

cmd/slackdump/internal/diag/obfuscate.go

@@ -98,7 +98,7 @@ func runObfuscate(ctx context.Context, cmd *base.Command, args []string) error {
 	if err := fn(ctx); err != nil {
 		return err
 	}
-	fmt.Println("OK")
+	fmt.Fprintln(os.Stderr, "OK")
 	return nil
 }
 

cmd/slackdump/internal/view/view.go

@@ -6,11 +6,13 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"os"
 
 	"github.com/rusq/slackdump/v3/internal/source"
 
 	br "github.com/pkg/browser"
 
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/bootstrap"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/golang/base"
 	"github.com/rusq/slackdump/v3/internal/viewer"
@@ -39,26 +41,36 @@ func runView(ctx context.Context, cmd *base.Command, args []string) error {
 		base.SetExitStatus(base.SInvalidParameters)
 		return fmt.Errorf("viewing slackdump files requires at least one argument")
 	}
+	flags, err := source.Type(args[0])
+	if err != nil {
+		base.SetExitStatus(base.SUserError)
+		return err
+	}
+
+	lg := cfg.Log
+	lg.InfoContext(ctx, "opening archive", "source", args[0], "flags", flags)
+
 	src, err := source.Load(ctx, args[0])
 	if err != nil {
 		base.SetExitStatus(base.SUserError)
 		return err
 	}
 	defer src.Close()
 
+	stoppb := bootstrap.TimedSpinner(ctx, os.Stdout, "Slackdump Viewer is loading files", -1, 0)
 	v, err := viewer.New(ctx, listenAddr, src)
 	if err != nil {
 		base.SetExitStatus(base.SApplicationError)
 		return err
 	}
+	stoppb()
 	// sentinel
 	go func() {
 		<-ctx.Done()
 		v.Close()
+		lg.InfoContext(ctx, "cleanup complete")
 	}()
 
-	lg := cfg.Log
-
 	lg.InfoContext(ctx, "listening on", "addr", listenAddr)
 	go func() {
 		if err := br.OpenURL(fmt.Sprintf("http://%s", listenAddr)); err != nil {
@@ -67,7 +79,7 @@ func runView(ctx context.Context, cmd *base.Command, args []string) error {
 	}()
 	if err := v.ListenAndServe(); err != nil {
 		if errors.Is(err, http.ErrServerClosed) {
-			lg.InfoContext(ctx, "bye")
+			cfg.Log.InfoContext(ctx, "bye")
 			return nil
 		}
 		base.SetExitStatus(base.SApplicationError)

internal/chunk/obfuscate/obfuscate.go

@@ -14,11 +14,14 @@ import (
 	"io"
 	"log"
 	"math/rand"
+	"os"
+	"os/signal"
 	"runtime/trace"
 	"strings"
 	"time"
 
 	"github.com/rusq/slack"
+
 	"github.com/rusq/slackdump/v3/internal/chunk"
 )
 
@@ -50,7 +53,7 @@ func Do(ctx context.Context, w io.Writer, r io.Reader, options ...Option) error
 	_, task := trace.NewTask(ctx, "obfuscate.Do")
 	defer task.End()
 
-	var opts = doOpts{
+	opts := doOpts{
 		seed: time.Now().UnixNano(),
 	}
 	for _, optFn := range options {
@@ -62,6 +65,7 @@ func Do(ctx context.Context, w io.Writer, r io.Reader, options ...Option) error
 }
 
 func obfuscate(ctx context.Context, obf obfuscator, w io.Writer, r io.Reader) error {
+	signal.Reset(os.Interrupt)
 	var (
 		dec = json.NewDecoder(r)
 		enc = json.NewEncoder(w)
@@ -116,7 +120,6 @@ func (o obfuscator) Chunk(c *chunk.Chunk) {
 	default:
 		log.Panicf("unknown chunk type: %s", c.Type)
 	}
-
 }
 
 // obfuscateManyMessages obfuscates a slice of messages.