Fix Unreferenced Tags been created in error

vt-idiot · Jul 26, 2024 · 3f0b979 · 3f0b979
1 parent 2f4d462
commit 3f0b979
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkg/migrations/migrations.go b/pkg/migrations/migrations.go
@@ -1963,6 +1963,14 @@ func Migrate() {
 				return db.Where("scene_id = ?", "virtualtaboo-").Delete(&models.Scene{}).Error
 			},
 		},
+		{
+			// remove unreferenced tags created due to an error
+			ID: "0079-remove-unreferenced-tags",
+			Migrate: func(tx *gorm.DB) error {
+				tasks.CountTags()
+				return tx.Model(&models.Tag{}).Exec("delete from tags where `count` = 0").Error
+			},
+		},
 	})
 
 	if err := m.Migrate(); err != nil {

diff --git a/pkg/models/model_scene.go b/pkg/models/model_scene.go
@@ -433,16 +433,17 @@ func SceneCreateUpdateFromExternal(db *gorm.DB, ext ScrapedScene) error {
 	var site Site
 	db.Where("id = ?", o.ScraperId).FirstOrInit(&site)
 	o.IsSubscribed = site.Subscribed
-	SaveWithRetry(db, &o)
 
 	// Clean & Associate Tags
 	var tags = o.Tags
 	db.Model(&o).Association("Tags").Clear()
-	for _, tag := range tags {
+	for idx, tag := range tags {
 		tmpTag := Tag{}
 		db.Where(&Tag{Name: tag.Name}).FirstOrCreate(&tmpTag)
-		db.Model(&o).Association("Tags").Append(tmpTag)
+		tags[idx] = tmpTag
 	}
+	o.Tags = tags
+	SaveWithRetry(db, &o)
 
 	// Clean & Associate Actors
 	db.Model(&o).Association("Cast").Clear()