mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Replace periodic scanner cancellation channel with a context

Browse source
This commit is contained in:
Deluan 2021-01-31 17:37:54 -05:00
parent 9520c30c32
commit c5686c4884
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scanner/scanner.go
View file

@ -16,8 +16,7 @@ import (
)
type Scanner interface {
Start(interval time.Duration)
Stop()
Run(ctx context.Context, interval time.Duration)
RescanAll(ctx context.Context, fullRescan bool) error
Status(mediaFolder string) (*StatusInfo, error)
Scanning() bool
@ -49,7 +48,6 @@ type scanner struct {
ds model.DataStore
cacheWarmer core.CacheWarmer
broker events.Broker
done chan bool
scan chan bool
}
@ -68,34 +66,29 @@ func New(ds model.DataStore, cacheWarmer core.CacheWarmer, broker events.Broker)
folders: map[string]FolderScanner{},
status: map[string]*scanStatus{},
lock: &sync.RWMutex{},
done: make(chan bool),
scan: make(chan bool),
}
s.loadFolders()
return s
}
func (s *scanner) Start(interval time.Duration) {
func (s *scanner) Run(ctx context.Context, interval time.Duration) {
ticker := time.NewTicker(interval)
defer ticker.Stop()
for {
err := s.RescanAll(context.Background(), false)
err := s.RescanAll(ctx, false)
if err != nil {
log.Error(err)
}
select {
case <-ticker.C:
continue
case <-s.done:
case <-ctx.Done():
return
}
}
}
func (s *scanner) Stop() {
s.done <- true
}
func (s *scanner) rescan(ctx context.Context, mediaFolder string, fullRescan bool) error {
folderScanner := s.folders[mediaFolder]
start := time.Now()
@ -163,7 +156,7 @@ func (s *scanner) RescanAll(ctx context.Context, fullRescan bool) error {
isScanning.Set(true)
defer isScanning.Set(false)
defer s.cacheWarmer.Flush(context.Background())
defer s.cacheWarmer.Flush(ctx)
var hasError bool
for folder := range s.folders {
err := s.rescan(ctx, folder, fullRescan)