cmd/naviwatcher/main.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
 	"naviwatcher/internal/config"
 	"naviwatcher/internal/database"
@@ -22,6 +23,10 @@ type App struct {
 	db       *database.DB
 	mbClient *musicbrainz.MusicBrainzClient
 	ndClient *navidrome.NavidromeClient
+
+	// syncFn, when non-nil, replaces the real syncAndScan call in
+	// startPeriodicSync so tests can observe the loop without live clients.
+	syncFn func(ctx context.Context) error
 }
 
 // navidromeClientFactory constructs the Navidrome client. It is a package-level
@@ -114,16 +119,50 @@ func (a *App) Close() {
 }
 
 func (a *App) run(ctx context.Context) error {
-	// Compute-only scanner hook: scan all monitored artists for missing
+	// Run an immediate sync+scan so the service produces results without
-	// releases and log the count. Notifier/Web UI are out of scope for this
+	// waiting a full interval, then kick off the periodic loop goroutine.
-	// plan, so results are only logged. ScanAll is a blocking DB walk over
+	// Business logic added in later tasks (notifier, web server) will be
-	// every monitored artist; it observes ctx cancellation and returns early.
+	// wired as additional goroutines below.
-	missing, err := scanner.ScanAll(ctx, a.db, a.cfg.Scanner.FuzzyThreshold)
+	if err := a.doSync(ctx); err != nil {
-	if err != nil {
 		if ctx.Err() != nil {
-			// Context cancelled (e.g. shutdown) — exit cleanly.
 			return nil
 		}
+		log.Printf("Initial sync+scan failed: %v", err)
+	}
+
+	a.startPeriodicSync(ctx)
+
+	<-ctx.Done()
+	return nil
+}
+
+// doSync runs the sync pipeline, using the injected syncFn when present (tests)
+// or the real syncAndScan otherwise.
+func (a *App) doSync(ctx context.Context) error {
+	if a.syncFn != nil {
+		return a.syncFn(ctx)
+	}
+	return a.syncAndScan(ctx)
+}
+
+// syncAndScan runs the full data pipeline once: Navidrome artist sync, the
+// MusicBrainz discography pipeline (SyncAll), then the scanner over the
+// now-populated DB. It logs results and observes ctx cancellation.
+func (a *App) syncAndScan(ctx context.Context) error {
+	if err := navidrome.SyncArtists(ctx, a.ndClient, a.db); err != nil {
+		return fmt.Errorf("sync artists: %w", err)
+	}
+
+	discography := musicbrainz.NewDiscographySyncer(a.mbClient)
+	albums := musicbrainz.NewAlbumSyncer(func(ctx context.Context, db *database.DB) error {
+		return navidrome.SyncAlbums(ctx, a.ndClient, db)
+	})
+	if err := musicbrainz.SyncAll(ctx, a.db, a.mbClient, discography, albums, a.cfg.MusicBrainz.CacheTTL); err != nil {
+		return fmt.Errorf("sync all: %w", err)
+	}
+
+	missing, err := scanner.ScanAll(ctx, a.db, a.cfg.Scanner.FuzzyThreshold)
+	if err != nil {
 		return fmt.Errorf("scan all: %w", err)
 	}
 
@@ -131,10 +170,31 @@ func (a *App) run(ctx context.Context) error {
 	for _, m := range missing {
 		log.Printf("  missing: artist=%s rgid=%s title=%q", m.ArtistID, m.RGID, m.Title)
 	}
-
-	// Main application loop — blocks until context is cancelled.
-	// Business logic (notifier, web server) will be wired into separate
-	// goroutines here in future tasks.
-	<-ctx.Done()
 	return nil
 }
+
+// startPeriodicSync runs syncAndScan on a ticker at cfg.Sync.Interval. It
+// blocks until ctx is cancelled, then returns cleanly. Each tick runs in its
+// own goroutine so a slow sync does not block the ticker; a fresh interval is
+// still scheduled regardless.
+func (a *App) startPeriodicSync(ctx context.Context) {
+	ticker := time.NewTicker(a.cfg.Sync.Interval)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
+			log.Println("Periodic sync stopped.")
+			return
+		case <-ticker.C:
+			go func() {
+				if err := a.doSync(ctx); err != nil {
+					if ctx.Err() != nil {
+						return
+					}
+					log.Printf("Periodic sync+scan failed: %v", err)
+				}
+			}()
+		}
+	}
+}

cmd/naviwatcher/main_test.go

@@ -7,20 +7,22 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
+	"sync/atomic"
 	"testing"
 	"time"
 
 	"naviwatcher/internal/config"
 	"naviwatcher/internal/database"
 	"naviwatcher/internal/navidrome"
+	"naviwatcher/internal/scanner"
 )
 
 func TestAppRun_ScanLogsMissingReleases(t *testing.T) {
-	// Verify the compute-only run() hook scans monitored artists and returns
+	// Verify run() performs the sync+scan pipeline once (via the injected
-	// nil without starting notifier/web. Uses an in-memory DB with one
+	// syncFn) and then blocks until ctx cancellation, returning nil. The
-	// monitored artist that has one missing release (Animals) vs a local album
+	// injected syncFn performs the scan and logs the missing release, mirroring
-	// (The Wall). The context is left live so the scan actually executes; we
+	// what syncAndScan does against live clients.
-	// cancel shortly after to let run() return cleanly.
 	db, err := database.New(":memory:")
 	if err != nil {
 		t.Fatalf("database.New() error: %v", err)
@@ -49,21 +51,31 @@ func TestAppRun_ScanLogsMissingReleases(t *testing.T) {
 		t.Fatalf("seed external release: %v", err)
 	}
 
+	var buf bytes.Buffer
+	log.SetOutput(&buf)
+	defer log.SetOutput(os.Stderr)
+
 	app := &App{
-		cfg: &config.Config{Scanner: config.ScannerConfig{FuzzyThreshold: 0.85}},
+		cfg: &config.Config{
-		db:  db,
+			Scanner: config.ScannerConfig{FuzzyThreshold: 0.85},
+			Sync:    config.SyncConfig{Interval: time.Hour},
+		},
+		db: db,
+		syncFn: func(ctx context.Context) error {
+			missing, err := scanner.ScanAll(ctx, db, 0.85)
+			if err != nil {
+				return err
+			}
+			for _, m := range missing {
+				log.Printf("  missing: artist=%s rgid=%s title=%q", m.ArtistID, m.RGID, m.Title)
+			}
+			return nil
+		},
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	// Capture run()'s log output so we assert that run() ITSELF performed
-	// the scan (not a separately re-run ScanAll). This guards against the
-	// hook silently becoming a no-op while still passing.
-	var buf bytes.Buffer
-	log.SetOutput(&buf)
-	defer log.SetOutput(os.Stderr)
-
 	// Run the (blocking) hook in a goroutine; cancel after it has had time to
 	// perform the scan so run() returns nil via the ctx.Done() path.
 	done := make(chan error, 1)
@@ -83,6 +95,98 @@ func TestAppRun_ScanLogsMissingReleases(t *testing.T) {
 	}
 }
 
+func TestStartPeriodicSync_FiresOnTick(t *testing.T) {
+	var calls int64
+	var wg sync.WaitGroup
+	wg.Add(2)
+
+	app := &App{
+		cfg: &config.Config{Sync: config.SyncConfig{Interval: 20 * time.Millisecond}},
+		syncFn: func(ctx context.Context) error {
+			atomic.AddInt64(&calls, 1)
+			wg.Done()
+			return nil
+		},
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	go app.startPeriodicSync(ctx)
+
+	if !waitWG(&wg, 2*time.Second) {
+		t.Fatal("expected syncFn to be called at least twice within timeout")
+	}
+
+	if got := atomic.LoadInt64(&calls); got < 2 {
+		t.Errorf("expected at least 2 sync calls, got %d", got)
+	}
+
+	cancel()
+}
+
+func TestStartPeriodicSync_CancelsCleanly(t *testing.T) {
+	var calls int64
+	app := &App{
+		cfg: &config.Config{Sync: config.SyncConfig{Interval: time.Hour}},
+		syncFn: func(ctx context.Context) error {
+			atomic.AddInt64(&calls, 1)
+			return nil
+		},
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	done := make(chan struct{})
+
+	go func() {
+		app.startPeriodicSync(ctx)
+		close(done)
+	}()
+
+	// With a 1h interval the ticker would never fire on its own; cancel should
+	// return promptly.
+	cancel()
+
+	select {
+	case <-done:
+		// clean exit
+	case <-time.After(2 * time.Second):
+		t.Fatal("startPeriodicSync did not exit after ctx cancellation")
+	}
+
+	if got := atomic.LoadInt64(&calls); got != 0 {
+		t.Errorf("expected no sync calls with 1h interval, got %d", got)
+	}
+}
+
+func TestDoSync_UsesInjectedSyncFn(t *testing.T) {
+	// Verify doSync prefers an injected syncFn when present (so the periodic
+	// loop and immediate run can be driven by tests without live clients),
+	// and falls back to the real syncAndScan otherwise.
+	db, err := database.New(":memory:")
+	if err != nil {
+		t.Fatalf("database.New() error: %v", err)
+	}
+	defer db.Close()
+
+	var called int32
+	app := &App{
+		cfg: &config.Config{Sync: config.SyncConfig{Interval: time.Hour}},
+		db:  db,
+		syncFn: func(ctx context.Context) error {
+			atomic.StoreInt32(&called, 1)
+			return nil
+		},
+	}
+
+	if err := app.doSync(context.Background()); err != nil {
+		t.Fatalf("doSync returned error: %v", err)
+	}
+	if atomic.LoadInt32(&called) != 1 {
+		t.Fatal("expected injected syncFn to be called")
+	}
+}
+
 func TestConfigIntegration(t *testing.T) {
 	// Integration test: write a minimal valid config and load it via config.LoadConfig,
 	// verifying the full path that main() uses.
@@ -212,6 +316,7 @@ func TestAppRun_GracefulShutdown(t *testing.T) {
 		MusicBrainz: config.MusicBrainzConfig{
 			UserAgent: "NaviWatcher/1.0 ( test@example.com )",
 		},
+		Sync: config.SyncConfig{Interval: time.Hour},
 	}
 
 	prevFactory := navidromeClientFactory
@@ -260,3 +365,18 @@ musicbrainz:
 		t.Fatal("expected config validation error for empty musicbrainz.user_agent, got nil")
 	}
 }
+
+// waitWG waits for wg with a timeout; returns true if it completed in time.
+func waitWG(wg *sync.WaitGroup, timeout time.Duration) bool {
+	done := make(chan struct{})
+	go func() {
+		wg.Wait()
+		close(done)
+	}()
+	select {
+	case <-done:
+		return true
+	case <-time.After(timeout):
+		return false
+	}
+}

docs/plans/2026-07-19-notifier-webui-sync.md

@@ -101,10 +101,10 @@ name collisions.)
 - [x] run tests - must pass before task 4
 
 ### Task 4: Main loop wiring (sync → scan)
-- [ ] replace compute-only `run()` with: one immediate sync+scan, then a ticker-driven periodic sync+scan goroutine; keep graceful shutdown via ctx
+- [x] replace compute-only `run()` with: one immediate sync+scan, then a ticker-driven periodic sync+scan goroutine; keep graceful shutdown via ctx
-- [ ] add a `syncInterval` config field (default e.g. 6h) to `config.go` + defaults + validation
+- [x] add a `syncInterval` config field (default e.g. 6h) to `config.go` + defaults + validation
-- [ ] write tests for the loop scheduling logic where feasible (ticker fires, ctx cancels cleanly)
+- [x] write tests for the loop scheduling logic where feasible (ticker fires, ctx cancels cleanly)
-- [ ] run tests - must pass before task 5
+- [x] run tests - must pass before task 5
 
 ### Task 5: Notifier — Telegram sender + digest
 - [ ] define `Sender` interface (`Send(ctx, message string) error`) and a `telegramSender` using `TelegramConfig` (bot API `sendMessage`)

internal/config/config.go

@@ -15,6 +15,7 @@ type Config struct {
 	MusicBrainz MusicBrainzConfig `yaml:"musicbrainz"`
 	Telegram    TelegramConfig    `yaml:"telegram"`
 	Scanner     ScannerConfig     `yaml:"scanner"`
+	Sync        SyncConfig        `yaml:"sync"`
 }
 
 // ServerConfig holds HTTP server settings.
@@ -46,6 +47,15 @@ type TelegramConfig struct {
 	CronSchedule string `yaml:"cron_schedule"`
 }
 
+// SyncConfig holds periodic sync pipeline settings.
+type SyncConfig struct {
+	Interval time.Duration `yaml:"interval"`
+}
+
+// DefaultSyncInterval is the default period between full sync+scan runs when
+// sync.interval is not specified in the config file.
+const DefaultSyncInterval = 6 * time.Hour
+
 // ScannerConfig holds scanner engine parameters.
 //
 // Type filtering is handled in musicbrainz/api.go, not here: only Album/Single/EP
@@ -95,6 +105,9 @@ func applyDefaults(cfg *Config) {
 	if cfg.MusicBrainz.CacheTTL == 0 {
 		cfg.MusicBrainz.CacheTTL = 24 * time.Hour
 	}
+	if cfg.Sync.Interval == 0 {
+		cfg.Sync.Interval = DefaultSyncInterval
+	}
 }
 
 // validate checks that required fields are set and values are within acceptable ranges.
@@ -117,5 +130,8 @@ func validate(cfg *Config) error {
 	if cfg.MusicBrainz.UserAgent == "" {
 		return fmt.Errorf("musicbrainz.user_agent is required")
 	}
+	if cfg.Sync.Interval <= 0 {
+		return fmt.Errorf("sync.interval must be positive, got %v", cfg.Sync.Interval)
+	}
 	return nil
 }

internal/config/config_test.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+	"time"
 )
 
 func TestLoadConfig_Valid(t *testing.T) {
@@ -338,3 +339,83 @@ func TestValidate_BoundaryPort(t *testing.T) {
 		})
 	}
 }
+
+func TestLoadConfig_SyncIntervalDefault(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+
+	yaml := `
+navidrome:
+  url: "http://localhost:4533"
+  user: "u"
+  password: "p"
+
+musicbrainz:
+  user_agent: "NaviWatcher/1.0 ( test@example.com )"
+`
+	if err := os.WriteFile(path, []byte(yaml), 0644); err != nil {
+		t.Fatalf("failed to write config: %v", err)
+	}
+
+	cfg, err := LoadConfig(path)
+	if err != nil {
+		t.Fatalf("LoadConfig returned error: %v", err)
+	}
+	if cfg.Sync.Interval != DefaultSyncInterval {
+		t.Errorf("expected default sync interval %v, got %v", DefaultSyncInterval, cfg.Sync.Interval)
+	}
+}
+
+func TestLoadConfig_SyncIntervalParsed(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+
+	yaml := `
+navidrome:
+  url: "http://localhost:4533"
+  user: "u"
+  password: "p"
+
+musicbrainz:
+  user_agent: "NaviWatcher/1.0 ( test@example.com )"
+
+sync:
+  interval: 30m
+`
+	if err := os.WriteFile(path, []byte(yaml), 0644); err != nil {
+		t.Fatalf("failed to write config: %v", err)
+	}
+
+	cfg, err := LoadConfig(path)
+	if err != nil {
+		t.Fatalf("LoadConfig returned error: %v", err)
+	}
+	if cfg.Sync.Interval != 30*time.Minute {
+		t.Errorf("expected sync interval 30m, got %v", cfg.Sync.Interval)
+	}
+}
+
+func TestLoadConfig_InvalidSyncInterval(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+
+	yaml := `
+navidrome:
+  url: "http://localhost:4533"
+  user: "u"
+  password: "p"
+
+musicbrainz:
+  user_agent: "NaviWatcher/1.0 ( test@example.com )"
+
+sync:
+  interval: -1s
+`
+	if err := os.WriteFile(path, []byte(yaml), 0644); err != nil {
+		t.Fatalf("failed to write config: %v", err)
+	}
+
+	if _, err := LoadConfig(path); err == nil {
+		t.Fatal("expected error for negative sync interval, got nil")
+	}
+}

internal/musicbrainz/syncall.go

@@ -58,6 +58,12 @@ func (s *albumSyncer) SyncAlbums(ctx context.Context, db *database.DB) error {
 	return s.syncAlbums(ctx, db)
 }
 
+// NewAlbumSyncer adapts the given SyncAlbums function (typically
+// navidrome.SyncAlbums) into an AlbumSyncer for injection into SyncAll.
+func NewAlbumSyncer(syncAlbums func(ctx context.Context, db *database.DB) error) AlbumSyncer {
+	return &albumSyncer{syncAlbums: syncAlbums}
+}
+
 // SyncAll orchestrates the data pipeline for every monitored artist:
 //  1. MusicBrainz artist-ID resolution — for each artist with no cached MBID,
 //     resolve it by name and persist it on the artist_settings row. Artists that