arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fixing static checks about passing nil context

Browse Source
This commit is contained in:
Deluan
2020-04-26 12:06:38 -04:00
committed by Deluan Quintão
parent 95790b9eff
commit 03c3c192ed
17 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanner/scanner.go
+3 -3
View File
@@ -34,7 +34,7 @@ func (s *Scanner) Rescan(mediaFolder string, fullRescan bool) error {
log.Debug("Scanning folder (full scan)", "folder", mediaFolder)
}
err := folderScanner.Scan(log.NewContext(nil), lastModifiedSince)
err := folderScanner.Scan(log.NewContext(context.TODO()), lastModifiedSince)
if err != nil {
log.Error("Error importing MediaFolder", "folder", mediaFolder, err)
}
@@ -59,7 +59,7 @@ func (s *Scanner) RescanAll(fullRescan bool) error {
func (s *Scanner) Status() []StatusInfo { return nil }
func (s *Scanner) getLastModifiedSince(folder string) time.Time {
ms, err := s.ds.Property(nil).Get(model.PropLastScan + "-" + folder)
ms, err := s.ds.Property(context.TODO()).Get(model.PropLastScan + "-" + folder)
if err != nil {
return time.Time{}
}
@@ -76,7 +76,7 @@ func (s *Scanner) updateLastModifiedSince(folder string, t time.Time) {
}
func (s *Scanner) loadFolders() {
fs, _ := s.ds.MediaFolder(nil).GetAll()
fs, _ := s.ds.MediaFolder(context.TODO()).GetAll()
for _, f := range fs {
log.Info("Configuring Media Folder", "name", f.Name, "path", f.Path)
s.folders[f.Path] = NewTagScanner(f.Path, s.ds)
scanner/tag_scanner.go
+1 -1
View File
@@ -113,7 +113,7 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) erro
return err
}
err = s.ds.GC(log.NewContext(nil))
err = s.ds.GC(log.NewContext(context.TODO()))
log.Info("Finished Music Folder", "folder", s.rootFolder, "elapsed", time.Since(start))
return err