diff --git a/scanner/scanner.go b/scanner/scanner.go index 4c36c7b..c5365e9 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -104,12 +104,9 @@ func (s *Scanner) Start() error { // delete tracks not on filesystem s.db.WithTx(func(tx *gorm.DB) { var tracks []*db.Track - tx. - Select("id"). - Find(&tracks) + tx.Select("id").Find(&tracks) for _, track := range tracks { - _, ok := s.seenTracks[track.ID] - if !ok { + if _, ok := s.seenTracks[track.ID]; !ok { tx.Delete(track) deleted++ } @@ -118,12 +115,9 @@ func (s *Scanner) Start() error { // delete folders not on filesystem s.db.WithTx(func(tx *gorm.DB) { var folders []*db.Album - tx. - Select("id"). - Find(&folders) + tx.Select("id").Find(&folders) for _, folder := range folders { - _, ok := s.seenFolders[folder.ID] - if !ok { + if _, ok := s.seenFolders[folder.ID]; !ok { tx.Delete(folder) } } diff --git a/server/ctrlsubsonic/handlers_by_folder.go b/server/ctrlsubsonic/handlers_by_folder.go index b25f195..42522d9 100644 --- a/server/ctrlsubsonic/handlers_by_folder.go +++ b/server/ctrlsubsonic/handlers_by_folder.go @@ -18,6 +18,7 @@ import ( // we can't access artists. so instead we'll consider the artist of // an track to be the it's respective folder that comes directly // under the root directory + func (c *Controller) ServeGetIndexes(r *http.Request) *spec.Response { var folders []*db.Album c.DB.