mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Fix panic when scanning

This commit is contained in:
viktorstrate 2021-02-04 22:06:49 +01:00
parent ddd2cad1a3
commit 214c4e8be4
No known key found for this signature in database
GPG Key ID: 3F855605109C1E8A
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/graphql/models/media.go
View File

@ -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 (

2
api/scanner/cleanup_media.go
View File

@ -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"))
}
}