Fix spinner updates for multiline progress

Author: Daniel-Ric

internal/cli/cli.go

@@ -389,7 +389,7 @@ func (a *App) executeLookup(config LookupConfig) error {
 			BaseHost:      config.BaseHost,
 			Subdomains:    config.Subdomains,
 			DomainEndings: config.Endings,
-			Concurrency:   24,
+			Concurrency:   0,
 			Progress: func(progress ping.LookupProgress) {
 				current.Store(progress)
 			},
@@ -418,7 +418,7 @@ func formatLookupProgress(progress ping.LookupProgress, frame int) string {
 	bar := buildProgressBar(progress.Completed, progress.Total, frame, 20)
 	percent := (float64(progress.Completed) / float64(progress.Total)) * 100
 	return fmt.Sprintf(
-		"%s %d/%d (%.0f%%) | Subdomain: %s | Endung: %s | Host: %s",
+		"%s %d/%d (%.0f%%)\nSubdomain: %-12s | Endung: %-10s | Host: %s",
 		bar,
 		progress.Completed,
 		progress.Total,

internal/cli/ui.go

@@ -235,22 +235,49 @@ func withSpinner(title string, message func(frame int) string, tick time.Duratio
 	defer ticker.Stop()
 
 	frame := 0
-	lastLen := 0
+	lastLines := 0
 	for {
 		select {
 		case res := <-resultCh:
-			if lastLen > 0 {
-				fmt.Print("\r", strings.Repeat(" ", lastLen), "\r")
+			if lastLines > 1 {
+				moveCursorUp(lastLines - 1)
+			}
+			for i := 0; i < lastLines; i++ {
+				clearLine()
+				if i < lastLines-1 {
+					fmt.Print("\n")
+				}
 			}
 			fmt.Println()
 			return res.result, res.err
 		case <-ticker.C:
-			line := fmt.Sprintf("%s %s", style(message(frame), colorDim), style(frames[frame], colorAccent))
-			if lastLen > 0 && len(line) < lastLen {
-				line += strings.Repeat(" ", lastLen-len(line))
+			parts := strings.Split(message(frame), "\n")
+			if len(parts) == 0 {
+				parts = []string{""}
+			}
+			renderLines := len(parts)
+			if lastLines > renderLines {
+				renderLines = lastLines
+			}
+
+			if lastLines > 1 {
+				moveCursorUp(lastLines - 1)
 			}
-			fmt.Print("\r", line)
-			lastLen = len(line)
+			for i := 0; i < renderLines; i++ {
+				clearLine()
+				if i < len(parts) {
+					line := style(parts[i], colorDim)
+					if i == len(parts)-1 {
+						line = fmt.Sprintf("%s %s", line, style(frames[frame], colorAccent))
+					}
+					fmt.Print(line)
+				}
+				if i < renderLines-1 {
+					fmt.Print("\n")
+				}
+			}
+
+			lastLines = len(parts)
 			frame = (frame + 1) % len(frames)
 		}
 	}

internal/ping/lookup.go

@@ -3,6 +3,7 @@ package ping
 import (
 	"context"
 	"fmt"
+	"runtime"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -53,14 +54,21 @@ func LookupDomains(ctx context.Context, config LookupConfig) (LookupResult, erro
 		subdomains = []string{""}
 	}
 
-	concurrency := config.Concurrency
-	if concurrency <= 0 {
-		concurrency = 16
-	}
 	total := len(subdomains) * len(endings)
 	if total == 0 {
 		return LookupResult{}, fmt.Errorf("keine kombinationen verfügbar")
 	}
+	concurrency := config.Concurrency
+	if concurrency <= 0 {
+		base := runtime.NumCPU() * 8
+		if base < 32 {
+			base = 32
+		}
+		concurrency = base
+	}
+	if concurrency > total {
+		concurrency = total
+	}
 
 	type lookupCandidate struct {
 		subdomain string