From 214c4e8be4fb2b3a5167e0fd61ee524b4e617ebf Mon Sep 17 00:00:00 2001 From: viktorstrate Date: Thu, 4 Feb 2021 22:06:49 +0100 Subject: [PATCH] Fix panic when scanning --- api/graphql/models/media.go | 12 ------------ api/scanner/cleanup_media.go | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/api/graphql/models/media.go b/api/graphql/models/media.go index b297460f..2ca874aa 100644 --- a/api/graphql/models/media.go +++ b/api/graphql/models/media.go @@ -48,18 +48,6 @@ func (m *Media) BeforeSave(tx *gorm.DB) error { return nil } -func (m *Media) BeforeDelete(tx *gorm.DB) error { - if err := tx.Model(m).Association("Exif").Clear(); err != nil { - return err - } - - if err := tx.Model(m).Association("MediaURL").Clear(); err != nil { - return err - } - - return nil -} - type MediaPurpose string const ( diff --git a/api/scanner/cleanup_media.go b/api/scanner/cleanup_media.go index 9abcdf02..aca9c4b6 100644 --- a/api/scanner/cleanup_media.go +++ b/api/scanner/cleanup_media.go @@ -45,7 +45,7 @@ func CleanupMedia(db *gorm.DB, albumId int, albumMedia []*models.Media) []error } if len(mediaIDs) > 0 { - if err := db.Where("id IN (?)", mediaIDs).Delete(models.Media{}).Error; err != nil { + if err := db.Delete(models.Media{}, mediaIDs).Error; err != nil { deleteErrors = append(deleteErrors, errors.Wrap(err, "delete old media from database")) } }