hygiene: extract requireFreshDB to eliminate staleness boilerplate
The ensureDatabaseFresh + daemonClient nil check + error handling pattern was duplicated across 16 command files with inconsistent error handling (some used FatalErrorRespectJSON, others fmt.Fprintf). Extracted into requireFreshDB() wrapper that standardizes on FatalErrorRespectJSON for consistent --json support. Closes dolt-test-7y4 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
e54ac33d28
commit
d182aa0ea1
17 changed files with 29 additions and 110 deletions
|
|
@ -104,14 +104,8 @@ Examples:
|
|||
labels = utils.NormalizeLabels(labels)
|
||||
labelsAny = utils.NormalizeLabels(labelsAny)
|
||||
|
||||
// Check database freshness before reading
|
||||
ctx := rootCtx
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// If daemon is running, use RPC
|
||||
if daemonClient != nil {
|
||||
|
|
|
|||
|
|
@ -38,14 +38,7 @@ Example:
|
|||
// Use global jsonOutput set by PersistentPreRun
|
||||
ctx := rootCtx
|
||||
|
||||
// Check database freshness before reading (bd-2q6d, bd-c4rq)
|
||||
// Skip check when using daemon (daemon auto-imports on staleness)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// Get all issues
|
||||
allIssues, err := store.SearchIssues(ctx, "", types.IssueFilter{})
|
||||
|
|
|
|||
|
|
@ -197,11 +197,7 @@ Examples:
|
|||
defer func() { _ = store.Close() }()
|
||||
}
|
||||
|
||||
// Check database freshness before reading (bd-2q6d)
|
||||
// Export always uses direct mode (daemon closed above)
|
||||
if err := ensureDatabaseFresh(rootCtx); err != nil {
|
||||
FatalErrorRespectJSON("%v", err)
|
||||
}
|
||||
requireFreshDB(rootCtx)
|
||||
|
||||
// Handle --events and --events-reset flags
|
||||
if eventsFlag || eventsReset {
|
||||
|
|
|
|||
|
|
@ -95,13 +95,7 @@ func runFindDuplicates(cmd *cobra.Command, _ []string) {
|
|||
}
|
||||
}
|
||||
|
||||
// Check database freshness
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// Fetch issues
|
||||
filter := types.IssueFilter{}
|
||||
|
|
|
|||
|
|
@ -105,10 +105,7 @@ By default, shows only open gates. Use --all to include closed gates.`,
|
|||
return
|
||||
}
|
||||
|
||||
// Check database freshness before reading (bd-2q6d)
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
FatalErrorRespectJSON("%v", err)
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// Direct mode
|
||||
issues, err := store.SearchIssues(ctx, "", filter)
|
||||
|
|
|
|||
|
|
@ -92,12 +92,7 @@ Status icons: ○ open ◐ in_progress ● blocked ✓ closed ❄ deferred`,
|
|||
os.Exit(1)
|
||||
}
|
||||
|
||||
// Check database freshness before reading (bd-2q6d)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
FatalErrorRespectJSON("%v", err)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// Handle --all flag: show graph for all open issues
|
||||
if graphAll {
|
||||
|
|
|
|||
|
|
@ -30,12 +30,7 @@ Examples:
|
|||
ctx := rootCtx
|
||||
issueID := args[0]
|
||||
|
||||
// Check database freshness before reading (bd-2q6d)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
FatalErrorRespectJSON("%v", err)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// Check if storage supports versioning
|
||||
vs, ok := storage.AsVersioned(store)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package main
|
|||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
|
|
@ -98,14 +97,7 @@ Examples:
|
|||
if store != nil {
|
||||
ctx := rootCtx
|
||||
|
||||
// Check database freshness before reading
|
||||
// Skip check when using daemon (daemon auto-imports on staleness)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
filter := types.IssueFilter{}
|
||||
issues, err := store.SearchIssues(ctx, "", filter)
|
||||
|
|
|
|||
|
|
@ -103,10 +103,7 @@ Examples:
|
|||
}
|
||||
} else {
|
||||
// Direct mode
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
if store == nil {
|
||||
fmt.Fprintln(os.Stderr, "Error: database not initialized")
|
||||
|
|
|
|||
|
|
@ -956,15 +956,8 @@ var listCmd = &cobra.Command{
|
|||
filter.Overdue = true
|
||||
}
|
||||
|
||||
// Check database freshness before reading
|
||||
// Skip check when using daemon (daemon auto-imports on staleness)
|
||||
ctx := rootCtx
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// If daemon is running, use RPC
|
||||
if daemonClient != nil {
|
||||
|
|
|
|||
|
|
@ -127,13 +127,7 @@ Examples:
|
|||
|
||||
ctx := rootCtx
|
||||
|
||||
// Check database freshness before reading (skip when using daemon)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
var issues []*types.Issue
|
||||
|
||||
|
|
|
|||
|
|
@ -191,14 +191,7 @@ This is useful for agents executing molecules to see which steps can run next.`,
|
|||
// Direct mode
|
||||
ctx := rootCtx
|
||||
|
||||
// Check database freshness before reading
|
||||
// Skip check when using daemon (daemon auto-imports on staleness)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
issues, err := store.GetReadyWork(ctx, filter)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -174,13 +174,7 @@ Examples:
|
|||
|
||||
ctx := rootCtx
|
||||
|
||||
// Check database freshness before reading (skip when using daemon)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// If daemon is running, use RPC
|
||||
if daemonClient != nil {
|
||||
|
|
|
|||
|
|
@ -56,13 +56,7 @@ var showCmd = &cobra.Command{
|
|||
return
|
||||
}
|
||||
|
||||
// Check database freshness before reading
|
||||
// Skip check when using daemon (daemon auto-imports on staleness)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
FatalErrorRespectJSON("%v", err)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// Resolve partial IDs first (daemon mode only - direct mode uses routed resolution)
|
||||
var resolvedIDs []string
|
||||
|
|
|
|||
|
|
@ -65,14 +65,7 @@ This helps identify:
|
|||
// Direct mode
|
||||
ctx := rootCtx
|
||||
|
||||
// Check database freshness before reading (bd-2q6d, bd-c4rq)
|
||||
// Skip check when using daemon (daemon auto-imports on staleness)
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
issues, err := store.GetStaleIssues(ctx, filter)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -8,12 +8,23 @@ import (
|
|||
"github.com/steveyegge/beads/internal/autoimport"
|
||||
)
|
||||
|
||||
// requireFreshDB checks database freshness and exits on failure.
|
||||
// Skips the check when running in daemon mode (daemon auto-imports on staleness).
|
||||
// This is the standard wrapper for read commands; use it instead of calling
|
||||
// ensureDatabaseFresh directly to avoid boilerplate.
|
||||
func requireFreshDB(ctx context.Context) {
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
FatalErrorRespectJSON("%v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ensureDatabaseFresh checks if the database is in sync with JSONL before read operations.
|
||||
// If JSONL is newer than database, refuses to operate with an error message.
|
||||
// This prevents users from making decisions based on stale/incomplete data.
|
||||
//
|
||||
// NOTE: Callers must check if daemonClient != nil and skip calling this function
|
||||
// when running in daemon mode (daemon auto-imports on staleness).
|
||||
// NOTE: Prefer requireFreshDB() which wraps this with the daemon check and error handling.
|
||||
//
|
||||
// Implements bd-2q6d: All read operations should validate database freshness.
|
||||
// Implements bd-c4rq: Daemon check moved to call sites to avoid function call overhead.
|
||||
|
|
|
|||
|
|
@ -73,14 +73,8 @@ Examples:
|
|||
var stats *types.Statistics
|
||||
var err error
|
||||
|
||||
// Check database freshness before reading (bd-2q6d, bd-c4rq)
|
||||
// Skip check when using daemon (daemon auto-imports on staleness)
|
||||
ctx := rootCtx
|
||||
if daemonClient == nil {
|
||||
if err := ensureDatabaseFresh(ctx); err != nil {
|
||||
FatalErrorRespectJSON("%v", err)
|
||||
}
|
||||
}
|
||||
requireFreshDB(ctx)
|
||||
|
||||
// If daemon is running, use RPC
|
||||
if daemonClient != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue