feat(11-01): per-library scan pipeline with queue coordinator
Task 1: Schema, events, and progress types - Add library_id to CreateAudioFile SQL INSERT and regenerate sqlc code - Add LibraryScanQueued and LibraryScanQueueDrained event constants - Regenerate TypeScript events via genevents - Add LibraryID, LibraryName, QueuedCount to ScanProgress - Add LibraryID, LibraryName to ScanMetrics - Add libraryID field to importResult for threading through pipeline Task 2: Scan queue coordinator and per-library scanning - Create scan_queue.go with ScanLibrary(id), ScanAllLibraries() - Add CancelCurrentScan(), CancelAllScans() for queue-aware cancellation - FIFO scan queue with silent dedup (same library already scanning or queued) - Refactor Scan() -> scanInternal(libraryID, libraryName, libraryPath) - Replace GetAllAudioFiles with GetAudioFilesByLibrary for per-library loading - Thread libraryID through DB writer to set CreateAudioFileParams.LibraryID - drainQueue auto-starts next queued library or emits LibraryScanQueueDrained - Pause freezes current scan AND queue - Add GetScanQueueLength() and QueuedLibraryNames() for UI - Mark CancelScan() and Scan() as deprecated
This commit is contained in:
@@ -0,0 +1,173 @@
|
||||
package library
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
|
||||
"yellowjacket/backend/events"
|
||||
)
|
||||
|
||||
// scanQueueEntry holds the metadata needed to scan a single library.
|
||||
type scanQueueEntry struct {
|
||||
libraryID int64
|
||||
libraryName string
|
||||
libraryPath string
|
||||
}
|
||||
|
||||
// ScanLibrary queues a scan for the library with the given database ID.
|
||||
// If no scan is active the library is scanned immediately; otherwise it
|
||||
// is appended to the queue. Duplicate requests (same library already
|
||||
// scanning or already queued) are silently ignored.
|
||||
func (l *Library) ScanLibrary(id int64) error {
|
||||
lib, err := l.db.Queries.GetLibrary(l.ctx, id)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not get library %d: %w", id, err)
|
||||
}
|
||||
|
||||
l.mu.Lock()
|
||||
defer l.mu.Unlock()
|
||||
|
||||
// Silent dedup: already scanning this library.
|
||||
if l.currentScanLibraryID == id {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Silent dedup: already queued.
|
||||
for _, entry := range l.scanQueue {
|
||||
if entry.libraryID == id {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
entry := scanQueueEntry{
|
||||
libraryID: lib.ID,
|
||||
libraryName: lib.Name,
|
||||
libraryPath: lib.Path,
|
||||
}
|
||||
|
||||
if !l.scanActive {
|
||||
l.scanActive = true
|
||||
l.currentScanLibraryID = entry.libraryID
|
||||
l.currentScanLibraryName = entry.libraryName
|
||||
|
||||
go l.startScan(entry)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// A scan is already running — queue this library.
|
||||
l.scanQueue = append(l.scanQueue, entry)
|
||||
|
||||
runtime.EventsEmit(l.ctx, events.LibraryScanQueued, map[string]any{
|
||||
"libraryId": lib.ID,
|
||||
"libraryName": lib.Name,
|
||||
"queueLength": len(l.scanQueue),
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ScanAllLibraries queries all libraries from the database and queues
|
||||
// each one for scanning. Existing dedup logic ensures no duplicates.
|
||||
func (l *Library) ScanAllLibraries() error {
|
||||
libs, err := l.db.Queries.GetAllLibraries(l.ctx)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not get all libraries: %w", err)
|
||||
}
|
||||
|
||||
for _, lib := range libs {
|
||||
if err := l.ScanLibrary(lib.ID); err != nil {
|
||||
l.logger.Warn(
|
||||
"could not queue library for scan",
|
||||
"libraryID", lib.ID,
|
||||
"libraryName", lib.Name,
|
||||
"err", err,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// CancelCurrentScan cancels only the currently scanning library.
|
||||
// The next queued library (if any) starts automatically when the
|
||||
// current scan's goroutine completes.
|
||||
func (l *Library) CancelCurrentScan() {
|
||||
l.mu.Lock()
|
||||
cancel := l.scanCancel
|
||||
l.mu.Unlock()
|
||||
|
||||
if cancel != nil {
|
||||
cancel()
|
||||
}
|
||||
}
|
||||
|
||||
// CancelAllScans cancels the current scan and clears the entire
|
||||
// queue so no further libraries are scanned.
|
||||
func (l *Library) CancelAllScans() {
|
||||
l.mu.Lock()
|
||||
l.scanQueue = nil
|
||||
cancel := l.scanCancel
|
||||
l.mu.Unlock()
|
||||
|
||||
if cancel != nil {
|
||||
cancel()
|
||||
}
|
||||
}
|
||||
|
||||
// GetScanQueueLength returns the number of libraries waiting in the
|
||||
// scan queue (excludes the currently scanning library).
|
||||
func (l *Library) GetScanQueueLength() int {
|
||||
l.mu.Lock()
|
||||
defer l.mu.Unlock()
|
||||
|
||||
return len(l.scanQueue)
|
||||
}
|
||||
|
||||
// QueuedLibraryNames returns the display names of libraries waiting
|
||||
// in the scan queue, in FIFO order.
|
||||
func (l *Library) QueuedLibraryNames() []string {
|
||||
l.mu.Lock()
|
||||
defer l.mu.Unlock()
|
||||
|
||||
names := make([]string, len(l.scanQueue))
|
||||
for i, entry := range l.scanQueue {
|
||||
names[i] = entry.libraryName
|
||||
}
|
||||
|
||||
return names
|
||||
}
|
||||
|
||||
// startScan runs the scan for a single library entry and then drains
|
||||
// the queue. It is always called in a new goroutine.
|
||||
func (l *Library) startScan(entry scanQueueEntry) {
|
||||
l.scanInternal(entry.libraryID, entry.libraryName, entry.libraryPath)
|
||||
l.drainQueue()
|
||||
}
|
||||
|
||||
// drainQueue is called after each scan completes. If the queue is
|
||||
// non-empty the next entry is popped and scanned; otherwise the
|
||||
// scan pipeline is marked idle.
|
||||
func (l *Library) drainQueue() {
|
||||
l.mu.Lock()
|
||||
|
||||
if len(l.scanQueue) > 0 {
|
||||
next := l.scanQueue[0]
|
||||
l.scanQueue = l.scanQueue[1:]
|
||||
l.currentScanLibraryID = next.libraryID
|
||||
l.currentScanLibraryName = next.libraryName
|
||||
l.mu.Unlock()
|
||||
|
||||
go l.startScan(next)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
l.currentScanLibraryID = 0
|
||||
l.currentScanLibraryName = ""
|
||||
l.scanActive = false
|
||||
l.mu.Unlock()
|
||||
|
||||
runtime.EventsEmit(l.ctx, events.LibraryScanQueueDrained)
|
||||
}
|
||||
Reference in New Issue
Block a user