Fix bulk tagger again (stashapp#4133)

* Add ForEndpoint method * Fix typo in schema 48 migration
Dankonite · Sep 20, 2023 · 36e9ed7 · 36e9ed7
1 parent 7ba7df0
commit 36e9ed7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
@@ -383,8 +383,8 @@ func (s *Manager) StashBoxBatchPerformerTag(ctx context.Context, input StashBoxB
 							}
 
 							// Check if the user wants to refresh existing or new items
-							if (input.Refresh && len(performer.StashIDs.List()) > 0) ||
-								(!input.Refresh && len(performer.StashIDs.List()) == 0) {
+							hasStashID := performer.StashIDs.ForEndpoint(box.Endpoint) != nil
+							if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
 								tasks = append(tasks, StashBoxBatchTagTask{
 									performer:      performer,
 									refresh:        input.Refresh,
@@ -516,8 +516,8 @@ func (s *Manager) StashBoxBatchStudioTag(ctx context.Context, input StashBoxBatc
 							}
 
 							// Check if the user wants to refresh existing or new items
-							if (input.Refresh && len(studio.StashIDs.List()) > 0) ||
-								(!input.Refresh && len(studio.StashIDs.List()) == 0) {
+							hasStashID := studio.StashIDs.ForEndpoint(box.Endpoint) != nil
+							if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
 								tasks = append(tasks, StashBoxBatchTagTask{
 									studio:         studio,
 									refresh:        input.Refresh,

diff --git a/pkg/models/relationships.go b/pkg/models/relationships.go
@@ -208,6 +208,19 @@ func (r RelatedStashIDs) List() []StashID {
 	return r.list
 }
 
+// ForID returns the StashID object for the given endpoint. Returns nil if not found.
+func (r *RelatedStashIDs) ForEndpoint(endpoint string) *StashID {
+	r.mustLoaded()
+
+	for _, v := range r.list {
+		if v.Endpoint == endpoint {
+			return &v
+		}
+	}
+
+	return nil
+}
+
 func (r *RelatedStashIDs) load(fn func() ([]StashID, error)) error {
 	if r.Loaded() {
 		return nil

diff --git a/pkg/sqlite/migrations/48_premigrate.go b/pkg/sqlite/migrations/48_premigrate.go
@@ -130,7 +130,7 @@ func (m *schema48PreMigrator) fixStudioNames(ctx context.Context) error {
 					}
 				}
 
-				logger.Info("Renaming duplicate studio id %d to %s", id, newName)
+				logger.Infof("Renaming duplicate studio id %d to %s", id, newName)
 				_, err := m.db.Exec("UPDATE studios SET name = ? WHERE id = ?", newName, id)
 				if err != nil {
 					return err