clean up scanner cleanup

This commit is contained in:
sentriz
2020-03-14 16:41:28 +00:00
parent 0aed118e07
commit 03647176d4
2 changed files with 5 additions and 10 deletions

View File

@@ -104,12 +104,9 @@ func (s *Scanner) Start() error {
// delete tracks not on filesystem // delete tracks not on filesystem
s.db.WithTx(func(tx *gorm.DB) { s.db.WithTx(func(tx *gorm.DB) {
var tracks []*db.Track var tracks []*db.Track
tx. tx.Select("id").Find(&tracks)
Select("id").
Find(&tracks)
for _, track := range tracks { for _, track := range tracks {
_, ok := s.seenTracks[track.ID] if _, ok := s.seenTracks[track.ID]; !ok {
if !ok {
tx.Delete(track) tx.Delete(track)
deleted++ deleted++
} }
@@ -118,12 +115,9 @@ func (s *Scanner) Start() error {
// delete folders not on filesystem // delete folders not on filesystem
s.db.WithTx(func(tx *gorm.DB) { s.db.WithTx(func(tx *gorm.DB) {
var folders []*db.Album var folders []*db.Album
tx. tx.Select("id").Find(&folders)
Select("id").
Find(&folders)
for _, folder := range folders { for _, folder := range folders {
_, ok := s.seenFolders[folder.ID] if _, ok := s.seenFolders[folder.ID]; !ok {
if !ok {
tx.Delete(folder) tx.Delete(folder)
} }
} }

View File

@@ -18,6 +18,7 @@ import (
// we can't access artists. so instead we'll consider the artist of // 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 // an track to be the it's respective folder that comes directly
// under the root directory // under the root directory
func (c *Controller) ServeGetIndexes(r *http.Request) *spec.Response { func (c *Controller) ServeGetIndexes(r *http.Request) *spec.Response {
var folders []*db.Album var folders []*db.Album
c.DB. c.DB.