Apply linter autofixes: internal/storage, types, ui (refs #61)

internal/storage/file.go

@@ -102,26 +102,32 @@ func (f *FileStorer) PutWithProgress(ctx context.Context, key string, data io.Re
 // Get retrieves data from the specified key.
 func (f *FileStorer) Get(ctx context.Context, key string) (io.ReadCloser, error) {
 	path := f.fullPath(key)
+
 	file, err := f.fs.Open(path)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil, ErrNotFound
 		}
+
 		return nil, fmt.Errorf("opening file: %w", err)
 	}
+
 	return file, nil
 }
 
 // Stat returns metadata about an object without retrieving its contents.
 func (f *FileStorer) Stat(ctx context.Context, key string) (*ObjectInfo, error) {
 	path := f.fullPath(key)
+
 	info, err := f.fs.Stat(path)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil, ErrNotFound
 		}
+
 		return nil, fmt.Errorf("stat file: %w", err)
 	}
+
 	return &ObjectInfo{
 		Key:  key,
 		Size: info.Size(),
@@ -131,19 +137,23 @@ func (f *FileStorer) Stat(ctx context.Context, key string) (*ObjectInfo, error)
 // Delete removes an object.
 func (f *FileStorer) Delete(ctx context.Context, key string) error {
 	path := f.fullPath(key)
+
 	err := f.fs.Remove(path)
 	if os.IsNotExist(err) {
 		return nil // Match S3 behavior: no error if doesn't exist
 	}
+
 	if err != nil {
 		return fmt.Errorf("removing file: %w", err)
 	}
+
 	return nil
 }
 
 // List returns all keys with the given prefix.
 func (f *FileStorer) List(ctx context.Context, prefix string) ([]string, error) {
 	var keys []string
+
 	basePath := f.fullPath(prefix)
 
 	// Check if base path exists
@@ -151,6 +161,7 @@ func (f *FileStorer) List(ctx context.Context, prefix string) ([]string, error)
 	if err != nil {
 		return nil, fmt.Errorf("checking path: %w", err)
 	}
+
 	if !exists {
 		return keys, nil // Empty list for non-existent prefix
 	}
@@ -177,9 +188,9 @@ func (f *FileStorer) List(ctx context.Context, prefix string) ([]string, error)
 			relPath = strings.ReplaceAll(relPath, string(filepath.Separator), "/")
 			keys = append(keys, relPath)
 		}
+
 		return nil
 	})
-
 	if err != nil {
 		return nil, fmt.Errorf("walking directory: %w", err)
 	}
@@ -192,14 +203,17 @@ func (f *FileStorer) ListStream(ctx context.Context, prefix string) <-chan Objec
 	ch := make(chan ObjectInfo)
 	go func() {
 		defer close(ch)
+
 		basePath := f.fullPath(prefix)
 
 		// Check if base path exists
 		exists, err := afero.Exists(f.fs, basePath)
 		if err != nil {
 			ch <- ObjectInfo{Err: fmt.Errorf("checking path: %w", err)}
+
 			return
 		}
+
 		if !exists {
 			return // Empty channel for non-existent prefix
 		}
@@ -209,12 +223,14 @@ func (f *FileStorer) ListStream(ctx context.Context, prefix string) <-chan Objec
 			select {
 			case <-ctx.Done():
 				ch <- ObjectInfo{Err: ctx.Err()}
+
 				return ctx.Err()
 			default:
 			}
 
 			if err != nil {
 				ch <- ObjectInfo{Err: err}
+
 				return nil // Continue walking despite errors
 			}
 
@@ -222,6 +238,7 @@ func (f *FileStorer) ListStream(ctx context.Context, prefix string) <-chan Objec
 				relPath, err := filepath.Rel(f.basePath, path)
 				if err != nil {
 					ch <- ObjectInfo{Err: fmt.Errorf("computing relative path: %w", err)}
+
 					return nil
 				}
 				// Normalize path separators
@@ -231,9 +248,11 @@ func (f *FileStorer) ListStream(ctx context.Context, prefix string) <-chan Objec
 					Size: info.Size(),
 				}
 			}
+
 			return nil
 		})
 	}()
+
 	return ch
 }
 
@@ -257,10 +276,12 @@ func (pw *progressWriter) Write(p []byte) (int, error) {
 	if n > 0 {
 		pw.written += int64(n)
 		if pw.callback != nil {
-			if callbackErr := pw.callback(pw.written); callbackErr != nil {
+			callbackErr := pw.callback(pw.written)
+			if callbackErr != nil {
 				return n, callbackErr
 			}
 		}
 	}
+
 	return n, err
 }

internal/storage/module.go

@@ -24,6 +24,7 @@ func NewStorer(cfg *config.Config) (Storer, error) {
 	if cfg.StorageURL != "" {
 		return storerFromURL(cfg.StorageURL, cfg)
 	}
+
 	return storerFromLegacyS3Config(cfg)
 }
 
@@ -71,6 +72,7 @@ func storerFromURL(rawURL string, cfg *config.Config) (Storer, error) {
 		if err != nil {
 			return nil, fmt.Errorf("creating S3 client: %w", err)
 		}
+
 		return NewS3Storer(client), nil
 
 	case "rclone":
@@ -109,5 +111,6 @@ func storerFromLegacyS3Config(cfg *config.Config) (Storer, error) {
 	if err != nil {
 		return nil, fmt.Errorf("creating S3 client: %w", err)
 	}
+
 	return NewS3Storer(client), nil
 }

internal/storage/rclone.go

@@ -49,6 +49,7 @@ func NewRcloneStorer(ctx context.Context, remote, path string) (*RcloneStorer, e
 			strings.Contains(err.Error(), "failed to find remote") {
 			return nil, fmt.Errorf("%w: %s", ErrRemoteNotFound, remote)
 		}
+
 		return nil, fmt.Errorf("creating rclone filesystem: %w", err)
 	}
 
@@ -101,9 +102,11 @@ func (r *RcloneStorer) Get(ctx context.Context, key string) (io.ReadCloser, erro
 		if errors.Is(err, fs.ErrorObjectNotFound) {
 			return nil, ErrNotFound
 		}
+
 		if errors.Is(err, fs.ErrorDirNotFound) {
 			return nil, ErrNotFound
 		}
+
 		return nil, fmt.Errorf("getting object: %w", err)
 	}
 
@@ -123,9 +126,11 @@ func (r *RcloneStorer) Stat(ctx context.Context, key string) (*ObjectInfo, error
 		if errors.Is(err, fs.ErrorObjectNotFound) {
 			return nil, ErrNotFound
 		}
+
 		if errors.Is(err, fs.ErrorDirNotFound) {
 			return nil, ErrNotFound
 		}
+
 		return nil, fmt.Errorf("getting object: %w", err)
 	}
 
@@ -142,9 +147,11 @@ func (r *RcloneStorer) Delete(ctx context.Context, key string) error {
 		if errors.Is(err, fs.ErrorObjectNotFound) {
 			return nil // Match S3 behavior: no error if doesn't exist
 		}
+
 		if errors.Is(err, fs.ErrorDirNotFound) {
 			return nil
 		}
+
 		return fmt.Errorf("getting object: %w", err)
 	}
 
@@ -209,6 +216,7 @@ func (r *RcloneStorer) Info() StorageInfo {
 	if r.path != "" {
 		location += ":" + r.path
 	}
+
 	return StorageInfo{
 		Type:     "rclone",
 		Location: location,
@@ -227,10 +235,12 @@ func (pr *progressReader) Read(p []byte) (int, error) {
 	if n > 0 {
 		pr.read += int64(n)
 		if pr.callback != nil {
-			if callbackErr := pr.callback(pr.read); callbackErr != nil {
+			callbackErr := pr.callback(pr.read)
+			if callbackErr != nil {
 				return n, callbackErr
 			}
 		}
 	}
+
 	return n, err
 }

internal/storage/s3.go

@@ -30,6 +30,7 @@ func (s *S3Storer) PutWithProgress(ctx context.Context, key string, data io.Read
 	if progress != nil {
 		s3Progress = s3.ProgressCallback(progress)
 	}
+
 	return s.client.PutObjectWithProgress(ctx, key, data, size, s3Progress)
 }
 
@@ -44,6 +45,7 @@ func (s *S3Storer) Stat(ctx context.Context, key string) (*ObjectInfo, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return &ObjectInfo{
 		Key:  info.Key,
 		Size: info.Size,
@@ -65,6 +67,7 @@ func (s *S3Storer) ListStream(ctx context.Context, prefix string) <-chan ObjectI
 	ch := make(chan ObjectInfo)
 	go func() {
 		defer close(ch)
+
 		for info := range s.client.ListObjectsStream(ctx, prefix, false) {
 			ch <- ObjectInfo{
 				Key:  info.Key,
@@ -73,6 +76,7 @@ func (s *S3Storer) ListStream(ctx context.Context, prefix string) <-chan ObjectI
 			}
 		}
 	}()
+
 	return ch
 }
 

internal/storage/url.go

@@ -1,6 +1,7 @@
 package storage
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"strings"
@@ -24,15 +25,16 @@ type StorageURL struct {
 //   - rclone://remote/path/to/backups
 func ParseStorageURL(rawURL string) (*StorageURL, error) {
 	if rawURL == "" {
-		return nil, fmt.Errorf("storage URL is empty")
+		return nil, errors.New("storage URL is empty")
 	}
 
 	// Handle file:// URLs
-	if strings.HasPrefix(rawURL, "file://") {
-		path := strings.TrimPrefix(rawURL, "file://")
+	if after, ok := strings.CutPrefix(rawURL, "file://"); ok {
+		path := after
 		if path == "" {
-			return nil, fmt.Errorf("file URL path is empty")
+			return nil, errors.New("file URL path is empty")
 		}
+
 		return &StorageURL{
 			Scheme: "file",
 			Prefix: path,
@@ -48,12 +50,13 @@ func ParseStorageURL(rawURL string) (*StorageURL, error) {
 
 		bucket := u.Host
 		if bucket == "" {
-			return nil, fmt.Errorf("s3 URL missing bucket name")
+			return nil, errors.New("s3 URL missing bucket name")
 		}
 
 		prefix := strings.TrimPrefix(u.Path, "/")
 
 		query := u.Query()
+
 		useSSL := true
 		if query.Get("ssl") == "false" {
 			useSSL = false
@@ -78,7 +81,7 @@ func ParseStorageURL(rawURL string) (*StorageURL, error) {
 
 		remote := u.Host
 		if remote == "" {
-			return nil, fmt.Errorf("rclone URL missing remote name")
+			return nil, errors.New("rclone URL missing remote name")
 		}
 
 		path := strings.TrimPrefix(u.Path, "/")
@@ -90,29 +93,32 @@ func ParseStorageURL(rawURL string) (*StorageURL, error) {
 		}, nil
 	}
 
-	return nil, fmt.Errorf("unsupported URL scheme: must start with s3://, file://, or rclone://")
+	return nil, errors.New("unsupported URL scheme: must start with s3://, file://, or rclone://")
 }
 
 // String returns a human-readable representation of the storage URL.
 func (u *StorageURL) String() string {
 	switch u.Scheme {
 	case "file":
-		return fmt.Sprintf("file://%s", u.Prefix)
+		return "file://" + u.Prefix
 	case "s3":
 		endpoint := u.Endpoint
 		if endpoint == "" {
 			endpoint = "s3.amazonaws.com"
 		}
+
 		if u.Prefix != "" {
 			return fmt.Sprintf("s3://%s/%s (endpoint: %s)", u.Bucket, u.Prefix, endpoint)
 		}
+
 		return fmt.Sprintf("s3://%s (endpoint: %s)", u.Bucket, endpoint)
 	case "rclone":
 		if u.Prefix != "" {
 			return fmt.Sprintf("rclone://%s/%s", u.RcloneRemote, u.Prefix)
 		}
-		return fmt.Sprintf("rclone://%s", u.RcloneRemote)
+
+		return "rclone://" + u.RcloneRemote
 	default:
-		return fmt.Sprintf("%s://?", u.Scheme)
+		return u.Scheme + "://?"
 	}
 }

internal/types/types.go

@@ -24,6 +24,7 @@ func ParseFileID(s string) (FileID, error) {
 	if err != nil {
 		return FileID{}, err
 	}
+
 	return FileID(id), nil
 }
 
@@ -38,13 +39,15 @@ func (id FileID) Value() (driver.Value, error) {
 }
 
 // Scan implements sql.Scanner for database deserialization.
-func (id *FileID) Scan(src interface{}) error {
+func (id *FileID) Scan(src any) error {
 	if src == nil {
 		*id = FileID{}
+
 		return nil
 	}
 
 	var s string
+
 	switch v := src.(type) {
 	case string:
 		s = v
@@ -58,7 +61,9 @@ func (id *FileID) Scan(src interface{}) error {
 	if err != nil {
 		return fmt.Errorf("invalid FileID: %w", err)
 	}
+
 	*id = FileID(parsed)
+
 	return nil
 }
 
@@ -77,6 +82,7 @@ func ParseBlobID(s string) (BlobID, error) {
 	if err != nil {
 		return BlobID{}, err
 	}
+
 	return BlobID(id), nil
 }
 
@@ -91,13 +97,15 @@ func (id BlobID) Value() (driver.Value, error) {
 }
 
 // Scan implements sql.Scanner for database deserialization.
-func (id *BlobID) Scan(src interface{}) error {
+func (id *BlobID) Scan(src any) error {
 	if src == nil {
 		*id = BlobID{}
+
 		return nil
 	}
 
 	var s string
+
 	switch v := src.(type) {
 	case string:
 		s = v
@@ -111,7 +119,9 @@ func (id *BlobID) Scan(src interface{}) error {
 	if err != nil {
 		return fmt.Errorf("invalid BlobID: %w", err)
 	}
+
 	*id = BlobID(parsed)
+
 	return nil
 }
 

internal/ui/ui.go

@@ -94,10 +94,12 @@ func shouldColor(w io.Writer) bool {
 	if os.Getenv("NO_COLOR") != "" {
 		return false
 	}
+
 	f, ok := w.(*os.File)
 	if !ok {
 		return false
 	}
+
 	return term.IsTerminal(int(f.Fd()))
 }
 
@@ -106,6 +108,7 @@ func (w *Writer) paint(color, s string) string {
 	if !w.color {
 		return s
 	}
+
 	return color + s + ansiReset
 }
 
@@ -116,6 +119,7 @@ func (w *Writer) Begin(format string, args ...any) {
 	if w.quiet {
 		return
 	}
+
 	w.emit(ansiWhite, Marker, "", format, args)
 }
 
@@ -124,6 +128,7 @@ func (w *Writer) Complete(format string, args ...any) {
 	if w.quiet {
 		return
 	}
+
 	w.emit(ansiGreen, Marker, ansiGreen, format, args)
 }
 
@@ -132,6 +137,7 @@ func (w *Writer) Info(format string, args ...any) {
 	if w.quiet {
 		return
 	}
+
 	w.emit(ansiWhite, Marker, "", format, args)
 }
 
@@ -140,6 +146,7 @@ func (w *Writer) Notice(format string, args ...any) {
 	if w.quiet {
 		return
 	}
+
 	w.emit(ansiCyan, Marker, "", format, args)
 }
 
@@ -167,6 +174,7 @@ func (w *Writer) Detail(format string, args ...any) {
 	if w.quiet {
 		return
 	}
+
 	w.emit(ansiWhite, "  "+Marker, "", format, args)
 }
 
@@ -181,6 +189,7 @@ func (w *Writer) Progress(format string, args ...any) {
 	if w.quiet {
 		return
 	}
+
 	w.emit(ansiWhite, "  "+Marker, "", format, args)
 }
 
@@ -190,10 +199,12 @@ func (w *Writer) Banner(format string, args ...any) {
 	if w.quiet {
 		return
 	}
+
 	body := fmt.Sprintf(format, args...)
 	if w.color {
 		body = ansiBold + body + ansiReset
 	}
+
 	_, _ = fmt.Fprintln(w.out, body)
 }
 
@@ -204,6 +215,7 @@ func (w *Writer) emit(prefixColor, prefix, bodyColor, format string, args []any)
 	if bodyColor != "" {
 		body = w.paint(bodyColor, body)
 	}
+
 	_, _ = fmt.Fprintln(w.out, w.paint(prefixColor, prefix)+" "+body)
 }
 
@@ -219,6 +231,7 @@ func (w *Writer) Hex(s string) string {
 	if len(s) > 12 {
 		short = s[:12] + "..."
 	}
+
 	return w.paint(ansiCyan, short)
 }
 
@@ -244,8 +257,11 @@ func (w *Writer) Speed(bytesPerSec float64) string {
 	if bytesPerSec <= 0 {
 		return w.paint(ansiMagenta, "N/A")
 	}
+
 	bitsPerSec := bytesPerSec * 8
+
 	var s string
+
 	switch {
 	case bitsPerSec >= 1e9:
 		s = fmt.Sprintf("%.1f Gbit/sec", bitsPerSec/1e9)
@@ -256,6 +272,7 @@ func (w *Writer) Speed(bytesPerSec float64) string {
 	default:
 		s = fmt.Sprintf("%.0f bit/sec", bitsPerSec)
 	}
+
 	return w.paint(ansiMagenta, s)
 }
 
@@ -270,10 +287,12 @@ func (w *Writer) Duration(d time.Duration) string {
 // displayed in the process's local zone.
 func (w *Writer) Time(t time.Time) string {
 	t = t.Local()
+
 	now := time.Now()
 	if t.Year() == now.Year() && t.YearDay() == now.YearDay() {
 		return w.paint(ansiYellow, t.Format("15:04:05"))
 	}
+
 	return w.paint(ansiYellow, t.Format("2006-01-02 15:04:05"))
 }
 

internal/ui/ui_test.go

@@ -9,6 +9,7 @@ import (
 
 func newTestWriter(color bool) (*Writer, *bytes.Buffer) {
 	buf := &bytes.Buffer{}
+
 	return NewWithColor(buf, color), buf
 }
 
@@ -33,6 +34,7 @@ func TestMessageMethodsPlain(t *testing.T) {
 		t.Run(tt.method, func(t *testing.T) {
 			w, buf := newTestWriter(false)
 			tt.fn(w)
+
 			if got := buf.String(); got != tt.want {
 				t.Errorf("got %q, want %q", got, tt.want)
 			}
@@ -45,13 +47,16 @@ func TestWarningErrorCounters(t *testing.T) {
 	if w.WarningCount() != 0 || w.ErrorCount() != 0 {
 		t.Fatalf("expected fresh writer to have zero counts")
 	}
+
 	w.Info("normal")
 	w.Warning("first warn")
 	w.Warning("second warn")
 	w.Error("only error")
+
 	if got, want := w.WarningCount(), 2; got != want {
 		t.Errorf("WarningCount: got %d, want %d", got, want)
 	}
+
 	if got, want := w.ErrorCount(), 1; got != want {
 		t.Errorf("ErrorCount: got %d, want %d", got, want)
 	}
@@ -60,10 +65,12 @@ func TestWarningErrorCounters(t *testing.T) {
 func TestColorOutputContainsANSI(t *testing.T) {
 	w, buf := newTestWriter(true)
 	w.Error("boom")
+
 	out := buf.String()
 	if !strings.Contains(out, "\033[") {
 		t.Errorf("expected ANSI escapes in color output, got %q", out)
 	}
+
 	if !strings.Contains(out, "ERROR: ") {
 		t.Errorf("expected 'ERROR: ' text in output, got %q", out)
 	}
@@ -72,6 +79,7 @@ func TestColorOutputContainsANSI(t *testing.T) {
 func TestBannerBoldWhenColor(t *testing.T) {
 	w, buf := newTestWriter(true)
 	w.Banner("hello")
+
 	out := buf.String()
 	if !strings.Contains(out, "\033[1m") {
 		t.Errorf("expected bold ANSI escape in colored Banner output, got %q", out)
@@ -84,18 +92,23 @@ func TestValueFormattersPlain(t *testing.T) {
 	if got := w.Hex("0123456789abcdef0123"); got != "0123456789ab..." {
 		t.Errorf("Hex long: got %q", got)
 	}
+
 	if got := w.Hex("short"); got != "short" {
 		t.Errorf("Hex short: got %q", got)
 	}
+
 	if got := w.Size(1024); got != "1.0 kB" {
 		t.Errorf("Size: got %q", got)
 	}
+
 	if got := w.Duration(90 * time.Second); got != "1m30s" {
 		t.Errorf("Duration: got %q", got)
 	}
+
 	if got := w.Count(12345); got != "12,345" {
 		t.Errorf("Count: got %q", got)
 	}
+
 	if got := w.Percent(12.34); got != "12.3%" {
 		t.Errorf("Percent: got %q", got)
 	}
@@ -104,9 +117,11 @@ func TestValueFormattersPlain(t *testing.T) {
 	if got := w.Speed(0); got != "N/A" {
 		t.Errorf("Speed(0): got %q, want N/A", got)
 	}
+
 	if got := w.Speed(125_000_000); got != "1.0 Gbit/sec" { // 1 Gbit/s = 125 MB/s
 		t.Errorf("Speed(125e6): got %q", got)
 	}
+
 	if got := w.Speed(125_000); got != "1 Mbit/sec" {
 		t.Errorf("Speed(125e3): got %q", got)
 	}
@@ -116,6 +131,7 @@ func TestValueFormattersPlain(t *testing.T) {
 	if got := w.Time(today); got != "14:30:45" {
 		t.Errorf("Time today: got %q, want 14:30:45", got)
 	}
+
 	other := time.Date(2030, 1, 2, 3, 4, 5, 0, time.Local)
 	if got := w.Time(other); got != "2030-01-02 03:04:05" {
 		t.Errorf("Time other day: got %q", got)
@@ -124,10 +140,12 @@ func TestValueFormattersPlain(t *testing.T) {
 
 func TestValueFormattersColored(t *testing.T) {
 	w, _ := newTestWriter(true)
+
 	hex := w.Hex("0123456789abcdef0123")
 	if !strings.Contains(hex, "\033[") {
 		t.Errorf("expected ANSI in colored Hex output, got %q", hex)
 	}
+
 	if !strings.Contains(hex, "0123456789ab") {
 		t.Errorf("expected hex content in output, got %q", hex)
 	}