Refactoring cleanup: improve code quality with roborev analyze

cmd/msgvault/cmd/addaccount.go

@@ -33,7 +33,7 @@ Example:
 		}
 
 		// Initialize database (in case it's new)
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)

cmd/msgvault/cmd/build_cache.go

@@ -43,7 +43,7 @@ The cache files are stored in ~/.msgvault/analytics/:
 By default, this performs an incremental update (only adding new messages).
 Use --full-rebuild to recreate all cache files from scratch.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		analyticsDir := cfg.AnalyticsDir()
 
 		// Check database exists

cmd/msgvault/cmd/deletions.go

@@ -323,7 +323,7 @@ Examples:
 		}
 
 		// Open database
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)

cmd/msgvault/cmd/export_eml.go

@@ -31,7 +31,7 @@ Examples:
 		idStr := args[0]
 
 		// Open database
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)

cmd/msgvault/cmd/initdb.go

@@ -16,7 +16,7 @@ This command creates all necessary tables for storing emails, attachments,
 labels, and sync state. It is safe to run multiple times - tables are only
 created if they don't already exist.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		logger.Info("initializing database", "path", dbPath)
 
 		s, err := store.Open(dbPath)

cmd/msgvault/cmd/list_domains.go

@@ -27,7 +27,7 @@ Examples:
 		}
 
 		// Open database
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)
@@ -38,7 +38,7 @@ Examples:
 		engine := query.NewSQLiteEngine(s.DB())
 
 		// Execute aggregation
-		results, err := engine.AggregateByDomain(cmd.Context(), opts)
+		results, err := engine.Aggregate(cmd.Context(), query.ViewDomains, opts)
 		if err != nil {
 			return fmt.Errorf("aggregate by domain: %w", err)
 		}

cmd/msgvault/cmd/list_labels.go

@@ -27,7 +27,7 @@ Examples:
 		}
 
 		// Open database
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)
@@ -38,7 +38,7 @@ Examples:
 		engine := query.NewSQLiteEngine(s.DB())
 
 		// Execute aggregation
-		results, err := engine.AggregateByLabel(cmd.Context(), opts)
+		results, err := engine.Aggregate(cmd.Context(), query.ViewLabels, opts)
 		if err != nil {
 			return fmt.Errorf("aggregate by label: %w", err)
 		}

cmd/msgvault/cmd/list_senders.go

@@ -27,7 +27,7 @@ Examples:
 		}
 
 		// Open database
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)
@@ -38,7 +38,7 @@ Examples:
 		engine := query.NewSQLiteEngine(s.DB())
 
 		// Execute aggregation
-		results, err := engine.AggregateBySender(cmd.Context(), opts)
+		results, err := engine.Aggregate(cmd.Context(), query.ViewSenders, opts)
 		if err != nil {
 			return fmt.Errorf("aggregate by sender: %w", err)
 		}

cmd/msgvault/cmd/mcp.go

@@ -32,7 +32,7 @@ Add to Claude Desktop config:
     }
   }`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)

cmd/msgvault/cmd/repair_encoding.go

@@ -8,16 +8,10 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/gogs/chardet"
 	"github.com/spf13/cobra"
 	"github.com/wesm/msgvault/internal/mime"
 	"github.com/wesm/msgvault/internal/store"
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/charmap"
-	"golang.org/x/text/encoding/japanese"
-	"golang.org/x/text/encoding/korean"
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/encoding/traditionalchinese"
+	"github.com/wesm/msgvault/internal/textutil"
 )
 
 var repairEncodingCmd = &cobra.Command{
@@ -40,7 +34,7 @@ For each invalid field, it:
 This is useful after a sync that may have produced invalid UTF-8 due to
 charset detection issues in the MIME parser.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		dbPath := cfg.DatabasePath()
+		dbPath := cfg.DatabaseDSN()
 		s, err := store.Open(dbPath)
 		if err != nil {
 			return fmt.Errorf("open database: %w", err)
@@ -239,7 +233,7 @@ func repairMessageFields(s *store.Store, stats *repairStats) error {
 			if parsed != nil && utf8.ValidString(parsed.Subject) {
 				repair.newSubject = sql.NullString{String: parsed.Subject, Valid: true}
 			} else {
-				repair.newSubject = sql.NullString{String: ensureValidUTF8(subject.String), Valid: true}
+				repair.newSubject = sql.NullString{String: textutil.EnsureUTF8(subject.String), Valid: true}
 			}
 			needsRepair = true
 			stats.subjects++
@@ -253,7 +247,7 @@ func repairMessageFields(s *store.Store, stats *repairStats) error {
 			if parsed != nil && utf8.ValidString(parsed.GetBodyText()) {
 				repair.newBody = sql.NullString{String: parsed.GetBodyText(), Valid: true}
 			} else {
-				repair.newBody = sql.NullString{String: ensureValidUTF8(bodyText.String), Valid: true}
+				repair.newBody = sql.NullString{String: textutil.EnsureUTF8(bodyText.String), Valid: true}
 			}
 			needsRepair = true
 			stats.bodyTexts++
@@ -267,15 +261,15 @@ func repairMessageFields(s *store.Store, stats *repairStats) error {
 			if parsed != nil && utf8.ValidString(parsed.BodyHTML) {
 				repair.newHTML = sql.NullString{String: parsed.BodyHTML, Valid: true}
 			} else {
-				repair.newHTML = sql.NullString{String: ensureValidUTF8(bodyHTML.String), Valid: true}
+				repair.newHTML = sql.NullString{String: textutil.EnsureUTF8(bodyHTML.String), Valid: true}
 			}
 			needsRepair = true
 			stats.bodyHTMLs++
 		}
 
 		// Snippet (from Gmail API, not in raw MIME)
 		if snippet.Valid && !utf8.ValidString(snippet.String) {
-			repair.newSnippet = sql.NullString{String: ensureValidUTF8(snippet.String), Valid: true}
+			repair.newSnippet = sql.NullString{String: textutil.EnsureUTF8(snippet.String), Valid: true}
 			needsRepair = true
 			stats.snippets++
 		}
@@ -395,7 +389,7 @@ func repairDisplayNames(s *store.Store, stats *repairStats) error {
 			}
 
 			if !utf8.ValidString(name) {
-				repairs = append(repairs, nameRepair{id: id, newName: ensureValidUTF8(name)})
+				repairs = append(repairs, nameRepair{id: id, newName: textutil.EnsureUTF8(name)})
 				stats.displayNames++
 
 				// Apply batch when full
@@ -526,7 +520,7 @@ func repairOtherStrings(s *store.Store, stats *repairStats) error {
 			}
 
 			if !utf8.ValidString(value) {
-				repairs = append(repairs, repair{id: id, newValue: ensureValidUTF8(value)})
+				repairs = append(repairs, repair{id: id, newValue: textutil.EnsureUTF8(value)})
 				*table.counter++
 
 				if len(repairs) >= batchSize {
@@ -582,22 +576,6 @@ func tryParseMIME(rawData []byte, compression sql.NullString) *mime.Message {
 	return parsed
 }
 
-// ensureValidUTF8 converts a string to valid UTF-8 using charset detection
-func ensureValidUTF8(s string) string {
-	if utf8.ValidString(s) {
-		return s
-	}
-
-	// Try charset detection and conversion
-	decoded, err := detectAndDecode([]byte(s))
-	if err == nil {
-		return decoded
-	}
-
-	// Last resort: replace invalid bytes
-	return sanitizeUTF8(s)
-}
-
 // byteReader wraps a byte slice for use with zlib.NewReader
 type byteReader struct {
 	data []byte
@@ -613,99 +591,6 @@ func (r *byteReader) Read(p []byte) (n int, err error) {
 	return n, nil
 }
 
-// sanitizeUTF8 replaces invalid UTF-8 bytes with the replacement character.
-func sanitizeUTF8(s string) string {
-	var sb strings.Builder
-	sb.Grow(len(s))
-	for i := 0; i < len(s); {
-		r, size := utf8.DecodeRuneInString(s[i:])
-		if r == utf8.RuneError && size == 1 {
-			sb.WriteRune('\ufffd')
-			i++
-		} else {
-			sb.WriteRune(r)
-			i += size
-		}
-	}
-	return sb.String()
-}
-
-// detectAndDecode attempts to detect the charset of the given bytes and decode to UTF-8.
-func detectAndDecode(data []byte) (string, error) {
-	if utf8.Valid(data) {
-		return string(data), nil
-	}
-
-	// Try charset detection first (only useful for longer samples)
-	if len(data) > 20 {
-		detector := chardet.NewTextDetector()
-		result, err := detector.DetectBest(data)
-		if err == nil && result.Confidence >= 50 {
-			if enc := getEncodingByName(result.Charset); enc != nil {
-				decoded, err := enc.NewDecoder().Bytes(data)
-				if err == nil && utf8.Valid(decoded) {
-					return string(decoded), nil
-				}
-			}
-		}
-	}
-
-	// Try common encodings in order
-	encodings := []encoding.Encoding{
-		charmap.Windows1252,
-		charmap.ISO8859_1,
-		charmap.ISO8859_15,
-		japanese.ShiftJIS,
-		japanese.EUCJP,
-		korean.EUCKR,
-		simplifiedchinese.GBK,
-		traditionalchinese.Big5,
-	}
-
-	for _, enc := range encodings {
-		decoded, err := enc.NewDecoder().Bytes(data)
-		if err == nil && utf8.Valid(decoded) {
-			return string(decoded), nil
-		}
-	}
-
-	return "", fmt.Errorf("could not decode to valid UTF-8")
-}
-
-// getEncodingByName returns an encoding for the given IANA charset name.
-func getEncodingByName(name string) encoding.Encoding {
-	switch name {
-	case "windows-1252", "CP1252", "cp1252":
-		return charmap.Windows1252
-	case "ISO-8859-1", "iso-8859-1", "latin1", "latin-1":
-		return charmap.ISO8859_1
-	case "ISO-8859-15", "iso-8859-15", "latin9":
-		return charmap.ISO8859_15
-	case "ISO-8859-2", "iso-8859-2", "latin2":
-		return charmap.ISO8859_2
-	case "Shift_JIS", "shift_jis", "shift-jis", "sjis":
-		return japanese.ShiftJIS
-	case "EUC-JP", "euc-jp", "eucjp":
-		return japanese.EUCJP
-	case "ISO-2022-JP", "iso-2022-jp":
-		return japanese.ISO2022JP
-	case "EUC-KR", "euc-kr", "euckr":
-		return korean.EUCKR
-	case "GB2312", "gb2312", "GBK", "gbk":
-		return simplifiedchinese.GBK
-	case "GB18030", "gb18030":
-		return simplifiedchinese.GB18030
-	case "Big5", "big5", "big-5":
-		return traditionalchinese.Big5
-	case "KOI8-R", "koi8-r":
-		return charmap.KOI8R
-	case "KOI8-U", "koi8-u":
-		return charmap.KOI8U
-	default:
-		return nil
-	}
-}
-
 func init() {
 	rootCmd.AddCommand(repairEncodingCmd)
 }