From 7a5285ae477163ca38e85ad03aa09c41077b7015 Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 22 Jul 2020 01:00:16 -0400 Subject: [PATCH] When deleting folders, only flush artists/albums after deleting the mediaFiles --- scanner/tag_scanner_2.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scanner/tag_scanner_2.go b/scanner/tag_scanner_2.go index a4881b59c..a46411cd7 100644 --- a/scanner/tag_scanner_2.go +++ b/scanner/tag_scanner_2.go @@ -188,6 +188,13 @@ func (s *TagScanner2) processDeletedDir(ctx context.Context, dir string) error { if err != nil { return err } + + c, err := s.ds.MediaFile(ctx).DeleteByPath(dir) + if err != nil { + return err + } + s.cnt.deleted += c + for _, t := range mfs { err = s.albumMap.update(t.AlbumID) if err != nil { @@ -200,8 +207,6 @@ func (s *TagScanner2) processDeletedDir(ctx context.Context, dir string) error { } log.Info(ctx, "Finished processing deleted folder", "path", dir, "purged", len(mfs), "elapsed", time.Since(start)) - c, err := s.ds.MediaFile(ctx).DeleteByPath(dir) - s.cnt.deleted += c return err }